diff --git a/.editorconfig b/.editorconfig
index 3b95e6dba8..bb34874398 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,11 +7,11 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
+trim_trailing_whitespace = true
 
 # 2 space indentation
-[*.{yaml,.yml}]
+[*.{yaml,yml,vue,js,css}]
 indent_size = 2
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
new file mode 100644
index 0000000000..53f95be159
--- /dev/null
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,71 @@
+name: Release Builds
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    if: "!github.event.release.prerelease"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Extract Tag
+        run: echo "PACKAGE_VERSION=${{ github.ref }}" >> $GITHUB_ENV
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.3
+          extensions: opcache, gd
+          tools: composer:v2
+          coverage: none
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GLOBAL_TOKEN }}
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get -y update -qq  < /dev/null > /dev/null
+          sudo apt-get -y install -qq git zip < /dev/null > /dev/null
+
+      - name: Retrieval of Builder Scripts
+        run: |
+          # Real Grav URL
+          curl --silent -H "Authorization: token ${{ secrets.GLOBAL_TOKEN }}" -H "Accept: application/vnd.github.v3.raw" ${{ secrets.BUILD_SCRIPT_URL }} --output build-grav.sh
+
+          # Development Local URL
+          # curl ${{ secrets.BUILD_SCRIPT_URL }} --output build-grav.sh
+
+      - name: Grav Builder
+        run: |
+          bash ./build-grav.sh
+
+      - name: Upload packages to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ env.PACKAGE_VERSION }}
+          file: ./grav-dist/*.zip
+          overwrite: true
+          file_glob: true
+
+  slack:
+    name: Slack
+    needs: build
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - uses: technote-space/workflow-conclusion-action@v2
+      - uses: 8398a7/action-slack@v3
+        with:
+          status: failure
+          fields: repo,message,author,action
+          icon_emoji: ':octocat:'
+          author_name: 'Github Action Build'
+          text: '🚚 Automated Build Failure'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GLOBAL_TOKEN }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: env.WORKFLOW_CONCLUSION == 'failure'
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
new file mode 100644
index 0000000000..90ed324b97
--- /dev/null
+++ b/.github/workflows/tests.yaml
@@ -0,0 +1,73 @@
+name: PHP Tests
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+
+  unit-tests:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        php: [ 8.1, 8.0, 7.4, 7.3]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: opcache, gd
+          tools: composer:v2
+          coverage: none
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+#      - name: Update composer
+#        run: composer update
+#
+#      - name: Validate composer.json and composer.lock
+#        run: composer validate
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Run test suite
+        run: vendor/bin/codecept run
+
+#  slack:
+#      name: Slack
+#      needs: unit-tests
+#      runs-on: ubuntu-latest
+#      if: always()
+#      steps:
+#        - uses: technote-space/workflow-conclusion-action@v2
+#        - uses: 8398a7/action-slack@v3
+#          with:
+#             status: failure
+#             fields: repo,message,author,action
+#             icon_emoji: ':octocat:'
+#             author_name: 'Github Action Tests'
+#             text: '💥 Automated Test Failure'
+#          env:
+#            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#            SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+#          if: env.WORKFLOW_CONCLUSION == 'failure'
diff --git a/.github/workflows/trigger-skeletons.yml b/.github/workflows/trigger-skeletons.yml
new file mode 100644
index 0000000000..bc4f1a0c1a
--- /dev/null
+++ b/.github/workflows/trigger-skeletons.yml
@@ -0,0 +1,45 @@
+name: Trigger Skeletons Build
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Which Grav release to use'
+        required: true
+        default: 'latest'
+      admin:
+        description: 'Create also a package with Admin'
+        required: true
+        default: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      WORKFLOW: "build-skeleton.yml"
+      AUTH: ":${{secrets.GLOBAL_TOKEN}}"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Make it rain ☔️
+        run: |
+          SKELETONS=`curl -s "${{secrets.SKELETONS_JSON_LIST}}"`
+          echo "$SKELETONS" | jq -cr '.[]' | while read SKELETON; do
+            KEY=$(echo "$SKELETON" | jq -cr 'keys[0]')
+            VERSION=$(echo "$SKELETON" | jq -cr '.[]')
+            URL="https://api.github.com/repos/${KEY}/actions/workflows/${WORKFLOW}/dispatches"
+
+            curl -X POST \
+            -u "${AUTH}" \
+            -H "Accept: application/vnd.github.everest-preview+json" \
+            -H "Content-Type: application/json" \
+            -sS \
+            ${URL} \
+            --data '{ "ref": "develop", 
+                      "inputs": { 
+                        "tag": "'"$VERSION"'", 
+                        "version": "'"$INPUT_VERSION"'", 
+                        "admin": "'"$INPUT_ADMIN"'" 
+                      } 
+                    }' > /dev/null
+            echo "Dispatched Worfklow for ${KEY}@$VERSION"
+          done
diff --git a/.gitignore b/.gitignore
index 02082af89c..b0bbf8fa66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,5 @@ tests/_support/_generated/*
 tests/cache/*
 tests/error.log
 system/templates/testing/*
+/user/config/versions.yaml
+/user/cli/config/security.yaml
diff --git a/.htaccess b/.htaccess
index ef79a4bc26..098c582445 100644
--- a/.htaccess
+++ b/.htaccess
@@ -27,6 +27,9 @@ RewriteEngine On
 # If you experience problems on your site block out the operations listed below
 # This attempts to block the most common type of exploit `attempts` to Grav
 #
+# Block out any script trying to use twig tags in URL.
+RewriteCond %{REQUEST_URI} ({{|}}|{%|%}) [OR]
+RewriteCond %{QUERY_STRING} ({{|}}|{%25|%25}) [OR]
 # Block out any script trying to base64_encode data within the URL.
 RewriteCond %{QUERY_STRING} base64_encode[^(]*\([^)]*\) [OR]
 # Block out any script that includes a <script> tag in URL.
@@ -56,9 +59,9 @@ RewriteRule .* index.php [L]
 # Block all direct access for these folders
 RewriteRule ^(\.git|cache|bin|logs|backup|webserver-configs|tests)/(.*) error [F]
 # Block access to specific file types for these system folders
-RewriteRule ^(system|vendor)/(.*)\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
+RewriteRule ^(system|vendor)/(.*)\.(txt|xml|md|html|json|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
 # Block access to specific file types for these user folders
-RewriteRule ^(user)/(.*)\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
+RewriteRule ^(user)/(.*)\.(txt|md|json|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
 # Block all direct access to .md files:
 RewriteRule \.md$ error [F]
 # Block all direct access to files and folders beginning with a dot
diff --git a/.phan/config.php b/.phan/config.php
new file mode 100644
index 0000000000..efdf5b1a28
--- /dev/null
+++ b/.phan/config.php
@@ -0,0 +1,44 @@
+<?php
+return [
+    "target_php_version" => null,
+    'pretend_newer_core_functions_exist' => true,
+    'allow_missing_properties' => false,
+    'null_casts_as_any_type' => false,
+    'null_casts_as_array' => false,
+    'array_casts_as_null' => false,
+    'strict_method_checking' => true,
+    'quick_mode' => false,
+    'simplify_ast' => false,
+    'directory_list' => [
+        '.',
+    ],
+    "exclude_analysis_directory_list" => [
+        'vendor/'
+    ],
+    'exclude_file_list' => [
+        'system/src/Grav/Common/Errors/Resources/layout.html.php',
+        'tests/_support/AcceptanceTester.php',
+        'tests/_support/FunctionalTester.php',
+        'tests/_support/UnitTester.php',
+    ],
+    'autoload_internal_extension_signatures' => [
+        'memcached' => '.phan/internal_stubs/memcached.phan_php',
+        'memcache' => '.phan/internal_stubs/memcache.phan_php',
+        'redis' => '.phan/internal_stubs/Redis.phan_php',
+    ],
+    'plugins' => [
+        'AlwaysReturnPlugin',
+        'UnreachableCodePlugin',
+        'DuplicateArrayKeyPlugin',
+        'PregRegexCheckerPlugin',
+        'PrintfCheckerPlugin',
+    ],
+    'suppress_issue_types' => [
+        'PhanUnreferencedUseNormal',
+        'PhanTypeObjectUnsetDeclaredProperty',
+        'PhanTraitParentReference',
+        'PhanTypeInvalidThrowsIsInterface',
+        'PhanRequiredTraitNotAdded',
+        'PhanDeprecatedFunction',  // Uncomment this to see all the deprecated calls
+    ]
+];
diff --git a/.phan/internal_stubs/Redis.phan_php b/.phan/internal_stubs/Redis.phan_php
new file mode 100644
index 0000000000..ed349f2331
--- /dev/null
+++ b/.phan/internal_stubs/Redis.phan_php
@@ -0,0 +1,5153 @@
+<?php
+
+/**
+ * Helper autocomplete for php redis extension
+ *
+ * @author Max Kamashev <max.kamashev@gmail.com>
+ * @link   https://github.com/ukko/phpredis-phpdoc
+ */
+class Redis
+{
+    const AFTER                 = 'after';
+    const BEFORE                = 'before';
+
+    /**
+     * Options
+     */
+    const OPT_SERIALIZER        = 1;
+    const OPT_PREFIX            = 2;
+    const OPT_READ_TIMEOUT      = 3;
+    const OPT_SCAN              = 4;
+    const OPT_SLAVE_FAILOVER    = 5;
+
+    /**
+     * Cluster options
+     */
+    const FAILOVER_NONE         = 0;
+    const FAILOVER_ERROR        = 1;
+    const FAILOVER_DISTRIBUTE   = 2;
+
+    /**
+     * SCAN options
+     */
+    const SCAN_NORETRY          = 0;
+    const SCAN_RETRY            = 1;
+
+    /**
+     * Serializers
+     */
+    const SERIALIZER_NONE       = 0;
+    const SERIALIZER_PHP        = 1;
+    const SERIALIZER_IGBINARY   = 2;
+    const SERIALIZER_MSGPACK    = 3;
+    const SERIALIZER_JSON       = 4;
+
+    /**
+     * Multi
+     */
+    const ATOMIC                = 0;
+    const MULTI                 = 1;
+    const PIPELINE              = 2;
+
+    /**
+     * Type
+     */
+    const REDIS_NOT_FOUND       = 0;
+    const REDIS_STRING          = 1;
+    const REDIS_SET             = 2;
+    const REDIS_LIST            = 3;
+    const REDIS_ZSET            = 4;
+    const REDIS_HASH            = 5;
+
+    /**
+     * Creates a Redis client
+     *
+     * @example $redis = new Redis();
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Connects to a Redis instance.
+     *
+     * @param string $host          can be a host, or the path to a unix domain socket
+     * @param int    $port          optional
+     * @param float  $timeout       value in seconds (optional, default is 0.0 meaning unlimited)
+     * @param null   $reserved      should be null if $retryInterval is specified
+     * @param int    $retryInterval retry interval in milliseconds.
+     * @param float  $readTimeout   value in seconds (optional, default is 0 meaning unlimited)
+     *
+     * @return bool TRUE on success, FALSE on error
+     *
+     * @example
+     * <pre>
+     * $redis->connect('127.0.0.1', 6379);
+     * $redis->connect('127.0.0.1');            // port 6379 by default
+     * $redis->connect('127.0.0.1', 6379, 2.5); // 2.5 sec timeout.
+     * $redis->connect('/tmp/redis.sock');      // unix domain socket.
+     * </pre>
+     */
+    public function connect(
+        $host,
+        $port = 6379,
+        $timeout = 0.0,
+        $reserved = null,
+        $retryInterval = 0,
+        $readTimeout = 0.0
+    ) {
+    }
+
+    /**
+     * Connects to a Redis instance.
+     *
+     * @param string $host          can be a host, or the path to a unix domain socket
+     * @param int    $port          optional
+     * @param float  $timeout       value in seconds (optional, default is 0.0 meaning unlimited)
+     * @param null   $reserved      should be null if $retry_interval is specified
+     * @param int    $retryInterval retry interval in milliseconds.
+     * @param float  $readTimeout   value in seconds (optional, default is 0 meaning unlimited)
+     *
+     * @return bool TRUE on success, FALSE on error
+     *
+     * @see        connect()
+     * @deprecated use Redis::connect()
+     */
+    public function open(
+        $host,
+        $port = 6379,
+        $timeout = 0.0,
+        $reserved = null,
+        $retryInterval = 0,
+        $readTimeout = 0.0
+    ) {
+    }
+
+    /**
+     * A method to determine if a phpredis object thinks it's connected to a server
+     *
+     * @return bool Returns TRUE if phpredis thinks it's connected and FALSE if not
+     */
+    public function isConnected()
+    {
+    }
+
+    /**
+     * Retrieve our host or unix socket that we're connected to
+     *
+     * @return string|bool The host or unix socket we're connected to or FALSE if we're not connected
+     */
+    public function getHost()
+    {
+    }
+
+    /**
+     * Get the port we're connected to
+     *
+     * @return int|bool Returns the port we're connected to or FALSE if we're not connected
+     */
+    public function getPort()
+    {
+    }
+
+    /**
+     * Get the database number phpredis is pointed to
+     *
+     * @return int|bool Returns the database number (int) phpredis thinks it's pointing to
+     * or FALSE if we're not connected
+     */
+    public function getDbNum()
+    {
+    }
+
+    /**
+     * Get the (write) timeout in use for phpredis
+     *
+     * @return float|bool The timeout (DOUBLE) specified in our connect call or FALSE if we're not connected
+     */
+    public function getTimeout()
+    {
+    }
+
+    /**
+     * Get the read timeout specified to phpredis or FALSE if we're not connected
+     *
+     * @return float|bool Returns the read timeout (which can be set using setOption and Redis::OPT_READ_TIMEOUT)
+     * or FALSE if we're not connected
+     */
+    public function getReadTimeout()
+    {
+    }
+
+    /**
+     * Gets the persistent ID that phpredis is using
+     *
+     * @return string|null|bool Returns the persistent id phpredis is using
+     * (which will only be set if connected with pconnect),
+     * NULL if we're not using a persistent ID,
+     * and FALSE if we're not connected
+     */
+    public function getPersistentID()
+    {
+    }
+
+    /**
+     * Get the password used to authenticate the phpredis connection
+     *
+     * @return string|null|bool Returns the password used to authenticate a phpredis session or NULL if none was used,
+     * and FALSE if we're not connected
+     */
+    public function getAuth()
+    {
+    }
+
+    /**
+     * Connects to a Redis instance or reuse a connection already established with pconnect/popen.
+     *
+     * The connection will not be closed on close or end of request until the php process ends.
+     * So be patient on to many open FD's (specially on redis server side) when using persistent connections on
+     * many servers connecting to one redis server.
+     *
+     * Also more than one persistent connection can be made identified by either host + port + timeout
+     * or host + persistentId or unix socket + timeout.
+     *
+     * This feature is not available in threaded versions. pconnect and popen then working like their non persistent
+     * equivalents.
+     *
+     * @param string $host          can be a host, or the path to a unix domain socket
+     * @param int    $port          optional
+     * @param float  $timeout       value in seconds (optional, default is 0 meaning unlimited)
+     * @param string $persistentId  identity for the requested persistent connection
+     * @param int    $retryInterval retry interval in milliseconds.
+     * @param float  $readTimeout   value in seconds (optional, default is 0 meaning unlimited)
+     *
+     * @return bool TRUE on success, FALSE on ertcnror.
+     *
+     * @example
+     * <pre>
+     * $redis->pconnect('127.0.0.1', 6379);
+     *
+     * // port 6379 by default - same connection like before
+     * $redis->pconnect('127.0.0.1');
+     *
+     * // 2.5 sec timeout and would be another connection than the two before.
+     * $redis->pconnect('127.0.0.1', 6379, 2.5);
+     *
+     * // x is sent as persistent_id and would be another connection than the three before.
+     * $redis->pconnect('127.0.0.1', 6379, 2.5, 'x');
+     *
+     * // unix domain socket - would be another connection than the four before.
+     * $redis->pconnect('/tmp/redis.sock');
+     * </pre>
+     */
+    public function pconnect(
+        $host,
+        $port = 6379,
+        $timeout = 0.0,
+        $persistentId = null,
+        $retryInterval = 0,
+        $readTimeout = 0.0
+    ) {
+    }
+
+    /**
+     * @param string $host
+     * @param int    $port
+     * @param float  $timeout
+     * @param string $persistentId
+     * @param int    $retryInterval
+     * @param float  $readTimeout
+     *
+     * @return bool
+     *
+     * @deprecated use Redis::pconnect()
+     * @see pconnect()
+     */
+    public function popen(
+        $host,
+        $port = 6379,
+        $timeout = 0.0,
+        $persistentId = '',
+        $retryInterval = 0,
+        $readTimeout = 0.0
+    ) {
+    }
+
+    /**
+     * Disconnects from the Redis instance.
+     *
+     * Note: Closing a persistent connection requires PhpRedis >= 4.2.0
+     *
+     * @since >= 4.2 Closing a persistent connection requires PhpRedis
+     *
+     * @return bool TRUE on success, FALSE on error
+     */
+    public function close()
+    {
+    }
+
+    /**
+     * Swap one Redis database with another atomically
+     *
+     * Note: Requires Redis >= 4.0.0
+     *
+     * @param int $db1
+     * @param int $db2
+     *
+     * @return bool TRUE on success and FALSE on failure
+     *
+     * @link https://redis.io/commands/swapdb
+     * @since >= 4.0
+     * @example
+     * <pre>
+     * // Swaps DB 0 with DB 1 atomically
+     * $redis->swapdb(0, 1);
+     * </pre>
+     */
+    public function swapdb(int $db1, int $db2)
+    {
+    }
+
+    /**
+     * Set client option
+     *
+     * @param int   $option option name
+     * @param mixed $value  option value
+     *
+     * @return bool TRUE on success, FALSE on error
+     *
+     * @example
+     * <pre>
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_NONE);        // don't serialize data
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);         // use built-in serialize/unserialize
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_IGBINARY);    // use igBinary serialize/unserialize
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_MSGPACK);     // Use msgpack serialize/unserialize
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_JSON);        // Use json serialize/unserialize
+     *
+     * $redis->setOption(Redis::OPT_PREFIX, 'myAppName:');                      // use custom prefix on all keys
+     *
+     * // Options for the SCAN family of commands, indicating whether to abstract
+     * // empty results from the user.  If set to SCAN_NORETRY (the default), phpredis
+     * // will just issue one SCAN command at a time, sometimes returning an empty
+     * // array of results.  If set to SCAN_RETRY, phpredis will retry the scan command
+     * // until keys come back OR Redis returns an iterator of zero
+     * $redis->setOption(Redis::OPT_SCAN, Redis::SCAN_NORETRY);
+     * $redis->setOption(Redis::OPT_SCAN, Redis::SCAN_RETRY);
+     * </pre>
+     */
+    public function setOption($option, $value)
+    {
+    }
+
+    /**
+     * Get client option
+     *
+     * @param int $option parameter name
+     *
+     * @return mixed|null Parameter value
+     *
+     * @see setOption()
+     * @example
+     * // return option value
+     * $redis->getOption(Redis::OPT_SERIALIZER);
+     */
+    public function getOption($option)
+    {
+    }
+
+    /**
+     * Check the current connection status
+     *
+     * @return  string STRING: +PONG on success.
+     * Throws a RedisException object on connectivity error, as described above.
+     * @throws RedisException
+     * @link    https://redis.io/commands/ping
+     */
+    public function ping()
+    {
+    }
+
+    /**
+     * Echo the given string
+     *
+     * @param string $message
+     *
+     * @return string Returns message
+     *
+     * @link    https://redis.io/commands/echo
+     */
+    public function echo($message)
+    {
+    }
+
+    /**
+     * Get the value related to the specified key
+     *
+     * @param string $key
+     *
+     * @return string|mixed|bool If key didn't exist, FALSE is returned.
+     * Otherwise, the value related to this key is returned
+     *
+     * @link    https://redis.io/commands/get
+     * @example
+     * <pre>
+     * $redis->set('key', 'hello');
+     * $redis->get('key');
+     *
+     * // set and get with serializer
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_JSON);
+     *
+     * $redis->set('key', ['asd' => 'as', 'dd' => 123, 'b' => true]);
+     * var_dump($redis->get('key'));
+     * // Output:
+     * array(3) {
+     *  'asd' => string(2) "as"
+     *  'dd' => int(123)
+     *  'b' => bool(true)
+     * }
+     * </pre>
+     */
+    public function get($key)
+    {
+    }
+
+    /**
+     * Set the string value in argument as value of the key.
+     *
+     * @since If you're using Redis >= 2.6.12, you can pass extended options as explained in example
+     *
+     * @param string       $key
+     * @param string|mixed $value string if not used serializer
+     * @param int|array    $timeout [optional] Calling setex() is preferred if you want a timeout.<br>
+     * Since 2.6.12 it also supports different flags inside an array. Example ['NX', 'EX' => 60]<br>
+     *  - EX seconds -- Set the specified expire time, in seconds.<br>
+     *  - PX milliseconds -- Set the specified expire time, in milliseconds.<br>
+     *  - PX milliseconds -- Set the specified expire time, in milliseconds.<br>
+     *  - NX -- Only set the key if it does not already exist.<br>
+     *  - XX -- Only set the key if it already exist.<br>
+     * <pre>
+     * // Simple key -> value set
+     * $redis->set('key', 'value');
+     *
+     * // Will redirect, and actually make an SETEX call
+     * $redis->set('key','value', 10);
+     *
+     * // Will set the key, if it doesn't exist, with a ttl of 10 seconds
+     * $redis->set('key', 'value', ['nx', 'ex' => 10]);
+     *
+     * // Will set a key, if it does exist, with a ttl of 1000 miliseconds
+     * $redis->set('key', 'value', ['xx', 'px' => 1000]);
+     * </pre>
+     *
+     * @return bool TRUE if the command is successful
+     *
+     * @link     https://redis.io/commands/set
+     */
+    public function set($key, $value, $timeout = null)
+    {
+    }
+
+    /**
+     * Set the string value in argument as value of the key, with a time to live.
+     *
+     * @param string       $key
+     * @param int          $ttl
+     * @param string|mixed $value
+     *
+     * @return bool TRUE if the command is successful
+     *
+     * @link    https://redis.io/commands/setex
+     * @example $redis->setex('key', 3600, 'value'); // sets key → value, with 1h TTL.
+     */
+    public function setex($key, $ttl, $value)
+    {
+    }
+
+    /**
+     * Set the value and expiration in milliseconds of a key.
+     *
+     * @see     setex()
+     * @param   string       $key
+     * @param   int          $ttl, in milliseconds.
+     * @param   string|mixed $value
+     *
+     * @return bool TRUE if the command is successful
+     *
+     * @link    https://redis.io/commands/psetex
+     * @example $redis->psetex('key', 1000, 'value'); // sets key → value, with 1sec TTL.
+     */
+    public function psetex($key, $ttl, $value)
+    {
+    }
+
+    /**
+     * Set the string value in argument as value of the key if the key doesn't already exist in the database.
+     *
+     * @param string       $key
+     * @param string|mixed $value
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/setnx
+     * @example
+     * <pre>
+     * $redis->setnx('key', 'value');   // return TRUE
+     * $redis->setnx('key', 'value');   // return FALSE
+     * </pre>
+     */
+    public function setnx($key, $value)
+    {
+    }
+
+    /**
+     * Remove specified keys.
+     *
+     * @param   int|string|array $key1 An array of keys, or an undefined number of parameters, each a key: key1 key2 key3 ... keyN
+     * @param   int|string       ...$otherKeys
+     *
+     * @return int Number of keys deleted
+     *
+     * @link https://redis.io/commands/del
+     * @example
+     * <pre>
+     * $redis->set('key1', 'val1');
+     * $redis->set('key2', 'val2');
+     * $redis->set('key3', 'val3');
+     * $redis->set('key4', 'val4');
+     *
+     * $redis->del('key1', 'key2');     // return 2
+     * $redis->del(['key3', 'key4']);   // return 2
+     * </pre>
+     */
+    public function del($key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * @see del()
+     * @deprecated use Redis::del()
+     *
+     * @param   string|string[] $key1
+     * @param   string          $key2
+     * @param   string          $key3
+     *
+     * @return int Number of keys deleted
+     */
+    public function delete($key1, $key2 = null, $key3 = null)
+    {
+    }
+
+    /**
+     * Delete a key asynchronously in another thread. Otherwise it is just as DEL, but non blocking.
+     *
+     * @see del()
+     * @param string|string[] $key1
+     * @param string          $key2
+     * @param string          $key3
+     *
+     * @return int Number of keys unlinked.
+     *
+     * @link    https://redis.io/commands/unlink
+     * @example
+     * <pre>
+     * $redis->set('key1', 'val1');
+     * $redis->set('key2', 'val2');
+     * $redis->set('key3', 'val3');
+     * $redis->set('key4', 'val4');
+     * $redis->unlink('key1', 'key2');          // return 2
+     * $redis->unlink(array('key3', 'key4'));   // return 2
+     * </pre>
+     */
+    public function unlink($key1, $key2 = null, $key3 = null)
+    {
+    }
+
+    /**
+     * Enter and exit transactional mode.
+     *
+     * @param int $mode Redis::MULTI|Redis::PIPELINE
+     * Defaults to Redis::MULTI.
+     * A Redis::MULTI block of commands runs as a single transaction;
+     * a Redis::PIPELINE block is simply transmitted faster to the server, but without any guarantee of atomicity.
+     * discard cancels a transaction.
+     *
+     * @return Redis returns the Redis instance and enters multi-mode.
+     * Once in multi-mode, all subsequent method calls return the same object until exec() is called.
+     *
+     * @link    https://redis.io/commands/multi
+     * @example
+     * <pre>
+     * $ret = $redis->multi()
+     *      ->set('key1', 'val1')
+     *      ->get('key1')
+     *      ->set('key2', 'val2')
+     *      ->get('key2')
+     *      ->exec();
+     *
+     * //$ret == array (
+     * //    0 => TRUE,
+     * //    1 => 'val1',
+     * //    2 => TRUE,
+     * //    3 => 'val2');
+     * </pre>
+     */
+    public function multi($mode = Redis::MULTI)
+    {
+    }
+
+    /**
+     * @return void|array
+     *
+     * @see multi()
+     * @link https://redis.io/commands/exec
+     */
+    public function exec()
+    {
+    }
+
+    /**
+     * @see multi()
+     * @link https://redis.io/commands/discard
+     */
+    public function discard()
+    {
+    }
+
+    /**
+     * Watches a key for modifications by another client. If the key is modified between WATCH and EXEC,
+     * the MULTI/EXEC transaction will fail (return FALSE). unwatch cancels all the watching of all keys by this client.
+     * @param string|string[] $key a list of keys
+     *
+     * @return void
+     *
+     * @link    https://redis.io/commands/watch
+     * @example
+     * <pre>
+     * $redis->watch('x');
+     * // long code here during the execution of which other clients could well modify `x`
+     * $ret = $redis->multi()
+     *          ->incr('x')
+     *          ->exec();
+     * // $ret = FALSE if x has been modified between the call to WATCH and the call to EXEC.
+     * </pre>
+     */
+    public function watch($key)
+    {
+    }
+
+    /**
+     * @see watch()
+     * @link    https://redis.io/commands/unwatch
+     */
+    public function unwatch()
+    {
+    }
+
+    /**
+     * Subscribe to channels.
+     *
+     * Warning: this function will probably change in the future.
+     *
+     * @param string[]     $channels an array of channels to subscribe
+     * @param string|array $callback either a string or an array($instance, 'method_name').
+     * The callback function receives 3 parameters: the redis instance, the channel name, and the message.
+     *
+     * @return mixed|null Any non-null return value in the callback will be returned to the caller.
+     *
+     * @link    https://redis.io/commands/subscribe
+     * @example
+     * <pre>
+     * function f($redis, $chan, $msg) {
+     *  switch($chan) {
+     *      case 'chan-1':
+     *          ...
+     *          break;
+     *
+     *      case 'chan-2':
+     *                     ...
+     *          break;
+     *
+     *      case 'chan-2':
+     *          ...
+     *          break;
+     *      }
+     * }
+     *
+     * $redis->subscribe(array('chan-1', 'chan-2', 'chan-3'), 'f'); // subscribe to 3 chans
+     * </pre>
+     */
+    public function subscribe($channels, $callback)
+    {
+    }
+
+    /**
+     * Subscribe to channels by pattern
+     *
+     * @param array        $patterns   an array of glob-style patterns to subscribe
+     * @param string|array $callback   Either a string or an array with an object and method.
+     *                     The callback will get four arguments ($redis, $pattern, $channel, $message)
+     * @param mixed        $chan       Any non-null return value in the callback will be returned to the caller
+     * @param string       $msg
+     *
+     * @link    https://redis.io/commands/psubscribe
+     * @example
+     * <pre>
+     * function psubscribe($redis, $pattern, $chan, $msg) {
+     *  echo "Pattern: $pattern\n";
+     *  echo "Channel: $chan\n";
+     *  echo "Payload: $msg\n";
+     * }
+     * </pre>
+     */
+    public function psubscribe($patterns, $callback, $chan, $msg)
+    {
+    }
+
+    /**
+     * Publish messages to channels.
+     *
+     * Warning: this function will probably change in the future.
+     *
+     * @param string $channel a channel to publish to
+     * @param string $message string
+     *
+     * @return int Number of clients that received the message
+     *
+     * @link    https://redis.io/commands/publish
+     * @example $redis->publish('chan-1', 'hello, world!'); // send message.
+     */
+    public function publish($channel, $message)
+    {
+    }
+
+    /**
+     * A command allowing you to get information on the Redis pub/sub system
+     *
+     * @param string       $keyword    String, which can be: "channels", "numsub", or "numpat"
+     * @param string|array $argument   Optional, variant.
+     *                                 For the "channels" subcommand, you can pass a string pattern.
+     *                                 For "numsub" an array of channel names
+     *
+     * @return array|int Either an integer or an array.
+     *   - channels  Returns an array where the members are the matching channels.
+     *   - numsub    Returns a key/value array where the keys are channel names and
+     *               values are their counts.
+     *   - numpat    Integer return containing the number active pattern subscriptions
+     *
+     * @link    https://redis.io/commands/pubsub
+     * @example
+     * <pre>
+     * $redis->pubsub('channels'); // All channels
+     * $redis->pubsub('channels', '*pattern*'); // Just channels matching your pattern
+     * $redis->pubsub('numsub', array('chan1', 'chan2')); // Get subscriber counts for 'chan1' and 'chan2'
+     * $redis->pubsub('numpat'); // Get the number of pattern subscribers
+     * </pre>
+     */
+    public function pubsub($keyword, $argument)
+    {
+    }
+
+    /**
+     * Stop listening for messages posted to the given channels.
+     *
+     * @param array $channels an array of channels to usubscribe
+     *
+     * @link    https://redis.io/commands/unsubscribe
+     */
+    public function unsubscribe($channels = null)
+    {
+    }
+
+    /**
+     * Stop listening for messages posted to the given channels.
+     *
+     * @param array $patterns   an array of glob-style patterns to unsubscribe
+     *
+     * @link https://redis.io/commands/punsubscribe
+     */
+    public function punsubscribe($patterns = null)
+    {
+    }
+
+    /**
+     * Verify if the specified key/keys exists
+     *
+     * This function took a single argument and returned TRUE or FALSE in phpredis versions < 4.0.0.
+     *
+     * @since >= 4.0 Returned int, if < 4.0 returned bool
+     *
+     * @param string|string[] $key
+     *
+     * @return int|bool The number of keys tested that do exist
+     *
+     * @link https://redis.io/commands/exists
+     * @link https://github.com/phpredis/phpredis#exists
+     * @example
+     * <pre>
+     * $redis->exists('key'); // 1
+     * $redis->exists('NonExistingKey'); // 0
+     *
+     * $redis->mset(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz']);
+     * $redis->exists(['foo', 'bar', 'baz]); // 3
+     * $redis->exists('foo', 'bar', 'baz'); // 3
+     * </pre>
+     */
+    public function exists($key)
+    {
+    }
+
+    /**
+     * Increment the number stored at key by one.
+     *
+     * @param   string $key
+     *
+     * @return int the new value
+     *
+     * @link    https://redis.io/commands/incr
+     * @example
+     * <pre>
+     * $redis->incr('key1'); // key1 didn't exists, set to 0 before the increment and now has the value 1
+     * $redis->incr('key1'); // 2
+     * $redis->incr('key1'); // 3
+     * $redis->incr('key1'); // 4
+     * </pre>
+     */
+    public function incr($key)
+    {
+    }
+
+    /**
+     * Increment the float value of a key by the given amount
+     *
+     * @param string $key
+     * @param float  $increment
+     *
+     * @return float
+     *
+     * @link    https://redis.io/commands/incrbyfloat
+     * @example
+     * <pre>
+     * $redis->set('x', 3);
+     * $redis->incrByFloat('x', 1.5);   // float(4.5)
+     * $redis->get('x');                // float(4.5)
+     * </pre>
+     */
+    public function incrByFloat($key, $increment)
+    {
+    }
+
+    /**
+     * Increment the number stored at key by one.
+     * If the second argument is filled, it will be used as the integer value of the increment.
+     *
+     * @param string $key   key
+     * @param int    $value value that will be added to key (only for incrBy)
+     *
+     * @return int the new value
+     *
+     * @link    https://redis.io/commands/incrby
+     * @example
+     * <pre>
+     * $redis->incr('key1');        // key1 didn't exists, set to 0 before the increment and now has the value 1
+     * $redis->incr('key1');        // 2
+     * $redis->incr('key1');        // 3
+     * $redis->incr('key1');        // 4
+     * $redis->incrBy('key1', 10);  // 14
+     * </pre>
+     */
+    public function incrBy($key, $value)
+    {
+    }
+
+    /**
+     * Decrement the number stored at key by one.
+     *
+     * @param string $key
+     *
+     * @return int the new value
+     *
+     * @link    https://redis.io/commands/decr
+     * @example
+     * <pre>
+     * $redis->decr('key1'); // key1 didn't exists, set to 0 before the increment and now has the value -1
+     * $redis->decr('key1'); // -2
+     * $redis->decr('key1'); // -3
+     * </pre>
+     */
+    public function decr($key)
+    {
+    }
+
+    /**
+     * Decrement the number stored at key by one.
+     * If the second argument is filled, it will be used as the integer value of the decrement.
+     *
+     * @param string $key
+     * @param int    $value  that will be substracted to key (only for decrBy)
+     *
+     * @return int the new value
+     *
+     * @link    https://redis.io/commands/decrby
+     * @example
+     * <pre>
+     * $redis->decr('key1');        // key1 didn't exists, set to 0 before the increment and now has the value -1
+     * $redis->decr('key1');        // -2
+     * $redis->decr('key1');        // -3
+     * $redis->decrBy('key1', 10);  // -13
+     * </pre>
+     */
+    public function decrBy($key, $value)
+    {
+    }
+
+    /**
+     * Adds the string values to the head (left) of the list.
+     * Creates the list if the key didn't exist.
+     * If the key exists and is not a list, FALSE is returned.
+     *
+     * @param string $key
+     * @param string|mixed $value1... Variadic list of values to push in key, if dont used serialized, used string
+     *
+     * @return int|bool The new length of the list in case of success, FALSE in case of Failure
+     *
+     * @link https://redis.io/commands/lpush
+     * @example
+     * <pre>
+     * $redis->lPush('l', 'v1', 'v2', 'v3', 'v4')   // int(4)
+     * var_dump( $redis->lRange('l', 0, -1) );
+     * // Output:
+     * // array(4) {
+     * //   [0]=> string(2) "v4"
+     * //   [1]=> string(2) "v3"
+     * //   [2]=> string(2) "v2"
+     * //   [3]=> string(2) "v1"
+     * // }
+     * </pre>
+     */
+    public function lPush($key, ...$value1)
+    {
+    }
+
+    /**
+     * Adds the string values to the tail (right) of the list.
+     * Creates the list if the key didn't exist.
+     * If the key exists and is not a list, FALSE is returned.
+     *
+     * @param string $key
+     * @param string|mixed $value1... Variadic list of values to push in key, if dont used serialized, used string
+     *
+     * @return int|bool The new length of the list in case of success, FALSE in case of Failure
+     *
+     * @link    https://redis.io/commands/rpush
+     * @example
+     * <pre>
+     * $redis->rPush('l', 'v1', 'v2', 'v3', 'v4');    // int(4)
+     * var_dump( $redis->lRange('l', 0, -1) );
+     * // Output:
+     * // array(4) {
+     * //   [0]=> string(2) "v1"
+     * //   [1]=> string(2) "v2"
+     * //   [2]=> string(2) "v3"
+     * //   [3]=> string(2) "v4"
+     * // }
+     * </pre>
+     */
+    public function rPush($key, ...$value1)
+    {
+    }
+
+    /**
+     * Adds the string value to the head (left) of the list if the list exists.
+     *
+     * @param string $key
+     * @param string|mixed $value String, value to push in key
+     *
+     * @return int|bool The new length of the list in case of success, FALSE in case of Failure.
+     *
+     * @link    https://redis.io/commands/lpushx
+     * @example
+     * <pre>
+     * $redis->del('key1');
+     * $redis->lPushx('key1', 'A');     // returns 0
+     * $redis->lPush('key1', 'A');      // returns 1
+     * $redis->lPushx('key1', 'B');     // returns 2
+     * $redis->lPushx('key1', 'C');     // returns 3
+     * // key1 now points to the following list: [ 'A', 'B', 'C' ]
+     * </pre>
+     */
+    public function lPushx($key, $value)
+    {
+    }
+
+    /**
+     * Adds the string value to the tail (right) of the list if the ist exists. FALSE in case of Failure.
+     *
+     * @param string $key
+     * @param string|mixed $value String, value to push in key
+     *
+     * @return int|bool The new length of the list in case of success, FALSE in case of Failure.
+     *
+     * @link    https://redis.io/commands/rpushx
+     * @example
+     * <pre>
+     * $redis->del('key1');
+     * $redis->rPushx('key1', 'A'); // returns 0
+     * $redis->rPush('key1', 'A'); // returns 1
+     * $redis->rPushx('key1', 'B'); // returns 2
+     * $redis->rPushx('key1', 'C'); // returns 3
+     * // key1 now points to the following list: [ 'A', 'B', 'C' ]
+     * </pre>
+     */
+    public function rPushx($key, $value)
+    {
+    }
+
+    /**
+     * Returns and removes the first element of the list.
+     *
+     * @param   string $key
+     *
+     * @return  mixed|bool if command executed successfully BOOL FALSE in case of failure (empty list)
+     *
+     * @link    https://redis.io/commands/lpop
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');  // key1 => [ 'A', 'B', 'C' ]
+     * $redis->lPop('key1');        // key1 => [ 'B', 'C' ]
+     * </pre>
+     */
+    public function lPop($key)
+    {
+    }
+
+    /**
+     * Returns and removes the last element of the list.
+     *
+     * @param   string $key
+     *
+     * @return  mixed|bool if command executed successfully BOOL FALSE in case of failure (empty list)
+     *
+     * @link    https://redis.io/commands/rpop
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');  // key1 => [ 'A', 'B', 'C' ]
+     * $redis->rPop('key1');        // key1 => [ 'A', 'B' ]
+     * </pre>
+     */
+    public function rPop($key)
+    {
+    }
+
+    /**
+     * Is a blocking lPop primitive. If at least one of the lists contains at least one element,
+     * the element will be popped from the head of the list and returned to the caller.
+     * Il all the list identified by the keys passed in arguments are empty, blPop will block
+     * during the specified timeout until an element is pushed to one of those lists. This element will be popped.
+     *
+     * @param string|string[] $keys    String array containing the keys of the lists OR variadic list of strings
+     * @param int             $timeout Timeout is always the required final parameter
+     *
+     * @return array ['listName', 'element']
+     *
+     * @link    https://redis.io/commands/blpop
+     * @example
+     * <pre>
+     * // Non blocking feature
+     * $redis->lPush('key1', 'A');
+     * $redis->del('key2');
+     *
+     * $redis->blPop('key1', 'key2', 10);        // array('key1', 'A')
+     * // OR
+     * $redis->blPop(['key1', 'key2'], 10);      // array('key1', 'A')
+     *
+     * $redis->brPop('key1', 'key2', 10);        // array('key1', 'A')
+     * // OR
+     * $redis->brPop(['key1', 'key2'], 10); // array('key1', 'A')
+     *
+     * // Blocking feature
+     *
+     * // process 1
+     * $redis->del('key1');
+     * $redis->blPop('key1', 10);
+     * // blocking for 10 seconds
+     *
+     * // process 2
+     * $redis->lPush('key1', 'A');
+     *
+     * // process 1
+     * // array('key1', 'A') is returned
+     * </pre>
+     */
+    public function blPop($keys, $timeout)
+    {
+    }
+
+    /**
+     * Is a blocking rPop primitive. If at least one of the lists contains at least one element,
+     * the element will be popped from the head of the list and returned to the caller.
+     * Il all the list identified by the keys passed in arguments are empty, brPop will
+     * block during the specified timeout until an element is pushed to one of those lists. T
+     * his element will be popped.
+     *
+     * @param string|string[] $keys    String array containing the keys of the lists OR variadic list of strings
+     * @param int             $timeout Timeout is always the required final parameter
+     *
+     * @return array ['listName', 'element']
+     *
+     * @link    https://redis.io/commands/brpop
+     * @example
+     * <pre>
+     * // Non blocking feature
+     * $redis->lPush('key1', 'A');
+     * $redis->del('key2');
+     *
+     * $redis->blPop('key1', 'key2', 10); // array('key1', 'A')
+     * // OR
+     * $redis->blPop(array('key1', 'key2'), 10); // array('key1', 'A')
+     *
+     * $redis->brPop('key1', 'key2', 10); // array('key1', 'A')
+     * // OR
+     * $redis->brPop(array('key1', 'key2'), 10); // array('key1', 'A')
+     *
+     * // Blocking feature
+     *
+     * // process 1
+     * $redis->del('key1');
+     * $redis->blPop('key1', 10);
+     * // blocking for 10 seconds
+     *
+     * // process 2
+     * $redis->lPush('key1', 'A');
+     *
+     * // process 1
+     * // array('key1', 'A') is returned
+     * </pre>
+     */
+    public function brPop(array $keys, $timeout)
+    {
+    }
+
+    /**
+     * Returns the size of a list identified by Key. If the list didn't exist or is empty,
+     * the command returns 0. If the data type identified by Key is not a list, the command return FALSE.
+     *
+     * @param string $key
+     *
+     * @return int|bool The size of the list identified by Key exists.
+     * bool FALSE if the data type identified by Key is not list
+     *
+     * @link    https://redis.io/commands/llen
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C'); // key1 => [ 'A', 'B', 'C' ]
+     * $redis->lLen('key1');       // 3
+     * $redis->rPop('key1');
+     * $redis->lLen('key1');       // 2
+     * </pre>
+     */
+    public function lLen($key)
+    {
+    }
+
+    /**
+     * @see lLen()
+     * @link https://redis.io/commands/llen
+     * @deprecated use Redis::lLen()
+     *
+     * @param string $key
+     *
+     * @return int The size of the list identified by Key exists
+     */
+    public function lSize($key)
+    {
+    }
+
+    /**
+     * Return the specified element of the list stored at the specified key.
+     * 0 the first element, 1 the second ... -1 the last element, -2 the penultimate ...
+     * Return FALSE in case of a bad index or a key that doesn't point to a list.
+     *
+     * @param string $key
+     * @param int    $index
+     *
+     * @return mixed|bool the element at this index
+     *
+     * Bool FALSE if the key identifies a non-string data type, or no value corresponds to this index in the list Key.
+     *
+     * @link    https://redis.io/commands/lindex
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');  // key1 => [ 'A', 'B', 'C' ]
+     * $redis->lIndex('key1', 0);     // 'A'
+     * $redis->lIndex('key1', -1);    // 'C'
+     * $redis->lIndex('key1', 10);    // `FALSE`
+     * </pre>
+     */
+    public function lIndex($key, $index)
+    {
+    }
+
+    /**
+     * @see lIndex()
+     * @link https://redis.io/commands/lindex
+     * @deprecated use Redis::lIndex()
+     *
+     * @param string $key
+     * @param int $index
+     * @return mixed|bool the element at this index
+     */
+    public function lGet($key, $index)
+    {
+    }
+
+    /**
+     * Set the list at index with the new value.
+     *
+     * @param string $key
+     * @param int    $index
+     * @param string $value
+     *
+     * @return bool TRUE if the new value is setted.
+     * FALSE if the index is out of range, or data type identified by key is not a list.
+     *
+     * @link    https://redis.io/commands/lset
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');    // key1 => [ 'A', 'B', 'C' ]
+     * $redis->lIndex('key1', 0);     // 'A'
+     * $redis->lSet('key1', 0, 'X');
+     * $redis->lIndex('key1', 0);     // 'X'
+     * </pre>
+     */
+    public function lSet($key, $index, $value)
+    {
+    }
+
+    /**
+     * Returns the specified elements of the list stored at the specified key in
+     * the range [start, end]. start and stop are interpretated as indices: 0 the first element,
+     * 1 the second ... -1 the last element, -2 the penultimate ...
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     *
+     * @return array containing the values in specified range.
+     *
+     * @link    https://redis.io/commands/lrange
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');
+     * $redis->lRange('key1', 0, -1); // array('A', 'B', 'C')
+     * </pre>
+     */
+    public function lRange($key, $start, $end)
+    {
+    }
+
+    /**
+     * @see lRange()
+     * @link https://redis.io/commands/lrange
+     * @deprecated use Redis::lRange()
+     *
+     * @param string    $key
+     * @param int       $start
+     * @param int       $end
+     * @return array
+     */
+    public function lGetRange($key, $start, $end)
+    {
+    }
+
+    /**
+     * Trims an existing list so that it will contain only a specified range of elements.
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $stop
+     *
+     * @return array|bool Bool return FALSE if the key identify a non-list value
+     *
+     * @link        https://redis.io/commands/ltrim
+     * @example
+     * <pre>
+     * $redis->rPush('key1', 'A');
+     * $redis->rPush('key1', 'B');
+     * $redis->rPush('key1', 'C');
+     * $redis->lRange('key1', 0, -1); // array('A', 'B', 'C')
+     * $redis->lTrim('key1', 0, 1);
+     * $redis->lRange('key1', 0, -1); // array('A', 'B')
+     * </pre>
+     */
+    public function lTrim($key, $start, $stop)
+    {
+    }
+
+    /**
+     * @see lTrim()
+     * @link  https://redis.io/commands/ltrim
+     * @deprecated use Redis::lTrim()
+     *
+     * @param string    $key
+     * @param int       $start
+     * @param int       $stop
+     */
+    public function listTrim($key, $start, $stop)
+    {
+    }
+
+    /**
+     * Removes the first count occurences of the value element from the list.
+     * If count is zero, all the matching elements are removed. If count is negative,
+     * elements are removed from tail to head.
+     *
+     * @param string $key
+     * @param string $value
+     * @param int    $count
+     *
+     * @return int|bool the number of elements to remove
+     * bool FALSE if the value identified by key is not a list.
+     *
+     * @link    https://redis.io/commands/lrem
+     * @example
+     * <pre>
+     * $redis->lPush('key1', 'A');
+     * $redis->lPush('key1', 'B');
+     * $redis->lPush('key1', 'C');
+     * $redis->lPush('key1', 'A');
+     * $redis->lPush('key1', 'A');
+     *
+     * $redis->lRange('key1', 0, -1);   // array('A', 'A', 'C', 'B', 'A')
+     * $redis->lRem('key1', 'A', 2);    // 2
+     * $redis->lRange('key1', 0, -1);   // array('C', 'B', 'A')
+     * </pre>
+     */
+    public function lRem($key, $value, $count)
+    {
+    }
+
+    /**
+     * @see lRem
+     * @link https://redis.io/commands/lremove
+     * @deprecated use Redis::lRem()
+     *
+     * @param string $key
+     * @param string $value
+     * @param int $count
+     */
+    public function lRemove($key, $value, $count)
+    {
+    }
+
+    /**
+     * Insert value in the list before or after the pivot value. the parameter options
+     * specify the position of the insert (before or after). If the list didn't exists,
+     * or the pivot didn't exists, the value is not inserted.
+     *
+     * @param string       $key
+     * @param int          $position Redis::BEFORE | Redis::AFTER
+     * @param string       $pivot
+     * @param string|mixed $value
+     *
+     * @return int The number of the elements in the list, -1 if the pivot didn't exists.
+     *
+     * @link    https://redis.io/commands/linsert
+     * @example
+     * <pre>
+     * $redis->del('key1');
+     * $redis->lInsert('key1', Redis::AFTER, 'A', 'X');     // 0
+     *
+     * $redis->lPush('key1', 'A');
+     * $redis->lPush('key1', 'B');
+     * $redis->lPush('key1', 'C');
+     *
+     * $redis->lInsert('key1', Redis::BEFORE, 'C', 'X');    // 4
+     * $redis->lRange('key1', 0, -1);                       // array('A', 'B', 'X', 'C')
+     *
+     * $redis->lInsert('key1', Redis::AFTER, 'C', 'Y');     // 5
+     * $redis->lRange('key1', 0, -1);                       // array('A', 'B', 'X', 'C', 'Y')
+     *
+     * $redis->lInsert('key1', Redis::AFTER, 'W', 'value'); // -1
+     * </pre>
+     */
+    public function lInsert($key, $position, $pivot, $value)
+    {
+    }
+
+    /**
+     * Adds a values to the set value stored at key.
+     *
+     * @param string       $key       Required key
+     * @param string|mixed ...$value1 Variadic list of values
+     *
+     * @return int|bool The number of elements added to the set.
+     * If this value is already in the set, FALSE is returned
+     *
+     * @link    https://redis.io/commands/sadd
+     * @example
+     * <pre>
+     * $redis->sAdd('k', 'v1');                // int(1)
+     * $redis->sAdd('k', 'v1', 'v2', 'v3');    // int(2)
+     * </pre>
+     */
+    public function sAdd($key, ...$value1)
+    {
+    }
+
+    /**
+     * Removes the specified members from the set value stored at key.
+     *
+     * @param   string       $key
+     * @param   string|mixed ...$member1 Variadic list of members
+     *
+     * @return int The number of elements removed from the set
+     *
+     * @link    https://redis.io/commands/srem
+     * @example
+     * <pre>
+     * var_dump( $redis->sAdd('k', 'v1', 'v2', 'v3') );    // int(3)
+     * var_dump( $redis->sRem('k', 'v2', 'v3') );          // int(2)
+     * var_dump( $redis->sMembers('k') );
+     * //// Output:
+     * // array(1) {
+     * //   [0]=> string(2) "v1"
+     * // }
+     * </pre>
+     */
+    public function sRem($key, ...$member1)
+    {
+    }
+
+    /**
+     * @see sRem()
+     * @link    https://redis.io/commands/srem
+     * @deprecated use Redis::sRem()
+     *
+     * @param   string  $key
+     * @param   string|mixed  ...$member1
+     */
+    public function sRemove($key, ...$member1)
+    {
+    }
+
+    /**
+     * Moves the specified member from the set at srcKey to the set at dstKey.
+     *
+     * @param string       $srcKey
+     * @param string       $dstKey
+     * @param string|mixed $member
+     *
+     * @return bool If the operation is successful, return TRUE.
+     * If the srcKey and/or dstKey didn't exist, and/or the member didn't exist in srcKey, FALSE is returned.
+     *
+     * @link    https://redis.io/commands/smove
+     * @example
+     * <pre>
+     * $redis->sAdd('key1' , 'set11');
+     * $redis->sAdd('key1' , 'set12');
+     * $redis->sAdd('key1' , 'set13');          // 'key1' => {'set11', 'set12', 'set13'}
+     * $redis->sAdd('key2' , 'set21');
+     * $redis->sAdd('key2' , 'set22');          // 'key2' => {'set21', 'set22'}
+     * $redis->sMove('key1', 'key2', 'set13');  // 'key1' =>  {'set11', 'set12'}
+     *                                          // 'key2' =>  {'set21', 'set22', 'set13'}
+     * </pre>
+     */
+    public function sMove($srcKey, $dstKey, $member)
+    {
+    }
+
+    /**
+     * Checks if value is a member of the set stored at the key key.
+     *
+     * @param string       $key
+     * @param string|mixed $value
+     *
+     * @return bool TRUE if value is a member of the set at key key, FALSE otherwise
+     *
+     * @link    https://redis.io/commands/sismember
+     * @example
+     * <pre>
+     * $redis->sAdd('key1' , 'set1');
+     * $redis->sAdd('key1' , 'set2');
+     * $redis->sAdd('key1' , 'set3'); // 'key1' => {'set1', 'set2', 'set3'}
+     *
+     * $redis->sIsMember('key1', 'set1'); // TRUE
+     * $redis->sIsMember('key1', 'setX'); // FALSE
+     * </pre>
+     */
+    public function sIsMember($key, $value)
+    {
+    }
+
+    /**
+     * @see sIsMember()
+     * @link    https://redis.io/commands/sismember
+     * @deprecated use Redis::sIsMember()
+     *
+     * @param string       $key
+     * @param string|mixed $value
+     */
+    public function sContains($key, $value)
+    {
+    }
+
+    /**
+     * Returns the cardinality of the set identified by key.
+     *
+     * @param string $key
+     *
+     * @return int the cardinality of the set identified by key, 0 if the set doesn't exist.
+     *
+     * @link    https://redis.io/commands/scard
+     * @example
+     * <pre>
+     * $redis->sAdd('key1' , 'set1');
+     * $redis->sAdd('key1' , 'set2');
+     * $redis->sAdd('key1' , 'set3');   // 'key1' => {'set1', 'set2', 'set3'}
+     * $redis->sCard('key1');           // 3
+     * $redis->sCard('keyX');           // 0
+     * </pre>
+     */
+    public function sCard($key)
+    {
+    }
+
+    /**
+     * Removes and returns a random element from the set value at Key.
+     *
+     * @param string $key
+     *
+     * @return string|mixed|bool "popped" value
+     * bool FALSE if set identified by key is empty or doesn't exist.
+     *
+     * @link    https://redis.io/commands/spop
+     * @example
+     * <pre>
+     * $redis->sAdd('key1' , 'set1');
+     * $redis->sAdd('key1' , 'set2');
+     * $redis->sAdd('key1' , 'set3');   // 'key1' => {'set3', 'set1', 'set2'}
+     * $redis->sPop('key1');            // 'set1', 'key1' => {'set3', 'set2'}
+     * $redis->sPop('key1');            // 'set3', 'key1' => {'set2'}
+     * </pre>
+     */
+    public function sPop($key)
+    {
+    }
+
+    /**
+     * Returns a random element(s) from the set value at Key, without removing it.
+     *
+     * @param string $key
+     * @param int    $count [optional]
+     *
+     * @return string|mixed|array|bool value(s) from the set
+     * bool FALSE if set identified by key is empty or doesn't exist and count argument isn't passed.
+     *
+     * @link    https://redis.io/commands/srandmember
+     * @example
+     * <pre>
+     * $redis->sAdd('key1' , 'one');
+     * $redis->sAdd('key1' , 'two');
+     * $redis->sAdd('key1' , 'three');              // 'key1' => {'one', 'two', 'three'}
+     *
+     * var_dump( $redis->sRandMember('key1') );     // 'key1' => {'one', 'two', 'three'}
+     *
+     * // string(5) "three"
+     *
+     * var_dump( $redis->sRandMember('key1', 2) );  // 'key1' => {'one', 'two', 'three'}
+     *
+     * // array(2) {
+     * //   [0]=> string(2) "one"
+     * //   [1]=> string(2) "three"
+     * // }
+     * </pre>
+     */
+    public function sRandMember($key, $count = 1)
+    {
+    }
+
+    /**
+     * Returns the members of a set resulting from the intersection of all the sets
+     * held at the specified keys. If just a single key is specified, then this command
+     * produces the members of this set. If one of the keys is missing, FALSE is returned.
+     *
+     * @param string $key1         keys identifying the different sets on which we will apply the intersection.
+     * @param string ...$otherKeys variadic list of keys
+     *
+     * @return array contain the result of the intersection between those keys
+     * If the intersection between the different sets is empty, the return value will be empty array.
+     *
+     * @link    https://redis.io/commands/sinter
+     * @example
+     * <pre>
+     * $redis->sAdd('key1', 'val1');
+     * $redis->sAdd('key1', 'val2');
+     * $redis->sAdd('key1', 'val3');
+     * $redis->sAdd('key1', 'val4');
+     *
+     * $redis->sAdd('key2', 'val3');
+     * $redis->sAdd('key2', 'val4');
+     *
+     * $redis->sAdd('key3', 'val3');
+     * $redis->sAdd('key3', 'val4');
+     *
+     * var_dump($redis->sInter('key1', 'key2', 'key3'));
+     *
+     * //array(2) {
+     * //  [0]=>
+     * //  string(4) "val4"
+     * //  [1]=>
+     * //  string(4) "val3"
+     * //}
+     * </pre>
+     */
+    public function sInter($key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Performs a sInter command and stores the result in a new set.
+     *
+     * @param string $dstKey       the key to store the diff into.
+     * @param string $key1         keys identifying the different sets on which we will apply the intersection.
+     * @param string ...$otherKeys variadic list of keys
+     *
+     * @return int|bool The cardinality of the resulting set, or FALSE in case of a missing key
+     *
+     * @link    https://redis.io/commands/sinterstore
+     * @example
+     * <pre>
+     * $redis->sAdd('key1', 'val1');
+     * $redis->sAdd('key1', 'val2');
+     * $redis->sAdd('key1', 'val3');
+     * $redis->sAdd('key1', 'val4');
+     *
+     * $redis->sAdd('key2', 'val3');
+     * $redis->sAdd('key2', 'val4');
+     *
+     * $redis->sAdd('key3', 'val3');
+     * $redis->sAdd('key3', 'val4');
+     *
+     * var_dump($redis->sInterStore('output', 'key1', 'key2', 'key3'));
+     * var_dump($redis->sMembers('output'));
+     *
+     * //int(2)
+     * //
+     * //array(2) {
+     * //  [0]=>
+     * //  string(4) "val4"
+     * //  [1]=>
+     * //  string(4) "val3"
+     * //}
+     * </pre>
+     */
+    public function sInterStore($dstKey, $key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Performs the union between N sets and returns it.
+     *
+     * @param string $key1         first key for union
+     * @param string ...$otherKeys variadic list of keys corresponding to sets in redis
+     *
+     * @return array string[] The union of all these sets
+     *
+     * @link    https://redis.io/commands/sunionstore
+     * @example
+     * <pre>
+     * $redis->sAdd('s0', '1');
+     * $redis->sAdd('s0', '2');
+     * $redis->sAdd('s1', '3');
+     * $redis->sAdd('s1', '1');
+     * $redis->sAdd('s2', '3');
+     * $redis->sAdd('s2', '4');
+     *
+     * var_dump($redis->sUnion('s0', 's1', 's2'));
+     *
+     * array(4) {
+     * //  [0]=>
+     * //  string(1) "3"
+     * //  [1]=>
+     * //  string(1) "4"
+     * //  [2]=>
+     * //  string(1) "1"
+     * //  [3]=>
+     * //  string(1) "2"
+     * //}
+     * </pre>
+     */
+    public function sUnion($key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Performs the same action as sUnion, but stores the result in the first key
+     *
+     * @param   string  $dstKey  the key to store the diff into.
+     * @param string $key1         first key for union
+     * @param string ...$otherKeys variadic list of keys corresponding to sets in redis
+     *
+     * @return int Any number of keys corresponding to sets in redis
+     *
+     * @link    https://redis.io/commands/sunionstore
+     * @example
+     * <pre>
+     * $redis->del('s0', 's1', 's2');
+     *
+     * $redis->sAdd('s0', '1');
+     * $redis->sAdd('s0', '2');
+     * $redis->sAdd('s1', '3');
+     * $redis->sAdd('s1', '1');
+     * $redis->sAdd('s2', '3');
+     * $redis->sAdd('s2', '4');
+     *
+     * var_dump($redis->sUnionStore('dst', 's0', 's1', 's2'));
+     * var_dump($redis->sMembers('dst'));
+     *
+     * //int(4)
+     * //array(4) {
+     * //  [0]=>
+     * //  string(1) "3"
+     * //  [1]=>
+     * //  string(1) "4"
+     * //  [2]=>
+     * //  string(1) "1"
+     * //  [3]=>
+     * //  string(1) "2"
+     * //}
+     * </pre>
+     */
+    public function sUnionStore($dstKey, $key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Performs the difference between N sets and returns it.
+     *
+     * @param string $key1         first key for diff
+     * @param string ...$otherKeys variadic list of keys corresponding to sets in redis
+     *
+     * @return array string[] The difference of the first set will all the others
+     *
+     * @link    https://redis.io/commands/sdiff
+     * @example
+     * <pre>
+     * $redis->del('s0', 's1', 's2');
+     *
+     * $redis->sAdd('s0', '1');
+     * $redis->sAdd('s0', '2');
+     * $redis->sAdd('s0', '3');
+     * $redis->sAdd('s0', '4');
+     *
+     * $redis->sAdd('s1', '1');
+     * $redis->sAdd('s2', '3');
+     *
+     * var_dump($redis->sDiff('s0', 's1', 's2'));
+     *
+     * //array(2) {
+     * //  [0]=>
+     * //  string(1) "4"
+     * //  [1]=>
+     * //  string(1) "2"
+     * //}
+     * </pre>
+     */
+    public function sDiff($key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Performs the same action as sDiff, but stores the result in the first key
+     *
+     * @param string $dstKey       the key to store the diff into.
+     * @param string $key1         first key for diff
+     * @param string ...$otherKeys variadic list of keys corresponding to sets in redis
+     *
+     * @return int|bool The cardinality of the resulting set, or FALSE in case of a missing key
+     *
+     * @link    https://redis.io/commands/sdiffstore
+     * @example
+     * <pre>
+     * $redis->del('s0', 's1', 's2');
+     *
+     * $redis->sAdd('s0', '1');
+     * $redis->sAdd('s0', '2');
+     * $redis->sAdd('s0', '3');
+     * $redis->sAdd('s0', '4');
+     *
+     * $redis->sAdd('s1', '1');
+     * $redis->sAdd('s2', '3');
+     *
+     * var_dump($redis->sDiffStore('dst', 's0', 's1', 's2'));
+     * var_dump($redis->sMembers('dst'));
+     *
+     * //int(2)
+     * //array(2) {
+     * //  [0]=>
+     * //  string(1) "4"
+     * //  [1]=>
+     * //  string(1) "2"
+     * //}
+     * </pre>
+     */
+    public function sDiffStore($dstKey, $key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Returns the contents of a set.
+     *
+     * @param string $key
+     *
+     * @return array An array of elements, the contents of the set
+     *
+     * @link    https://redis.io/commands/smembers
+     * @example
+     * <pre>
+     * $redis->del('s');
+     * $redis->sAdd('s', 'a');
+     * $redis->sAdd('s', 'b');
+     * $redis->sAdd('s', 'a');
+     * $redis->sAdd('s', 'c');
+     * var_dump($redis->sMembers('s'));
+     *
+     * //array(3) {
+     * //  [0]=>
+     * //  string(1) "c"
+     * //  [1]=>
+     * //  string(1) "a"
+     * //  [2]=>
+     * //  string(1) "b"
+     * //}
+     * // The order is random and corresponds to redis' own internal representation of the set structure.
+     * </pre>
+     */
+    public function sMembers($key)
+    {
+    }
+
+    /**
+     * @see sMembers()
+     * @link    https://redis.io/commands/smembers
+     * @deprecated use Redis::sMembers()
+     *
+     * @param  string  $key
+     * @return array   An array of elements, the contents of the set
+     */
+    public function sGetMembers($key)
+    {
+    }
+
+    /**
+     * Scan a set for members
+     *
+     * @param string $key      The set to search.
+     * @param int    $iterator LONG (reference) to the iterator as we go.
+     * @param string   $pattern  String, optional pattern to match against.
+     * @param int    $count    How many members to return at a time (Redis might return a different amount)
+     *
+     * @return array|bool PHPRedis will return an array of keys or FALSE when we're done iterating
+     *
+     * @link    https://redis.io/commands/sscan
+     * @example
+     * <pre>
+     * $iterator = null;
+     * while ($members = $redis->sScan('set', $iterator)) {
+     *     foreach ($members as $member) {
+     *         echo $member . PHP_EOL;
+     *     }
+     * }
+     * </pre>
+     */
+    public function sScan($key, &$iterator, $pattern = null, $count = 0)
+    {
+    }
+
+    /**
+     * Sets a value and returns the previous entry at that key.
+     *
+     * @param string       $key
+     * @param string|mixed $value
+     *
+     * @return string|mixed A string (mixed, if used serializer), the previous value located at this key
+     *
+     * @link    https://redis.io/commands/getset
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $exValue = $redis->getSet('x', 'lol');   // return '42', replaces x by 'lol'
+     * $newValue = $redis->get('x')'            // return 'lol'
+     * </pre>
+     */
+    public function getSet($key, $value)
+    {
+    }
+
+    /**
+     * Returns a random key
+     *
+     * @return string an existing key in redis
+     *
+     * @link    https://redis.io/commands/randomkey
+     * @example
+     * <pre>
+     * $key = $redis->randomKey();
+     * $surprise = $redis->get($key);  // who knows what's in there.
+     * </pre>
+     */
+    public function randomKey()
+    {
+    }
+
+    /**
+     * Switches to a given database
+     *
+     * @param int $dbIndex
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/select
+     * @example
+     * <pre>
+     * $redis->select(0);       // switch to DB 0
+     * $redis->set('x', '42');  // write 42 to x
+     * $redis->move('x', 1);    // move to DB 1
+     * $redis->select(1);       // switch to DB 1
+     * $redis->get('x');        // will return 42
+     * </pre>
+     */
+    public function select($dbIndex)
+    {
+    }
+
+    /**
+     * Moves a key to a different database.
+     *
+     * @param string $key
+     * @param int    $dbIndex
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/move
+     * @example
+     * <pre>
+     * $redis->select(0);       // switch to DB 0
+     * $redis->set('x', '42');  // write 42 to x
+     * $redis->move('x', 1);    // move to DB 1
+     * $redis->select(1);       // switch to DB 1
+     * $redis->get('x');        // will return 42
+     * </pre>
+     */
+    public function move($key, $dbIndex)
+    {
+    }
+
+    /**
+     * Renames a key
+     *
+     * @param string $srcKey
+     * @param string $dstKey
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/rename
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $redis->rename('x', 'y');
+     * $redis->get('y');   // → 42
+     * $redis->get('x');   // → `FALSE`
+     * </pre>
+     */
+    public function rename($srcKey, $dstKey)
+    {
+    }
+
+    /**
+     * @see rename()
+     * @link    https://redis.io/commands/rename
+     * @deprecated use Redis::rename()
+     *
+     * @param   string  $srcKey
+     * @param   string  $dstKey
+     */
+    public function renameKey($srcKey, $dstKey)
+    {
+    }
+
+    /**
+     * Renames a key
+     *
+     * Same as rename, but will not replace a key if the destination already exists.
+     * This is the same behaviour as setNx.
+     *
+     * @param string $srcKey
+     * @param string $dstKey
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/renamenx
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $redis->rename('x', 'y');
+     * $redis->get('y');   // → 42
+     * $redis->get('x');   // → `FALSE`
+     * </pre>
+     */
+    public function renameNx($srcKey, $dstKey)
+    {
+    }
+
+    /**
+     * Sets an expiration date (a timeout) on an item
+     *
+     * @param string $key The key that will disappear
+     * @param int    $ttl The key's remaining Time To Live, in seconds
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/expire
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $redis->expire('x', 3);  // x will disappear in 3 seconds.
+     * sleep(5);                    // wait 5 seconds
+     * $redis->get('x');            // will return `FALSE`, as 'x' has expired.
+     * </pre>
+     */
+    public function expire($key, $ttl)
+    {
+    }
+
+    /**
+     * Sets an expiration date (a timeout in milliseconds) on an item
+     *
+     * @param string $key The key that will disappear.
+     * @param int    $ttl The key's remaining Time To Live, in milliseconds
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/pexpire
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $redis->pExpire('x', 11500); // x will disappear in 11500 milliseconds.
+     * $redis->ttl('x');            // 12
+     * $redis->pttl('x');           // 11500
+     * </pre>
+     */
+    public function pExpire($key, $ttl)
+    {
+    }
+
+    /**
+     * @see expire()
+     * @link    https://redis.io/commands/expire
+     * @deprecated use Redis::expire()
+     *
+     * @param   string  $key
+     * @param   int     $ttl
+     * @return  bool
+     */
+    public function setTimeout($key, $ttl)
+    {
+    }
+
+    /**
+     * Sets an expiration date (a timestamp) on an item.
+     *
+     * @param string $key       The key that will disappear.
+     * @param int    $timestamp Unix timestamp. The key's date of death, in seconds from Epoch time.
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/expireat
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $now = time(NULL);               // current timestamp
+     * $redis->expireAt('x', $now + 3); // x will disappear in 3 seconds.
+     * sleep(5);                        // wait 5 seconds
+     * $redis->get('x');                // will return `FALSE`, as 'x' has expired.
+     * </pre>
+     */
+    public function expireAt($key, $timestamp)
+    {
+    }
+
+    /**
+     * Sets an expiration date (a timestamp) on an item. Requires a timestamp in milliseconds
+     *
+     * @param string $key       The key that will disappear
+     * @param int    $timestamp Unix timestamp. The key's date of death, in seconds from Epoch time
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/pexpireat
+     * @example
+     * <pre>
+     * $redis->set('x', '42');
+     * $redis->pExpireAt('x', 1555555555005);
+     * echo $redis->ttl('x');                       // 218270121
+     * echo $redis->pttl('x');                      // 218270120575
+     * </pre>
+     */
+    public function pExpireAt($key, $timestamp)
+    {
+    }
+
+    /**
+     * Returns the keys that match a certain pattern.
+     *
+     * @param string $pattern pattern, using '*' as a wildcard
+     *
+     * @return array string[] The keys that match a certain pattern.
+     *
+     * @link    https://redis.io/commands/keys
+     * @example
+     * <pre>
+     * $allKeys = $redis->keys('*');   // all keys will match this.
+     * $keyWithUserPrefix = $redis->keys('user*');
+     * </pre>
+     */
+    public function keys($pattern)
+    {
+    }
+
+    /**
+     * @see keys()
+     * @deprecated use Redis::keys()
+     *
+     * @param string $pattern
+     * @link    https://redis.io/commands/keys
+     */
+    public function getKeys($pattern)
+    {
+    }
+
+    /**
+     * Returns the current database's size
+     *
+     * @return int DB size, in number of keys
+     *
+     * @link    https://redis.io/commands/dbsize
+     * @example
+     * <pre>
+     * $count = $redis->dbSize();
+     * echo "Redis has $count keys\n";
+     * </pre>
+     */
+    public function dbSize()
+    {
+    }
+
+    /**
+     * Authenticate the connection using a password.
+     * Warning: The password is sent in plain-text over the network.
+     *
+     * @param string $password
+     *
+     * @return bool TRUE if the connection is authenticated, FALSE otherwise
+     *
+     * @link    https://redis.io/commands/auth
+     * @example $redis->auth('foobared');
+     */
+    public function auth($password)
+    {
+    }
+
+    /**
+     * Starts the background rewrite of AOF (Append-Only File)
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/bgrewriteaof
+     * @example $redis->bgrewriteaof();
+     */
+    public function bgrewriteaof()
+    {
+    }
+
+    /**
+     * Changes the slave status
+     * Either host and port, or no parameter to stop being a slave.
+     *
+     * @param string $host [optional]
+     * @param int    $port [optional]
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/slaveof
+     * @example
+     * <pre>
+     * $redis->slaveof('10.0.1.7', 6379);
+     * // ...
+     * $redis->slaveof();
+     * </pre>
+     */
+    public function slaveof($host = '127.0.0.1', $port = 6379)
+    {
+    }
+
+    /**
+     * Access the Redis slowLog
+     *
+     * @param string   $operation This can be either GET, LEN, or RESET
+     * @param int|null $length    If executing a SLOWLOG GET command, you can pass an optional length.
+     *
+     * @return mixed The return value of SLOWLOG will depend on which operation was performed.
+     * - SLOWLOG GET: Array of slowLog entries, as provided by Redis
+     * - SLOGLOG LEN: Integer, the length of the slowLog
+     * - SLOWLOG RESET: Boolean, depending on success
+     *
+     * @example
+     * <pre>
+     * // Get ten slowLog entries
+     * $redis->slowLog('get', 10);
+     * // Get the default number of slowLog entries
+     *
+     * $redis->slowLog('get');
+     * // Reset our slowLog
+     * $redis->slowLog('reset');
+     *
+     * // Retrieve slowLog length
+     * $redis->slowLog('len');
+     * </pre>
+     *
+     * @link https://redis.io/commands/slowlog
+     */
+    public function slowLog(string $operation, int $length = null)
+    {
+    }
+
+
+    /**
+     * Describes the object pointed to by a key.
+     * The information to retrieve (string) and the key (string).
+     * Info can be one of the following:
+     * - "encoding"
+     * - "refcount"
+     * - "idletime"
+     *
+     * @param string $string
+     * @param string $key
+     *
+     * @return string|int|bool for "encoding", int for "refcount" and "idletime", FALSE if the key doesn't exist.
+     *
+     * @link    https://redis.io/commands/object
+     * @example
+     * <pre>
+     * $redis->lPush('l', 'Hello, world!');
+     * $redis->object("encoding", "l"); // → ziplist
+     * $redis->object("refcount", "l"); // → 1
+     * $redis->object("idletime", "l"); // → 400 (in seconds, with a precision of 10 seconds).
+     * </pre>
+     */
+    public function object($string = '', $key = '')
+    {
+    }
+
+    /**
+     * Performs a synchronous save.
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     * If a save is already running, this command will fail and return FALSE.
+     *
+     * @link    https://redis.io/commands/save
+     * @example $redis->save();
+     */
+    public function save()
+    {
+    }
+
+    /**
+     * Performs a background save.
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     * If a save is already running, this command will fail and return FALSE
+     *
+     * @link    https://redis.io/commands/bgsave
+     * @example $redis->bgSave();
+     */
+    public function bgsave()
+    {
+    }
+
+    /**
+     * Returns the timestamp of the last disk save.
+     *
+     * @return int timestamp
+     *
+     * @link    https://redis.io/commands/lastsave
+     * @example $redis->lastSave();
+     */
+    public function lastSave()
+    {
+    }
+
+    /**
+     * Blocks the current client until all the previous write commands are successfully transferred and
+     * acknowledged by at least the specified number of slaves.
+     *
+     * @param int $numSlaves Number of slaves that need to acknowledge previous write commands.
+     * @param int $timeout   Timeout in milliseconds.
+     *
+     * @return  int The command returns the number of slaves reached by all the writes performed in the
+     *              context of the current connection
+     *
+     * @link    https://redis.io/commands/wait
+     * @example $redis->wait(2, 1000);
+     */
+    public function wait($numSlaves, $timeout)
+    {
+    }
+
+    /**
+     * Returns the type of data pointed by a given key.
+     *
+     * @param string $key
+     *
+     * @return int
+     * Depending on the type of the data pointed by the key,
+     * this method will return the following value:
+     * - string: Redis::REDIS_STRING
+     * - set:   Redis::REDIS_SET
+     * - list:  Redis::REDIS_LIST
+     * - zset:  Redis::REDIS_ZSET
+     * - hash:  Redis::REDIS_HASH
+     * - other: Redis::REDIS_NOT_FOUND
+     *
+     * @link    https://redis.io/commands/type
+     * @example $redis->type('key');
+     */
+    public function type($key)
+    {
+    }
+
+    /**
+     * Append specified string to the string stored in specified key.
+     *
+     * @param string       $key
+     * @param string|mixed $value
+     *
+     * @return int Size of the value after the append
+     *
+     * @link    https://redis.io/commands/append
+     * @example
+     * <pre>
+     * $redis->set('key', 'value1');
+     * $redis->append('key', 'value2'); // 12
+     * $redis->get('key');              // 'value1value2'
+     * </pre>
+     */
+    public function append($key, $value)
+    {
+    }
+
+    /**
+     * Return a substring of a larger string
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     *
+     * @return string the substring
+     *
+     * @link    https://redis.io/commands/getrange
+     * @example
+     * <pre>
+     * $redis->set('key', 'string value');
+     * $redis->getRange('key', 0, 5);   // 'string'
+     * $redis->getRange('key', -5, -1); // 'value'
+     * </pre>
+     */
+    public function getRange($key, $start, $end)
+    {
+    }
+
+    /**
+     * Return a substring of a larger string
+     *
+     * @deprecated
+     * @param   string  $key
+     * @param   int     $start
+     * @param   int     $end
+     */
+    public function substr($key, $start, $end)
+    {
+    }
+
+    /**
+     * Changes a substring of a larger string.
+     *
+     * @param string $key
+     * @param int    $offset
+     * @param string $value
+     *
+     * @return int the length of the string after it was modified
+     *
+     * @link    https://redis.io/commands/setrange
+     * @example
+     * <pre>
+     * $redis->set('key', 'Hello world');
+     * $redis->setRange('key', 6, "redis"); // returns 11
+     * $redis->get('key');                  // "Hello redis"
+     * </pre>
+     */
+    public function setRange($key, $offset, $value)
+    {
+    }
+
+    /**
+     * Get the length of a string value.
+     *
+     * @param string $key
+     * @return int
+     *
+     * @link    https://redis.io/commands/strlen
+     * @example
+     * <pre>
+     * $redis->set('key', 'value');
+     * $redis->strlen('key'); // 5
+     * </pre>
+     */
+    public function strlen($key)
+    {
+    }
+
+    /**
+     * Return the position of the first bit set to 1 or 0 in a string. The position is returned, thinking of the
+     * string as an array of bits from left to right, where the first byte's most significant bit is at position 0,
+     * the second byte's most significant bit is at position 8, and so forth.
+     *
+     * @param string $key
+     * @param int    $bit
+     * @param int    $start
+     * @param int    $end
+     *
+     * @return int The command returns the position of the first bit set to 1 or 0 according to the request.
+     * If we look for set bits (the bit argument is 1) and the string is empty or composed of just
+     * zero bytes, -1 is returned. If we look for clear bits (the bit argument is 0) and the string
+     * only contains bit set to 1, the function returns the first bit not part of the string on the
+     * right. So if the string is three bytes set to the value 0xff the command BITPOS key 0 will
+     * return 24, since up to bit 23 all the bits are 1. Basically, the function considers the right
+     * of the string as padded with zeros if you look for clear bits and specify no range or the
+     * start argument only. However, this behavior changes if you are looking for clear bits and
+     * specify a range with both start and end. If no clear bit is found in the specified range, the
+     * function returns -1 as the user specified a clear range and there are no 0 bits in that range.
+     *
+     * @link    https://redis.io/commands/bitpos
+     * @example
+     * <pre>
+     * $redis->set('key', '\xff\xff');
+     * $redis->bitpos('key', 1); // int(0)
+     * $redis->bitpos('key', 1, 1); // int(8)
+     * $redis->bitpos('key', 1, 3); // int(-1)
+     * $redis->bitpos('key', 0); // int(16)
+     * $redis->bitpos('key', 0, 1); // int(16)
+     * $redis->bitpos('key', 0, 1, 5); // int(-1)
+     * </pre>
+     */
+    public function bitpos($key, $bit, $start = 0, $end = null)
+    {
+    }
+
+    /**
+     * Return a single bit out of a larger string
+     *
+     * @param string $key
+     * @param int    $offset
+     *
+     * @return int the bit value (0 or 1)
+     *
+     * @link    https://redis.io/commands/getbit
+     * @example
+     * <pre>
+     * $redis->set('key', "\x7f");  // this is 0111 1111
+     * $redis->getBit('key', 0);    // 0
+     * $redis->getBit('key', 1);    // 1
+     * </pre>
+     */
+    public function getBit($key, $offset)
+    {
+    }
+
+    /**
+     * Changes a single bit of a string.
+     *
+     * @param string   $key
+     * @param int      $offset
+     * @param bool|int $value  bool or int (1 or 0)
+     *
+     * @return int 0 or 1, the value of the bit before it was set
+     *
+     * @link    https://redis.io/commands/setbit
+     * @example
+     * <pre>
+     * $redis->set('key', "*");     // ord("*") = 42 = 0x2f = "0010 1010"
+     * $redis->setBit('key', 5, 1); // returns 0
+     * $redis->setBit('key', 7, 1); // returns 0
+     * $redis->get('key');          // chr(0x2f) = "/" = b("0010 1111")
+     * </pre>
+     */
+    public function setBit($key, $offset, $value)
+    {
+    }
+
+    /**
+     * Count bits in a string
+     *
+     * @param string $key
+     *
+     * @return int The number of bits set to 1 in the value behind the input key
+     *
+     * @link    https://redis.io/commands/bitcount
+     * @example
+     * <pre>
+     * $redis->set('bit', '345'); // // 11 0011  0011 0100  0011 0101
+     * var_dump( $redis->bitCount('bit', 0, 0) ); // int(4)
+     * var_dump( $redis->bitCount('bit', 1, 1) ); // int(3)
+     * var_dump( $redis->bitCount('bit', 2, 2) ); // int(4)
+     * var_dump( $redis->bitCount('bit', 0, 2) ); // int(11)
+     * </pre>
+     */
+    public function bitCount($key)
+    {
+    }
+
+    /**
+     * Bitwise operation on multiple keys.
+     *
+     * @param string $operation    either "AND", "OR", "NOT", "XOR"
+     * @param string $retKey       return key
+     * @param string $key1         first key
+     * @param string ...$otherKeys variadic list of keys
+     *
+     * @return int The size of the string stored in the destination key
+     *
+     * @link    https://redis.io/commands/bitop
+     * @example
+     * <pre>
+     * $redis->set('bit1', '1'); // 11 0001
+     * $redis->set('bit2', '2'); // 11 0010
+     *
+     * $redis->bitOp('AND', 'bit', 'bit1', 'bit2'); // bit = 110000
+     * $redis->bitOp('OR',  'bit', 'bit1', 'bit2'); // bit = 110011
+     * $redis->bitOp('NOT', 'bit', 'bit1', 'bit2'); // bit = 110011
+     * $redis->bitOp('XOR', 'bit', 'bit1', 'bit2'); // bit = 11
+     * </pre>
+     */
+    public function bitOp($operation, $retKey, $key1, ...$otherKeys)
+    {
+    }
+
+    /**
+     * Removes all entries from the current database.
+     *
+     * @return bool Always TRUE
+     * @link    https://redis.io/commands/flushdb
+     * @example $redis->flushDB();
+     */
+    public function flushDB()
+    {
+    }
+
+    /**
+     * Removes all entries from all databases.
+     *
+     * @return bool Always TRUE
+     *
+     * @link    https://redis.io/commands/flushall
+     * @example $redis->flushAll();
+     */
+    public function flushAll()
+    {
+    }
+
+    /**
+     * Sort
+     *
+     * @param string $key
+     * @param array  $option array(key => value, ...) - optional, with the following keys and values:
+     * - 'by' => 'some_pattern_*',
+     * - 'limit' => array(0, 1),
+     * - 'get' => 'some_other_pattern_*' or an array of patterns,
+     * - 'sort' => 'asc' or 'desc',
+     * - 'alpha' => TRUE,
+     * - 'store' => 'external-key'
+     *
+     * @return array
+     * An array of values, or a number corresponding to the number of elements stored if that was used
+     *
+     * @link    https://redis.io/commands/sort
+     * @example
+     * <pre>
+     * $redis->del('s');
+     * $redis->sadd('s', 5);
+     * $redis->sadd('s', 4);
+     * $redis->sadd('s', 2);
+     * $redis->sadd('s', 1);
+     * $redis->sadd('s', 3);
+     *
+     * var_dump($redis->sort('s')); // 1,2,3,4,5
+     * var_dump($redis->sort('s', array('sort' => 'desc'))); // 5,4,3,2,1
+     * var_dump($redis->sort('s', array('sort' => 'desc', 'store' => 'out'))); // (int)5
+     * </pre>
+     */
+    public function sort($key, $option = null)
+    {
+    }
+
+    /**
+     * Returns an associative array of strings and integers
+     *
+     * @param string $option Optional. The option to provide redis.
+     * SERVER | CLIENTS | MEMORY | PERSISTENCE | STATS | REPLICATION | CPU | CLASTER | KEYSPACE | COMANDSTATS
+     *
+     * Returns an associative array of strings and integers, with the following keys:
+     * - redis_version
+     * - redis_git_sha1
+     * - redis_git_dirty
+     * - arch_bits
+     * - multiplexing_api
+     * - process_id
+     * - uptime_in_seconds
+     * - uptime_in_days
+     * - lru_clock
+     * - used_cpu_sys
+     * - used_cpu_user
+     * - used_cpu_sys_children
+     * - used_cpu_user_children
+     * - connected_clients
+     * - connected_slaves
+     * - client_longest_output_list
+     * - client_biggest_input_buf
+     * - blocked_clients
+     * - used_memory
+     * - used_memory_human
+     * - used_memory_peak
+     * - used_memory_peak_human
+     * - mem_fragmentation_ratio
+     * - mem_allocator
+     * - loading
+     * - aof_enabled
+     * - changes_since_last_save
+     * - bgsave_in_progress
+     * - last_save_time
+     * - total_connections_received
+     * - total_commands_processed
+     * - expired_keys
+     * - evicted_keys
+     * - keyspace_hits
+     * - keyspace_misses
+     * - hash_max_zipmap_entries
+     * - hash_max_zipmap_value
+     * - pubsub_channels
+     * - pubsub_patterns
+     * - latest_fork_usec
+     * - vm_enabled
+     * - role
+     *
+     * @return string
+     *
+     * @link    https://redis.io/commands/info
+     * @example
+     * <pre>
+     * $redis->info();
+     *
+     * or
+     *
+     * $redis->info("COMMANDSTATS"); //Information on the commands that have been run (>=2.6 only)
+     * $redis->info("CPU"); // just CPU information from Redis INFO
+     * </pre>
+     */
+    public function info($option = null)
+    {
+    }
+
+    /**
+     * Resets the statistics reported by Redis using the INFO command (`info()` function).
+     * These are the counters that are reset:
+     *      - Keyspace hits
+     *      - Keyspace misses
+     *      - Number of commands processed
+     *      - Number of connections received
+     *      - Number of expired keys
+     *
+     * @return bool `TRUE` in case of success, `FALSE` in case of failure.
+     *
+     * @example $redis->resetStat();
+     * @link https://redis.io/commands/config-resetstat
+     */
+    public function resetStat()
+    {
+    }
+
+    /**
+     * Returns the time to live left for a given key, in seconds. If the key doesn't exist, FALSE is returned.
+     *
+     * @param string $key
+     *
+     * @return int|bool the time left to live in seconds
+     *
+     * @link    https://redis.io/commands/ttl
+     * @example
+     * <pre>
+     * $redis->setex('key', 123, 'test');
+     * $redis->ttl('key'); // int(123)
+     * </pre>
+     */
+    public function ttl($key)
+    {
+    }
+
+    /**
+     * Returns a time to live left for a given key, in milliseconds.
+     *
+     * If the key doesn't exist, FALSE is returned.
+     *
+     * @param string $key
+     *
+     * @return int|bool the time left to live in milliseconds
+     *
+     * @link    https://redis.io/commands/pttl
+     * @example
+     * <pre>
+     * $redis->setex('key', 123, 'test');
+     * $redis->pttl('key'); // int(122999)
+     * </pre>
+     */
+    public function pttl($key)
+    {
+    }
+
+    /**
+     * Remove the expiration timer from a key.
+     *
+     * @param string $key
+     *
+     * @return bool TRUE if a timeout was removed, FALSE if the key didn’t exist or didn’t have an expiration timer.
+     *
+     * @link    https://redis.io/commands/persist
+     * @example $redis->persist('key');
+     */
+    public function persist($key)
+    {
+    }
+
+    /**
+     * Sets multiple key-value pairs in one atomic command.
+     * MSETNX only returns TRUE if all the keys were set (see SETNX).
+     *
+     * @param array $array Pairs: array(key => value, ...)
+     *
+     * @return bool TRUE in case of success, FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/mset
+     * @example
+     * <pre>
+     * $redis->mset(array('key0' => 'value0', 'key1' => 'value1'));
+     * var_dump($redis->get('key0'));
+     * var_dump($redis->get('key1'));
+     * // Output:
+     * // string(6) "value0"
+     * // string(6) "value1"
+     * </pre>
+     */
+    public function mset(array $array)
+    {
+    }
+
+    /**
+     * Get the values of all the specified keys.
+     * If one or more keys dont exist, the array will contain FALSE at the position of the key.
+     *
+     * @param array $keys Array containing the list of the keys
+     *
+     * @return array Array containing the values related to keys in argument
+     *
+     * @deprecated use Redis::mGet()
+     * @example
+     * <pre>
+     * $redis->set('key1', 'value1');
+     * $redis->set('key2', 'value2');
+     * $redis->set('key3', 'value3');
+     * $redis->getMultiple(array('key1', 'key2', 'key3')); // array('value1', 'value2', 'value3');
+     * $redis->getMultiple(array('key0', 'key1', 'key5')); // array(`FALSE`, 'value2', `FALSE`);
+     * </pre>
+     */
+    public function getMultiple(array $keys)
+    {
+    }
+
+    /**
+     * Returns the values of all specified keys.
+     *
+     * For every key that does not hold a string value or does not exist,
+     * the special value false is returned. Because of this, the operation never fails.
+     *
+     * @param array $array
+     *
+     * @return array
+     *
+     * @link https://redis.io/commands/mget
+     * @example
+     * <pre>
+     * $redis->del('x', 'y', 'z', 'h');  // remove x y z
+     * $redis->mset(array('x' => 'a', 'y' => 'b', 'z' => 'c'));
+     * $redis->hset('h', 'field', 'value');
+     * var_dump($redis->mget(array('x', 'y', 'z', 'h')));
+     * // Output:
+     * // array(3) {
+     * //   [0]=> string(1) "a"
+     * //   [1]=> string(1) "b"
+     * //   [2]=> string(1) "c"
+     * //   [3]=> bool(false)
+     * // }
+     * </pre>
+     */
+    public function mget(array $array)
+    {
+    }
+
+    /**
+     * @see mset()
+     * @param array $array
+     * @return int 1 (if the keys were set) or 0 (no key was set)
+     *
+     * @link    https://redis.io/commands/msetnx
+     */
+    public function msetnx(array $array)
+    {
+    }
+
+    /**
+     * Pops a value from the tail of a list, and pushes it to the front of another list.
+     * Also return this value.
+     *
+     * @since   redis >= 1.1
+     *
+     * @param string $srcKey
+     * @param string $dstKey
+     *
+     * @return string|mixed|bool The element that was moved in case of success, FALSE in case of failure.
+     *
+     * @link    https://redis.io/commands/rpoplpush
+     * @example
+     * <pre>
+     * $redis->del('x', 'y');
+     *
+     * $redis->lPush('x', 'abc');
+     * $redis->lPush('x', 'def');
+     * $redis->lPush('y', '123');
+     * $redis->lPush('y', '456');
+     *
+     * // move the last of x to the front of y.
+     * var_dump($redis->rpoplpush('x', 'y'));
+     * var_dump($redis->lRange('x', 0, -1));
+     * var_dump($redis->lRange('y', 0, -1));
+     *
+     * //Output:
+     * //
+     * //string(3) "abc"
+     * //array(1) {
+     * //  [0]=>
+     * //  string(3) "def"
+     * //}
+     * //array(3) {
+     * //  [0]=>
+     * //  string(3) "abc"
+     * //  [1]=>
+     * //  string(3) "456"
+     * //  [2]=>
+     * //  string(3) "123"
+     * //}
+     * </pre>
+     */
+    public function rpoplpush($srcKey, $dstKey)
+    {
+    }
+
+    /**
+     * A blocking version of rpoplpush, with an integral timeout in the third parameter.
+     *
+     * @param string $srcKey
+     * @param string $dstKey
+     * @param int    $timeout
+     *
+     * @return  string|mixed|bool  The element that was moved in case of success, FALSE in case of timeout
+     *
+     * @link    https://redis.io/commands/brpoplpush
+     */
+    public function brpoplpush($srcKey, $dstKey, $timeout)
+    {
+    }
+
+    /**
+     * Adds the specified member with a given score to the sorted set stored at key
+     *
+     * @param string       $key     Required key
+     * @param array        $options Options if needed
+     * @param float        $score1  Required score
+     * @param string|mixed $value1  Required value
+     * @param float        $score2  Optional score
+     * @param string|mixed $value2  Optional value
+     * @param float        $scoreN  Optional score
+     * @param string|mixed $valueN  Optional value
+     *
+     * @return int Number of values added
+     *
+     * @link    https://redis.io/commands/zadd
+     * @example
+     * <pre>
+     * <pre>
+     * $redis->zAdd('z', 1, 'v1', 2, 'v2', 3, 'v3', 4, 'v4' );  // int(2)
+     * $redis->zRem('z', 'v2', 'v3');                           // int(2)
+     * $redis->zAdd('z', ['NX'], 5, 'v5');                      // int(1)
+     * $redis->zAdd('z', ['NX'], 6, 'v5');                      // int(0)
+     * $redis->zAdd('z', 7, 'v6');                              // int(1)
+     * $redis->zAdd('z', 8, 'v6');                              // int(0)
+     *
+     * var_dump( $redis->zRange('z', 0, -1) );
+     * // Output:
+     * // array(4) {
+     * //   [0]=> string(2) "v1"
+     * //   [1]=> string(2) "v4"
+     * //   [2]=> string(2) "v5"
+     * //   [3]=> string(2) "v8"
+     * // }
+     *
+     * var_dump( $redis->zRange('z', 0, -1, true) );
+     * // Output:
+     * // array(4) {
+     * //   ["v1"]=> float(1)
+     * //   ["v4"]=> float(4)
+     * //   ["v5"]=> float(5)
+     * //   ["v6"]=> float(8)
+     * </pre>
+     * </pre>
+     */
+    public function zAdd($key, $options, $score1, $value1, $score2 = null, $value2 = null, $scoreN = null, $valueN = null)
+    {
+    }
+
+    /**
+     * Returns a range of elements from the ordered set stored at the specified key,
+     * with values in the range [start, end]. start and stop are interpreted as zero-based indices:
+     * 0 the first element,
+     * 1 the second ...
+     * -1 the last element,
+     * -2 the penultimate ...
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     * @param bool   $withscores
+     *
+     * @return array Array containing the values in specified range.
+     *
+     * @link    https://redis.io/commands/zrange
+     * @example
+     * <pre>
+     * $redis->zAdd('key1', 0, 'val0');
+     * $redis->zAdd('key1', 2, 'val2');
+     * $redis->zAdd('key1', 10, 'val10');
+     * $redis->zRange('key1', 0, -1); // array('val0', 'val2', 'val10')
+     * // with scores
+     * $redis->zRange('key1', 0, -1, true); // array('val0' => 0, 'val2' => 2, 'val10' => 10)
+     * </pre>
+     */
+    public function zRange($key, $start, $end, $withscores = null)
+    {
+    }
+
+    /**
+     * Deletes a specified member from the ordered set.
+     *
+     * @param string       $key
+     * @param string|mixed $member1
+     * @param string|mixed ...$otherMembers
+     *
+     * @return int Number of deleted values
+     *
+     * @link    https://redis.io/commands/zrem
+     * @example
+     * <pre>
+     * $redis->zAdd('z', 1, 'v1', 2, 'v2', 3, 'v3', 4, 'v4' );  // int(2)
+     * $redis->zRem('z', 'v2', 'v3');                           // int(2)
+     * var_dump( $redis->zRange('z', 0, -1) );
+     * //// Output:
+     * // array(2) {
+     * //   [0]=> string(2) "v1"
+     * //   [1]=> string(2) "v4"
+     * // }
+     * </pre>
+     */
+    public function zRem($key, $member1, ...$otherMembers)
+    {
+    }
+
+    /**
+     * @see zRem()
+     * @link https://redis.io/commands/zrem
+     * @deprecated use Redis::zRem()
+     *
+     * @param string       $key
+     * @param string|mixed $member1
+     * @param string|mixed ...$otherMembers
+     *
+     * @return int Number of deleted values
+     */
+    public function zDelete($key, $member1, ...$otherMembers)
+    {
+    }
+
+    /**
+     * Returns the elements of the sorted set stored at the specified key in the range [start, end]
+     * in reverse order. start and stop are interpretated as zero-based indices:
+     * 0 the first element,
+     * 1 the second ...
+     * -1 the last element,
+     * -2 the penultimate ...
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     * @param bool   $withscore
+     *
+     * @return array Array containing the values in specified range.
+     *
+     * @link    https://redis.io/commands/zrevrange
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 0, 'val0');
+     * $redis->zAdd('key', 2, 'val2');
+     * $redis->zAdd('key', 10, 'val10');
+     * $redis->zRevRange('key', 0, -1); // array('val10', 'val2', 'val0')
+     *
+     * // with scores
+     * $redis->zRevRange('key', 0, -1, true); // array('val10' => 10, 'val2' => 2, 'val0' => 0)
+     * </pre>
+     */
+    public function zRevRange($key, $start, $end, $withscore = null)
+    {
+    }
+
+    /**
+     * Returns the elements of the sorted set stored at the specified key which have scores in the
+     * range [start,end]. Adding a parenthesis before start or end excludes it from the range.
+     * +inf and -inf are also valid limits.
+     *
+     * zRevRangeByScore returns the same items in reverse order, when the start and end parameters are swapped.
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     * @param array  $options Two options are available:
+     *  - withscores => TRUE,
+     *  - and limit => array($offset, $count)
+     *
+     * @return array Array containing the values in specified range.
+     *
+     * @link    https://redis.io/commands/zrangebyscore
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 0, 'val0');
+     * $redis->zAdd('key', 2, 'val2');
+     * $redis->zAdd('key', 10, 'val10');
+     * $redis->zRangeByScore('key', 0, 3);                                          // array('val0', 'val2')
+     * $redis->zRangeByScore('key', 0, 3, array('withscores' => TRUE);              // array('val0' => 0, 'val2' => 2)
+     * $redis->zRangeByScore('key', 0, 3, array('limit' => array(1, 1));                        // array('val2')
+     * $redis->zRangeByScore('key', 0, 3, array('withscores' => TRUE, 'limit' => array(1, 1));  // array('val2' => 2)
+     * </pre>
+     */
+    public function zRangeByScore($key, $start, $end, array $options = array())
+    {
+    }
+
+    /**
+     * @see zRangeByScore()
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     * @param array  $options
+     *
+     * @return array
+     */
+    public function zRevRangeByScore($key, $start, $end, array $options = array())
+    {
+    }
+
+    /**
+     * Returns a lexigraphical range of members in a sorted set, assuming the members have the same score. The
+     * min and max values are required to start with '(' (exclusive), '[' (inclusive), or be exactly the values
+     * '-' (negative inf) or '+' (positive inf).  The command must be called with either three *or* five
+     * arguments or will return FALSE.
+     *
+     * @param string $key    The ZSET you wish to run against.
+     * @param int    $min    The minimum alphanumeric value you wish to get.
+     * @param int    $max    The maximum alphanumeric value you wish to get.
+     * @param int    $offset Optional argument if you wish to start somewhere other than the first element.
+     * @param int    $limit  Optional argument if you wish to limit the number of elements returned.
+     *
+     * @return array|bool Array containing the values in the specified range.
+     *
+     * @link    https://redis.io/commands/zrangebylex
+     * @example
+     * <pre>
+     * foreach (array('a', 'b', 'c', 'd', 'e', 'f', 'g') as $char) {
+     *     $redis->zAdd('key', $char);
+     * }
+     *
+     * $redis->zRangeByLex('key', '-', '[c'); // array('a', 'b', 'c')
+     * $redis->zRangeByLex('key', '-', '(c'); // array('a', 'b')
+     * $redis->zRangeByLex('key', '-', '[c'); // array('b', 'c')
+     * </pre>
+     */
+    public function zRangeByLex($key, $min, $max, $offset = null, $limit = null)
+    {
+    }
+
+    /**
+     * @see zRangeByLex()
+     * @param string $key
+     * @param int    $min
+     * @param int    $max
+     * @param int    $offset
+     * @param int    $limit
+     *
+     * @return array
+     *
+     * @link    https://redis.io/commands/zrevrangebylex
+     */
+    public function zRevRangeByLex($key, $min, $max, $offset = null, $limit = null)
+    {
+    }
+
+    /**
+     * Returns the number of elements of the sorted set stored at the specified key which have
+     * scores in the range [start,end]. Adding a parenthesis before start or end excludes it
+     * from the range. +inf and -inf are also valid limits.
+     *
+     * @param string $key
+     * @param string $start
+     * @param string $end
+     *
+     * @return int the size of a corresponding zRangeByScore
+     *
+     * @link    https://redis.io/commands/zcount
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 0, 'val0');
+     * $redis->zAdd('key', 2, 'val2');
+     * $redis->zAdd('key', 10, 'val10');
+     * $redis->zCount('key', 0, 3); // 2, corresponding to array('val0', 'val2')
+     * </pre>
+     */
+    public function zCount($key, $start, $end)
+    {
+    }
+
+    /**
+     * Deletes the elements of the sorted set stored at the specified key which have scores in the range [start,end].
+     *
+     * @param string       $key
+     * @param float|string $start double or "+inf" or "-inf" string
+     * @param float|string $end double or "+inf" or "-inf" string
+     *
+     * @return int The number of values deleted from the sorted set
+     *
+     * @link    https://redis.io/commands/zremrangebyscore
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 0, 'val0');
+     * $redis->zAdd('key', 2, 'val2');
+     * $redis->zAdd('key', 10, 'val10');
+     * $redis->zRemRangeByScore('key', 0, 3); // 2
+     * </pre>
+     */
+    public function zRemRangeByScore($key, $start, $end)
+    {
+    }
+
+    /**
+     * @see zRemRangeByScore()
+     * @deprecated use Redis::zRemRangeByScore()
+     *
+     * @param string $key
+     * @param float  $start
+     * @param float  $end
+     */
+    public function zDeleteRangeByScore($key, $start, $end)
+    {
+    }
+
+    /**
+     * Deletes the elements of the sorted set stored at the specified key which have rank in the range [start,end].
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     *
+     * @return int The number of values deleted from the sorted set
+     *
+     * @link    https://redis.io/commands/zremrangebyrank
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 1, 'one');
+     * $redis->zAdd('key', 2, 'two');
+     * $redis->zAdd('key', 3, 'three');
+     * $redis->zRemRangeByRank('key', 0, 1); // 2
+     * $redis->zRange('key', 0, -1, array('withscores' => TRUE)); // array('three' => 3)
+     * </pre>
+     */
+    public function zRemRangeByRank($key, $start, $end)
+    {
+    }
+
+    /**
+     * @see zRemRangeByRank()
+     * @link    https://redis.io/commands/zremrangebyscore
+     * @deprecated use Redis::zRemRangeByRank()
+     *
+     * @param string $key
+     * @param int    $start
+     * @param int    $end
+     */
+    public function zDeleteRangeByRank($key, $start, $end)
+    {
+    }
+
+    /**
+     * Returns the cardinality of an ordered set.
+     *
+     * @param string $key
+     *
+     * @return int the set's cardinality
+     *
+     * @link    https://redis.io/commands/zsize
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 0, 'val0');
+     * $redis->zAdd('key', 2, 'val2');
+     * $redis->zAdd('key', 10, 'val10');
+     * $redis->zCard('key');            // 3
+     * </pre>
+     */
+    public function zCard($key)
+    {
+    }
+
+    /**
+     * @see zCard()
+     * @deprecated use Redis::zCard()
+     *
+     * @param string $key
+     * @return int
+     */
+    public function zSize($key)
+    {
+    }
+
+    /**
+     * Returns the score of a given member in the specified sorted set.
+     *
+     * @param string       $key
+     * @param string|mixed $member
+     *
+     * @return float|bool false if member or key not exists
+     *
+     * @link    https://redis.io/commands/zscore
+     * @example
+     * <pre>
+     * $redis->zAdd('key', 2.5, 'val2');
+     * $redis->zScore('key', 'val2'); // 2.5
+     * </pre>
+     */
+    public function zScore($key, $member)
+    {
+    }
+
+    /**
+     * Returns the rank of a given member in the specified sorted set, starting at 0 for the item
+     * with the smallest score. zRevRank starts at 0 for the item with the largest score.
+     *
+     * @param string       $key
+     * @param string|mixed $member
+     *
+     * @return int|bool the item's score, or false if key or member is not exists
+     *
+     * @link    https://redis.io/commands/zrank
+     * @example
+     * <pre>
+     * $redis->del('z');
+     * $redis->zAdd('key', 1, 'one');
+     * $redis->zAdd('key', 2, 'two');
+     * $redis->zRank('key', 'one');     // 0
+     * $redis->zRank('key', 'two');     // 1
+     * $redis->zRevRank('key', 'one');  // 1
+     * $redis->zRevRank('key', 'two');  // 0
+     * </pre>
+     */
+    public function zRank($key, $member)
+    {
+    }
+
+    /**
+     * @see zRank()
+     * @param string       $key
+     * @param string|mixed $member
+     *
+     * @return int|bool the item's score, false - if key or member is not exists
+     *
+     * @link   https://redis.io/commands/zrevrank
+     */
+    public function zRevRank($key, $member)
+    {
+    }
+
+    /**
+     * Increments the score of a member from a sorted set by a given amount.
+     *
+     * @param string $key
+     * @param float  $value (double) value that will be added to the member's score
+     * @param string $member
+     *
+     * @return float the new value
+     *
+     * @link    https://redis.io/commands/zincrby
+     * @example
+     * <pre>
+     * $redis->del('key');
+     * $redis->zIncrBy('key', 2.5, 'member1');  // key or member1 didn't exist, so member1's score is to 0
+     *                                          // before the increment and now has the value 2.5
+     * $redis->zIncrBy('key', 1, 'member1');    // 3.5
+     * </pre>
+     */
+    public function zIncrBy($key, $value, $member)
+    {
+    }
+
+    /**
+     * Creates an union of sorted sets given in second argument.
+     * The result of the union will be stored in the sorted set defined by the first argument.
+     * The third optionnel argument defines weights to apply to the sorted sets in input.
+     * In this case, the weights will be multiplied by the score of each element in the sorted set
+     * before applying the aggregation. The forth argument defines the AGGREGATE option which
+     * specify how the results of the union are aggregated.
+     *
+     * @param string $output
+     * @param array  $zSetKeys
+     * @param array  $weights
+     * @param string $aggregateFunction  Either "SUM", "MIN", or "MAX": defines the behaviour to use on
+     * duplicate entries during the zUnionStore
+     *
+     * @return int The number of values in the new sorted set
+     *
+     * @link    https://redis.io/commands/zunionstore
+     * @example
+     * <pre>
+     * $redis->del('k1');
+     * $redis->del('k2');
+     * $redis->del('k3');
+     * $redis->del('ko1');
+     * $redis->del('ko2');
+     * $redis->del('ko3');
+     *
+     * $redis->zAdd('k1', 0, 'val0');
+     * $redis->zAdd('k1', 1, 'val1');
+     *
+     * $redis->zAdd('k2', 2, 'val2');
+     * $redis->zAdd('k2', 3, 'val3');
+     *
+     * $redis->zUnionStore('ko1', array('k1', 'k2')); // 4, 'ko1' => array('val0', 'val1', 'val2', 'val3')
+     *
+     * // Weighted zUnionStore
+     * $redis->zUnionStore('ko2', array('k1', 'k2'), array(1, 1)); // 4, 'ko2' => array('val0', 'val1', 'val2', 'val3')
+     * $redis->zUnionStore('ko3', array('k1', 'k2'), array(5, 1)); // 4, 'ko3' => array('val0', 'val2', 'val3', 'val1')
+     * </pre>
+     */
+    public function zUnionStore($output, $zSetKeys, array $weights = null, $aggregateFunction = 'SUM')
+    {
+    }
+
+    /**
+     * @see zUnionStore
+     * @deprecated use Redis::zUnionStore()
+     *
+     * @param string     $Output
+     * @param array      $ZSetKeys
+     * @param array|null $Weights
+     * @param string     $aggregateFunction
+     */
+    public function zUnion($Output, $ZSetKeys, array $Weights = null, $aggregateFunction = 'SUM')
+    {
+    }
+
+    /**
+     * Creates an intersection of sorted sets given in second argument.
+     * The result of the union will be stored in the sorted set defined by the first argument.
+     * The third optional argument defines weights to apply to the sorted sets in input.
+     * In this case, the weights will be multiplied by the score of each element in the sorted set
+     * before applying the aggregation. The forth argument defines the AGGREGATE option which
+     * specify how the results of the union are aggregated.
+     *
+     * @param string $output
+     * @param array  $zSetKeys
+     * @param array  $weights
+     * @param string $aggregateFunction Either "SUM", "MIN", or "MAX":
+     * defines the behaviour to use on duplicate entries during the zInterStore.
+     *
+     * @return int The number of values in the new sorted set.
+     *
+     * @link    https://redis.io/commands/zinterstore
+     * @example
+     * <pre>
+     * $redis->del('k1');
+     * $redis->del('k2');
+     * $redis->del('k3');
+     *
+     * $redis->del('ko1');
+     * $redis->del('ko2');
+     * $redis->del('ko3');
+     * $redis->del('ko4');
+     *
+     * $redis->zAdd('k1', 0, 'val0');
+     * $redis->zAdd('k1', 1, 'val1');
+     * $redis->zAdd('k1', 3, 'val3');
+     *
+     * $redis->zAdd('k2', 2, 'val1');
+     * $redis->zAdd('k2', 3, 'val3');
+     *
+     * $redis->zInterStore('ko1', array('k1', 'k2'));               // 2, 'ko1' => array('val1', 'val3')
+     * $redis->zInterStore('ko2', array('k1', 'k2'), array(1, 1));  // 2, 'ko2' => array('val1', 'val3')
+     *
+     * // Weighted zInterStore
+     * $redis->zInterStore('ko3', array('k1', 'k2'), array(1, 5), 'min'); // 2, 'ko3' => array('val1', 'val3')
+     * $redis->zInterStore('ko4', array('k1', 'k2'), array(1, 5), 'max'); // 2, 'ko4' => array('val3', 'val1')
+     * </pre>
+     */
+    public function zInterStore($output, $zSetKeys, array $weights = null, $aggregateFunction = 'SUM')
+    {
+    }
+
+    /**
+     * @see zInterStore
+     * @deprecated use Redis::zInterStore()
+     *
+     * @param $Output
+     * @param $ZSetKeys
+     * @param array|null $Weights
+     * @param string $aggregateFunction
+     */
+    public function zInter($Output, $ZSetKeys, array $Weights = null, $aggregateFunction = 'SUM')
+    {
+    }
+
+    /**
+     * Scan a sorted set for members, with optional pattern and count
+     *
+     * @param string $key      String, the set to scan.
+     * @param int    $iterator Long (reference), initialized to NULL.
+     * @param string $pattern  String (optional), the pattern to match.
+     * @param int    $count    How many keys to return per iteration (Redis might return a different number).
+     *
+     * @return array|bool PHPRedis will return matching keys from Redis, or FALSE when iteration is complete
+     *
+     * @link    https://redis.io/commands/zscan
+     * @example
+     * <pre>
+     * $iterator = null;
+     * while ($members = $redis-zscan('zset', $iterator)) {
+     *     foreach ($members as $member => $score) {
+     *         echo $member . ' => ' . $score . PHP_EOL;
+     *     }
+     * }
+     * </pre>
+     */
+    public function zScan($key, &$iterator, $pattern = null, $count = 0)
+    {
+    }
+
+    /**
+     * Block until Redis can pop the highest or lowest scoring members from one or more ZSETs.
+     * There are two commands (BZPOPMIN and BZPOPMAX for popping the lowest and highest scoring elements respectively.)
+     *
+     * @param string|array $key1
+     * @param string|array $key2 ...
+     * @param int $timeout
+     *
+     * @return array Either an array with the key member and score of the higest or lowest element or an empty array
+     * if the timeout was reached without an element to pop.
+     *
+     * @since >= 5.0
+     * @link https://redis.io/commands/bzpopmax
+     * @example
+     * <pre>
+     * // Wait up to 5 seconds to pop the *lowest* scoring member from sets `zs1` and `zs2`.
+     * $redis->bzPopMin(['zs1', 'zs2'], 5);
+     * $redis->bzPopMin('zs1', 'zs2', 5);
+     *
+     * // Wait up to 5 seconds to pop the *highest* scoring member from sets `zs1` and `zs2`
+     * $redis->bzPopMax(['zs1', 'zs2'], 5);
+     * $redis->bzPopMax('zs1', 'zs2', 5);
+     * </pre>
+     */
+    public function bzPopMax($key1, $key2, $timeout)
+    {
+    }
+
+    /**
+     * @param string|array $key1
+     * @param string|array $key2 ...
+     * @param int $timeout
+     *
+     * @return array Either an array with the key member and score of the higest or lowest element or an empty array
+     * if the timeout was reached without an element to pop.
+     *
+     * @see bzPopMax
+     * @since >= 5.0
+     * @link https://redis.io/commands/bzpopmin
+     */
+    public function bzPopMin($key1, $key2, $timeout)
+    {
+    }
+
+    /**
+     * Adds a value to the hash stored at key. If this value is already in the hash, FALSE is returned.
+     *
+     * @param string $key
+     * @param string $hashKey
+     * @param string $value
+     *
+     * @return int|bool
+     * - 1 if value didn't exist and was added successfully,
+     * - 0 if the value was already present and was replaced, FALSE if there was an error.
+     *
+     * @link    https://redis.io/commands/hset
+     * @example
+     * <pre>
+     * $redis->del('h')
+     * $redis->hSet('h', 'key1', 'hello');  // 1, 'key1' => 'hello' in the hash at "h"
+     * $redis->hGet('h', 'key1');           // returns "hello"
+     *
+     * $redis->hSet('h', 'key1', 'plop');   // 0, value was replaced.
+     * $redis->hGet('h', 'key1');           // returns "plop"
+     * </pre>
+     */
+    public function hSet($key, $hashKey, $value)
+    {
+    }
+
+    /**
+     * Adds a value to the hash stored at key only if this field isn't already in the hash.
+     *
+     * @param string $key
+     * @param string $hashKey
+     * @param string $value
+     *
+     * @return  bool TRUE if the field was set, FALSE if it was already present.
+     *
+     * @link    https://redis.io/commands/hsetnx
+     * @example
+     * <pre>
+     * $redis->del('h')
+     * $redis->hSetNx('h', 'key1', 'hello'); // TRUE, 'key1' => 'hello' in the hash at "h"
+     * $redis->hSetNx('h', 'key1', 'world'); // FALSE, 'key1' => 'hello' in the hash at "h". No change since the field
+     * wasn't replaced.
+     * </pre>
+     */
+    public function hSetNx($key, $hashKey, $value)
+    {
+    }
+
+    /**
+     * Gets a value from the hash stored at key.
+     * If the hash table doesn't exist, or the key doesn't exist, FALSE is returned.
+     *
+     * @param string $key
+     * @param string $hashKey
+     *
+     * @return string The value, if the command executed successfully BOOL FALSE in case of failure
+     *
+     * @link    https://redis.io/commands/hget
+     */
+    public function hGet($key, $hashKey)
+    {
+    }
+
+    /**
+     * Returns the length of a hash, in number of items
+     *
+     * @param string $key
+     *
+     * @return int|false the number of items in a hash, FALSE if the key doesn't exist or isn't a hash
+     *
+     * @link    https://redis.io/commands/hlen
+     * @example
+     * <pre>
+     * $redis->del('h')
+     * $redis->hSet('h', 'key1', 'hello');
+     * $redis->hSet('h', 'key2', 'plop');
+     * $redis->hLen('h'); // returns 2
+     * </pre>
+     */
+    public function hLen($key)
+    {
+    }
+
+    /**
+     * Removes a values from the hash stored at key.
+     * If the hash table doesn't exist, or the key doesn't exist, FALSE is returned.
+     *
+     * @param string $key
+     * @param string $hashKey1
+     * @param string ...$otherHashKeys
+     *
+     * @return int|false Number of deleted fields
+     *
+     * @link    https://redis.io/commands/hdel
+     * @example
+     * <pre>
+     * $redis->hMSet('h',
+     *               array(
+     *                    'f1' => 'v1',
+     *                    'f2' => 'v2',
+     *                    'f3' => 'v3',
+     *                    'f4' => 'v4',
+     *               ));
+     *
+     * var_dump( $redis->hDel('h', 'f1') );        // int(1)
+     * var_dump( $redis->hDel('h', 'f2', 'f3') );  // int(2)
+     * s
+     * var_dump( $redis->hGetAll('h') );
+     * //// Output:
+     * //  array(1) {
+     * //    ["f4"]=> string(2) "v4"
+     * //  }
+     * </pre>
+     */
+    public function hDel($key, $hashKey1, ...$otherHashKeys)
+    {
+    }
+
+    /**
+     * Returns the keys in a hash, as an array of strings.
+     *
+     * @param string $key
+     *
+     * @return array An array of elements, the keys of the hash. This works like PHP's array_keys().
+     *
+     * @link    https://redis.io/commands/hkeys
+     * @example
+     * <pre>
+     * $redis->del('h');
+     * $redis->hSet('h', 'a', 'x');
+     * $redis->hSet('h', 'b', 'y');
+     * $redis->hSet('h', 'c', 'z');
+     * $redis->hSet('h', 'd', 't');
+     * var_dump($redis->hKeys('h'));
+     *
+     * // Output:
+     * // array(4) {
+     * // [0]=>
+     * // string(1) "a"
+     * // [1]=>
+     * // string(1) "b"
+     * // [2]=>
+     * // string(1) "c"
+     * // [3]=>
+     * // string(1) "d"
+     * // }
+     * // The order is random and corresponds to redis' own internal representation of the set structure.
+     * </pre>
+     */
+    public function hKeys($key)
+    {
+    }
+
+    /**
+     * Returns the values in a hash, as an array of strings.
+     *
+     * @param string $key
+     *
+     * @return array An array of elements, the values of the hash. This works like PHP's array_values().
+     *
+     * @link    https://redis.io/commands/hvals
+     * @example
+     * <pre>
+     * $redis->del('h');
+     * $redis->hSet('h', 'a', 'x');
+     * $redis->hSet('h', 'b', 'y');
+     * $redis->hSet('h', 'c', 'z');
+     * $redis->hSet('h', 'd', 't');
+     * var_dump($redis->hVals('h'));
+     *
+     * // Output
+     * // array(4) {
+     * //   [0]=>
+     * //   string(1) "x"
+     * //   [1]=>
+     * //   string(1) "y"
+     * //   [2]=>
+     * //   string(1) "z"
+     * //   [3]=>
+     * //   string(1) "t"
+     * // }
+     * // The order is random and corresponds to redis' own internal representation of the set structure.
+     * </pre>
+     */
+    public function hVals($key)
+    {
+    }
+
+    /**
+     * Returns the whole hash, as an array of strings indexed by strings.
+     *
+     * @param string $key
+     *
+     * @return array An array of elements, the contents of the hash.
+     *
+     * @link    https://redis.io/commands/hgetall
+     * @example
+     * <pre>
+     * $redis->del('h');
+     * $redis->hSet('h', 'a', 'x');
+     * $redis->hSet('h', 'b', 'y');
+     * $redis->hSet('h', 'c', 'z');
+     * $redis->hSet('h', 'd', 't');
+     * var_dump($redis->hGetAll('h'));
+     *
+     * // Output:
+     * // array(4) {
+     * //   ["a"]=>
+     * //   string(1) "x"
+     * //   ["b"]=>
+     * //   string(1) "y"
+     * //   ["c"]=>
+     * //   string(1) "z"
+     * //   ["d"]=>
+     * //   string(1) "t"
+     * // }
+     * // The order is random and corresponds to redis' own internal representation of the set structure.
+     * </pre>
+     */
+    public function hGetAll($key)
+    {
+    }
+
+    /**
+     * Verify if the specified member exists in a key.
+     *
+     * @param string $key
+     * @param string $hashKey
+     *
+     * @return bool If the member exists in the hash table, return TRUE, otherwise return FALSE.
+     *
+     * @link    https://redis.io/commands/hexists
+     * @example
+     * <pre>
+     * $redis->hSet('h', 'a', 'x');
+     * $redis->hExists('h', 'a');               //  TRUE
+     * $redis->hExists('h', 'NonExistingKey');  // FALSE
+     * </pre>
+     */
+    public function hExists($key, $hashKey)
+    {
+    }
+
+    /**
+     * Increments the value of a member from a hash by a given amount.
+     *
+     * @param string $key
+     * @param string $hashKey
+     * @param int    $value (integer) value that will be added to the member's value
+     *
+     * @return int the new value
+     *
+     * @link    https://redis.io/commands/hincrby
+     * @example
+     * <pre>
+     * $redis->del('h');
+     * $redis->hIncrBy('h', 'x', 2); // returns 2: h[x] = 2 now.
+     * $redis->hIncrBy('h', 'x', 1); // h[x] ← 2 + 1. Returns 3
+     * </pre>
+     */
+    public function hIncrBy($key, $hashKey, $value)
+    {
+    }
+
+    /**
+     * Increment the float value of a hash field by the given amount
+     *
+     * @param string $key
+     * @param string $field
+     * @param float  $increment
+     *
+     * @return float
+     *
+     * @link    https://redis.io/commands/hincrbyfloat
+     * @example
+     * <pre>
+     * $redis = new Redis();
+     * $redis->connect('127.0.0.1');
+     * $redis->hset('h', 'float', 3);
+     * $redis->hset('h', 'int',   3);
+     * var_dump( $redis->hIncrByFloat('h', 'float', 1.5) ); // float(4.5)
+     *
+     * var_dump( $redis->hGetAll('h') );
+     *
+     * // Output
+     *  array(2) {
+     *    ["float"]=>
+     *    string(3) "4.5"
+     *    ["int"]=>
+     *    string(1) "3"
+     *  }
+     * </pre>
+     */
+    public function hIncrByFloat($key, $field, $increment)
+    {
+    }
+
+    /**
+     * Fills in a whole hash. Non-string values are converted to string, using the standard (string) cast.
+     * NULL values are stored as empty strings
+     *
+     * @param string $key
+     * @param array  $hashKeys key → value array
+     *
+     * @return bool
+     *
+     * @link    https://redis.io/commands/hmset
+     * @example
+     * <pre>
+     * $redis->del('user:1');
+     * $redis->hMSet('user:1', array('name' => 'Joe', 'salary' => 2000));
+     * $redis->hIncrBy('user:1', 'salary', 100); // Joe earns 100 more now.
+     * </pre>
+     */
+    public function hMSet($key, $hashKeys)
+    {
+    }
+
+    /**
+     * Retirieve the values associated to the specified fields in the hash.
+     *
+     * @param string $key
+     * @param array  $hashKeys
+     *
+     * @return array Array An array of elements, the values of the specified fields in the hash,
+     * with the hash keys as array keys.
+     *
+     * @link    https://redis.io/commands/hmget
+     * @example
+     * <pre>
+     * $redis->del('h');
+     * $redis->hSet('h', 'field1', 'value1');
+     * $redis->hSet('h', 'field2', 'value2');
+     * $redis->hmGet('h', array('field1', 'field2')); // returns array('field1' => 'value1', 'field2' => 'value2')
+     * </pre>
+     */
+    public function hMGet($key, $hashKeys)
+    {
+    }
+
+    /**
+     * Scan a HASH value for members, with an optional pattern and count.
+     *
+     * @param string $key
+     * @param int    $iterator
+     * @param string $pattern    Optional pattern to match against.
+     * @param int    $count      How many keys to return in a go (only a sugestion to Redis).
+     *
+     * @return array An array of members that match our pattern.
+     *
+     * @link    https://redis.io/commands/hscan
+     * @example
+     * <pre>
+     * // $iterator = null;
+     * // while($elements = $redis->hscan('hash', $iterator)) {
+     * //     foreach($elements as $key => $value) {
+     * //         echo $key . ' => ' . $value . PHP_EOL;
+     * //     }
+     * // }
+     * </pre>
+     */
+    public function hScan($key, &$iterator, $pattern = null, $count = 0)
+    {
+    }
+
+    /**
+     * Get the string length of the value associated with field in the hash stored at key
+     *
+     * @param string $key
+     * @param string $field
+     *
+     * @return int the string length of the value associated with field, or zero when field is not present in the hash
+     * or key does not exist at all.
+     *
+     * @link https://redis.io/commands/hstrlen
+     * @since >= 3.2
+     */
+    public function hStrLen(string $key, string $field)
+    {
+    }
+
+    /**
+     * Add one or more geospatial items to the specified key.
+     * This function must be called with at least one longitude, latitude, member triplet.
+     *
+     * @param string $key
+     * @param float  $longitude
+     * @param float  $latitude
+     * @param string $member
+     *
+     * @return int The number of elements added to the geospatial key
+     *
+     * @link https://redis.io/commands/geoadd
+     * @since >=3.2
+     *
+     * @example
+     * <pre>
+     * $redis->del("myplaces");
+     *
+     * // Since the key will be new, $result will be 2
+     * $result = $redis->geoAdd(
+     *   "myplaces",
+     *   -122.431, 37.773, "San Francisco",
+     *   -157.858, 21.315, "Honolulu"
+     * ); // 2
+     * </pre>
+     */
+    public function geoadd($key, $longitude, $latitude, $member)
+    {
+    }
+
+    /**
+     * Retrieve Geohash strings for one or more elements of a geospatial index.
+
+     * @param string $key
+     * @param string ...$member variadic list of members
+     *
+     * @return array One or more Redis Geohash encoded strings
+     *
+     * @link https://redis.io/commands/geohash
+     * @since >=3.2
+     *
+     * @example
+     * <pre>
+     * $redis->geoAdd("hawaii", -157.858, 21.306, "Honolulu", -156.331, 20.798, "Maui");
+     * $hashes = $redis->geoHash("hawaii", "Honolulu", "Maui");
+     * var_dump($hashes);
+     * // Output: array(2) {
+     * //   [0]=>
+     * //   string(11) "87z9pyek3y0"
+     * //   [1]=>
+     * //   string(11) "8e8y6d5jps0"
+     * // }
+     * </pre>
+     */
+    public function geohash($key, ...$member)
+    {
+    }
+
+    /**
+     * Return longitude, latitude positions for each requested member.
+     *
+     * @param string $key
+     * @param string $member
+     * @return array One or more longitude/latitude positions
+     *
+     * @link https://redis.io/commands/geopos
+     * @since >=3.2
+     *
+     * @example
+     * <pre>
+     * $redis->geoAdd("hawaii", -157.858, 21.306, "Honolulu", -156.331, 20.798, "Maui");
+     * $positions = $redis->geoPos("hawaii", "Honolulu", "Maui");
+     * var_dump($positions);
+     *
+     * // Output:
+     * array(2) {
+     *  [0]=> array(2) {
+     *      [0]=> string(22) "-157.85800248384475708"
+     *      [1]=> string(19) "21.3060004581273077"
+     *  }
+     *  [1]=> array(2) {
+     *      [0]=> string(22) "-156.33099943399429321"
+     *      [1]=> string(20) "20.79799924753607598"
+     *  }
+     * }
+     * </pre>
+     */
+    public function geopos(string $key, string $member)
+    {
+    }
+
+    /**
+     * Return the distance between two members in a geospatial set.
+     *
+     * If units are passed it must be one of the following values:
+     * - 'm' => Meters
+     * - 'km' => Kilometers
+     * - 'mi' => Miles
+     * - 'ft' => Feet
+     *
+     * @param string $key
+     * @param string $member1
+     * @param string $member2
+     * @param string|null $unit
+     *
+     * @return float The distance between the two passed members in the units requested (meters by default)
+     *
+     * @link https://redis.io/commands/geodist
+     * @since >=3.2
+     *
+     * @example
+     * <pre>
+     * $redis->geoAdd("hawaii", -157.858, 21.306, "Honolulu", -156.331, 20.798, "Maui");
+     *
+     * $meters = $redis->geoDist("hawaii", "Honolulu", "Maui");
+     * $kilometers = $redis->geoDist("hawaii", "Honolulu", "Maui", 'km');
+     * $miles = $redis->geoDist("hawaii", "Honolulu", "Maui", 'mi');
+     * $feet = $redis->geoDist("hawaii", "Honolulu", "Maui", 'ft');
+     *
+     * echo "Distance between Honolulu and Maui:\n";
+     * echo "  meters    : $meters\n";
+     * echo "  kilometers: $kilometers\n";
+     * echo "  miles     : $miles\n";
+     * echo "  feet      : $feet\n";
+     *
+     * // Bad unit
+     * $inches = $redis->geoDist("hawaii", "Honolulu", "Maui", 'in');
+     * echo "Invalid unit returned:\n";
+     * var_dump($inches);
+     *
+     * // Output
+     * Distance between Honolulu and Maui:
+     * meters    : 168275.204
+     * kilometers: 168.2752
+     * miles     : 104.5616
+     * feet      : 552084.0028
+     * Invalid unit returned:
+     * bool(false)
+     * </pre>
+     */
+    public function geodist($key, $member1, $member2, $unit = null)
+    {
+    }
+
+    /**
+     * Return members of a set with geospatial information that are within the radius specified by the caller.
+     *
+     * @param $key
+     * @param $longitude
+     * @param $latitude
+     * @param $radius
+     * @param $unit
+     * @param array|null $options
+     * <pre>
+     * |Key         |Value          |Description                                        |
+     * |------------|---------------|---------------------------------------------------|
+     * |COUNT       |integer > 0    |Limit how many results are returned                |
+     * |            |WITHCOORD      |Return longitude and latitude of matching members  |
+     * |            |WITHDIST       |Return the distance from the center                |
+     * |            |WITHHASH       |Return the raw geohash-encoded score               |
+     * |            |ASC            |Sort results in ascending order                    |
+     * |            |DESC           |Sort results in descending order                   |
+     * |STORE       |key            |Store results in key                               |
+     * |STOREDIST   |key            |Store the results as distances in key              |
+     * </pre>
+     * Note: It doesn't make sense to pass both ASC and DESC options but if both are passed
+     * the last one passed will be used.
+     * Note: When using STORE[DIST] in Redis Cluster, the store key must has to the same slot as
+     * the query key or you will get a CROSSLOT error.
+     * @return mixed When no STORE option is passed, this function returns an array of results.
+     * If it is passed this function returns the number of stored entries.
+     *
+     * @link https://redis.io/commands/georadius
+     * @since >= 3.2
+     * @example
+     * <pre>
+     * // Add some cities
+     * $redis->geoAdd("hawaii", -157.858, 21.306, "Honolulu", -156.331, 20.798, "Maui");
+     *
+     * echo "Within 300 miles of Honolulu:\n";
+     * var_dump($redis->geoRadius("hawaii", -157.858, 21.306, 300, 'mi'));
+     *
+     * echo "\nWithin 300 miles of Honolulu with distances:\n";
+     * $options = ['WITHDIST'];
+     * var_dump($redis->geoRadius("hawaii", -157.858, 21.306, 300, 'mi', $options));
+     *
+     * echo "\nFirst result within 300 miles of Honolulu with distances:\n";
+     * $options['count'] = 1;
+     * var_dump($redis->geoRadius("hawaii", -157.858, 21.306, 300, 'mi', $options));
+     *
+     * echo "\nFirst result within 300 miles of Honolulu with distances in descending sort order:\n";
+     * $options[] = 'DESC';
+     * var_dump($redis->geoRadius("hawaii", -157.858, 21.306, 300, 'mi', $options));
+     *
+     * // Output
+     * Within 300 miles of Honolulu:
+     * array(2) {
+     *  [0]=> string(8) "Honolulu"
+     *  [1]=> string(4) "Maui"
+     * }
+     *
+     * Within 300 miles of Honolulu with distances:
+     * array(2) {
+     *     [0]=>
+     *   array(2) {
+     *         [0]=>
+     *     string(8) "Honolulu"
+     *         [1]=>
+     *     string(6) "0.0002"
+     *   }
+     *   [1]=>
+     *   array(2) {
+     *         [0]=>
+     *     string(4) "Maui"
+     *         [1]=>
+     *     string(8) "104.5615"
+     *   }
+     * }
+     *
+     * First result within 300 miles of Honolulu with distances:
+     * array(1) {
+     *     [0]=>
+     *   array(2) {
+     *         [0]=>
+     *     string(8) "Honolulu"
+     *         [1]=>
+     *     string(6) "0.0002"
+     *   }
+     * }
+     *
+     * First result within 300 miles of Honolulu with distances in descending sort order:
+     * array(1) {
+     *     [0]=>
+     *   array(2) {
+     *         [0]=>
+     *     string(4) "Maui"
+     *         [1]=>
+     *     string(8) "104.5615"
+     *   }
+     * }
+     * </pre>
+     */
+    public function georadius($key, $longitude, $latitude, $radius, $unit, array $options = null)
+    {
+    }
+
+    /**
+     * This method is identical to geoRadius except that instead of passing a longitude and latitude as the "source"
+     * you pass an existing member in the geospatial set
+     *
+     * @param string $key
+     * @param string $member
+     * @param $radius
+     * @param $units
+     * @param array|null $options see georadius
+     *
+     * @return array The zero or more entries that are close enough to the member given the distance and radius specified
+     *
+     * @link https://redis.io/commands/georadiusbymember
+     * @since >= 3.2
+     * @see georadius
+     * @example
+     * <pre>
+     * $redis->geoAdd("hawaii", -157.858, 21.306, "Honolulu", -156.331, 20.798, "Maui");
+     *
+     * echo "Within 300 miles of Honolulu:\n";
+     * var_dump($redis->geoRadiusByMember("hawaii", "Honolulu", 300, 'mi'));
+     *
+     * echo "\nFirst match within 300 miles of Honolulu:\n";
+     * var_dump($redis->geoRadiusByMember("hawaii", "Honolulu", 300, 'mi', ['count' => 1]));
+     *
+     * // Output
+     * Within 300 miles of Honolulu:
+     * array(2) {
+     *  [0]=> string(8) "Honolulu"
+     *  [1]=> string(4) "Maui"
+     * }
+     *
+     * First match within 300 miles of Honolulu:
+     * array(1) {
+     *  [0]=> string(8) "Honolulu"
+     * }
+     * </pre>
+     */
+    public function georadiusbymember($key, $member, $radius, $units, array $options = null)
+    {
+    }
+
+    /**
+     * Get or Set the redis config keys.
+     *
+     * @param string       $operation either `GET` or `SET`
+     * @param string       $key       for `SET`, glob-pattern for `GET`
+     * @param string|mixed $value     optional string (only for `SET`)
+     *
+     * @return array Associative array for `GET`, key -> value
+     *
+     * @link    https://redis.io/commands/config-get
+     * @example
+     * <pre>
+     * $redis->config("GET", "*max-*-entries*");
+     * $redis->config("SET", "dir", "/var/run/redis/dumps/");
+     * </pre>
+     */
+    public function config($operation, $key, $value)
+    {
+    }
+
+    /**
+     * Evaluate a LUA script serverside
+     *
+     * @param string $script
+     * @param array  $args
+     * @param int    $numKeys
+     *
+     * @return mixed What is returned depends on what the LUA script itself returns, which could be a scalar value
+     * (int/string), or an array. Arrays that are returned can also contain other arrays, if that's how it was set up in
+     * your LUA script.  If there is an error executing the LUA script, the getLastError() function can tell you the
+     * message that came back from Redis (e.g. compile error).
+     *
+     * @link   https://redis.io/commands/eval
+     * @example
+     * <pre>
+     * $redis->eval("return 1"); // Returns an integer: 1
+     * $redis->eval("return {1,2,3}"); // Returns Array(1,2,3)
+     * $redis->del('mylist');
+     * $redis->rpush('mylist','a');
+     * $redis->rpush('mylist','b');
+     * $redis->rpush('mylist','c');
+     * // Nested response:  Array(1,2,3,Array('a','b','c'));
+     * $redis->eval("return {1,2,3,redis.call('lrange','mylist',0,-1)}}");
+     * </pre>
+     */
+    public function eval($script, $args = array(), $numKeys = 0)
+    {
+    }
+
+    /**
+     * @see eval()
+     * @deprecated use Redis::eval()
+     *
+     * @param   string  $script
+     * @param   array   $args
+     * @param   int     $numKeys
+     * @return  mixed   @see eval()
+     */
+    public function evaluate($script, $args = array(), $numKeys = 0)
+    {
+    }
+
+    /**
+     * Evaluate a LUA script serverside, from the SHA1 hash of the script instead of the script itself.
+     * In order to run this command Redis will have to have already loaded the script, either by running it or via
+     * the SCRIPT LOAD command.
+     *
+     * @param string $scriptSha
+     * @param array  $args
+     * @param int    $numKeys
+     *
+     * @return mixed @see eval()
+     *
+     * @see     eval()
+     * @link    https://redis.io/commands/evalsha
+     * @example
+     * <pre>
+     * $script = 'return 1';
+     * $sha = $redis->script('load', $script);
+     * $redis->evalSha($sha); // Returns 1
+     * </pre>
+     */
+    public function evalSha($scriptSha, $args = array(), $numKeys = 0)
+    {
+    }
+
+    /**
+     * @see evalSha()
+     * @deprecated use Redis::evalSha()
+     *
+     * @param string $scriptSha
+     * @param array  $args
+     * @param int    $numKeys
+     */
+    public function evaluateSha($scriptSha, $args = array(), $numKeys = 0)
+    {
+    }
+
+    /**
+     * Execute the Redis SCRIPT command to perform various operations on the scripting subsystem.
+     * @param string $command load | flush | kill | exists
+     * @param string $script
+     *
+     * @return  mixed
+     *
+     * @link    https://redis.io/commands/script-load
+     * @link    https://redis.io/commands/script-kill
+     * @link    https://redis.io/commands/script-flush
+     * @link    https://redis.io/commands/script-exists
+     * @example
+     * <pre>
+     * $redis->script('load', $script);
+     * $redis->script('flush');
+     * $redis->script('kill');
+     * $redis->script('exists', $script1, [$script2, $script3, ...]);
+     * </pre>
+     *
+     * SCRIPT LOAD will return the SHA1 hash of the passed script on success, and FALSE on failure.
+     * SCRIPT FLUSH should always return TRUE
+     * SCRIPT KILL will return true if a script was able to be killed and false if not
+     * SCRIPT EXISTS will return an array with TRUE or FALSE for each passed script
+     */
+    public function script($command, $script)
+    {
+    }
+
+    /**
+     * The last error message (if any)
+     *
+     * @return string|null A string with the last returned script based error message, or NULL if there is no error
+     *
+     * @example
+     * <pre>
+     * $redis->eval('this-is-not-lua');
+     * $err = $redis->getLastError();
+     * // "ERR Error compiling script (new function): user_script:1: '=' expected near '-'"
+     * </pre>
+     */
+    public function getLastError()
+    {
+    }
+
+    /**
+     * Clear the last error message
+     *
+     * @return bool true
+     *
+     * @example
+     * <pre>
+     * $redis->set('x', 'a');
+     * $redis->incr('x');
+     * $err = $redis->getLastError();
+     * // "ERR value is not an integer or out of range"
+     * $redis->clearLastError();
+     * $err = $redis->getLastError();
+     * // NULL
+     * </pre>
+     */
+    public function clearLastError()
+    {
+    }
+
+    /**
+     * Issue the CLIENT command with various arguments.
+     * The Redis CLIENT command can be used in four ways:
+     * - CLIENT LIST
+     * - CLIENT GETNAME
+     * - CLIENT SETNAME [name]
+     * - CLIENT KILL [ip:port]
+     *
+     * @param string $command
+     * @param string $value
+     * @return mixed This will vary depending on which client command was executed:
+     * - CLIENT LIST will return an array of arrays with client information.
+     * - CLIENT GETNAME will return the client name or false if none has been set
+     * - CLIENT SETNAME will return true if it can be set and false if not
+     * - CLIENT KILL will return true if the client can be killed, and false if not
+     *
+     * Note: phpredis will attempt to reconnect so you can actually kill your own connection but may not notice losing it!
+     *
+     * @link https://redis.io/commands/client-list
+     * @link https://redis.io/commands/client-getname
+     * @link https://redis.io/commands/client-setname
+     * @link https://redis.io/commands/client-kill
+     *
+     * @example
+     * <pre>
+     * $redis->client('list'); // Get a list of clients
+     * $redis->client('getname'); // Get the name of the current connection
+     * $redis->client('setname', 'somename'); // Set the name of the current connection
+     * $redis->client('kill', <ip:port>); // Kill the process at ip:port
+     * </pre>
+     */
+    public function client($command, $value = '')
+    {
+    }
+
+    /**
+     * A utility method to prefix the value with the prefix setting for phpredis.
+     *
+     * @param mixed $value The value you wish to prefix
+     *
+     * @return string If a prefix is set up, the value now prefixed.
+     * If there is no prefix, the value will be returned unchanged.
+     *
+     * @example
+     * <pre>
+     * $redis->setOption(Redis::OPT_PREFIX, 'my-prefix:');
+     * $redis->_prefix('my-value'); // Will return 'my-prefix:my-value'
+     * </pre>
+     */
+    public function _prefix($value)
+    {
+    }
+
+    /**
+     * A utility method to unserialize data with whatever serializer is set up.  If there is no serializer set, the
+     * value will be returned unchanged.  If there is a serializer set up, and the data passed in is malformed, an
+     * exception will be thrown. This can be useful if phpredis is serializing values, and you return something from
+     * redis in a LUA script that is serialized.
+     *
+     * @param string $value The value to be unserialized
+     *
+     * @return mixed
+     * @example
+     * <pre>
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);
+     * $redis->_unserialize('a:3:{i:0;i:1;i:1;i:2;i:2;i:3;}'); // Will return Array(1,2,3)
+     * </pre>
+     */
+    public function _unserialize($value)
+    {
+    }
+
+    /**
+     * A utility method to serialize values manually. This method allows you to serialize a value with whatever
+     * serializer is configured, manually. This can be useful for serialization/unserialization of data going in
+     * and out of EVAL commands as phpredis can't automatically do this itself.  Note that if no serializer is
+     * set, phpredis will change Array values to 'Array', and Objects to 'Object'.
+     *
+     * @param mixed $value The value to be serialized.
+     *
+     * @return  mixed
+     * @example
+     * <pre>
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_NONE);
+     * $redis->_serialize("foo"); // returns "foo"
+     * $redis->_serialize(Array()); // Returns "Array"
+     * $redis->_serialize(new stdClass()); // Returns "Object"
+     *
+     * $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);
+     * $redis->_serialize("foo"); // Returns 's:3:"foo";'
+     * </pre>
+     */
+    public function _serialize($value)
+    {
+    }
+
+    /**
+     * Dump a key out of a redis database, the value of which can later be passed into redis using the RESTORE command.
+     * The data that comes out of DUMP is a binary representation of the key as Redis stores it.
+     * @param string $key
+     *
+     * @return string|bool The Redis encoded value of the key, or FALSE if the key doesn't exist
+     *
+     * @link    https://redis.io/commands/dump
+     * @example
+     * <pre>
+     * $redis->set('foo', 'bar');
+     * $val = $redis->dump('foo'); // $val will be the Redis encoded key value
+     * </pre>
+     */
+    public function dump($key)
+    {
+    }
+
+    /**
+     * Restore a key from the result of a DUMP operation.
+     *
+     * @param string $key   The key name
+     * @param int    $ttl   How long the key should live (if zero, no expire will be set on the key)
+     * @param string $value (binary).  The Redis encoded key value (from DUMP)
+     *
+     * @return bool
+     *
+     * @link    https://redis.io/commands/restore
+     * @example
+     * <pre>
+     * $redis->set('foo', 'bar');
+     * $val = $redis->dump('foo');
+     * $redis->restore('bar', 0, $val); // The key 'bar', will now be equal to the key 'foo'
+     * </pre>
+     */
+    public function restore($key, $ttl, $value)
+    {
+    }
+
+    /**
+     * Migrates a key to a different Redis instance.
+     *
+     * @param string $host    The destination host
+     * @param int    $port    The TCP port to connect to.
+     * @param string $key     The key to migrate.
+     * @param int    $db      The target DB.
+     * @param int    $timeout The maximum amount of time given to this transfer.
+     * @param bool   $copy    Should we send the COPY flag to redis.
+     * @param bool   $replace Should we send the REPLACE flag to redis.
+     *
+     * @return bool
+     *
+     * @link    https://redis.io/commands/migrate
+     * @example
+     * <pre>
+     * $redis->migrate('backup', 6379, 'foo', 0, 3600);
+     * </pre>
+     */
+    public function migrate($host, $port, $key, $db, $timeout, $copy = false, $replace = false)
+    {
+    }
+
+    /**
+     * Return the current Redis server time.
+     *
+     * @return array If successfull, the time will come back as an associative array with element zero being the
+     * unix timestamp, and element one being microseconds.
+     *
+     * @link    https://redis.io/commands/time
+     * @example
+     * <pre>
+     * var_dump( $redis->time() );
+     * // array(2) {
+     * //   [0] => string(10) "1342364352"
+     * //   [1] => string(6) "253002"
+     * // }
+     * </pre>
+     */
+    public function time()
+    {
+    }
+
+    /**
+     * Scan the keyspace for keys
+     *
+     * @param int    $iterator Iterator, initialized to NULL.
+     * @param string $pattern  Pattern to match.
+     * @param int    $count    Count of keys per iteration (only a suggestion to Redis).
+     *
+     * @return array|bool This function will return an array of keys or FALSE if there are no more keys.
+     *
+     * @link   https://redis.io/commands/scan
+     * @example
+     * <pre>
+     * $iterator = null;
+     * while(false !== ($keys = $redis->scan($iterator))) {
+     *     foreach($keys as $key) {
+     *         echo $key . PHP_EOL;
+     *     }
+     * }
+     * </pre>
+     */
+    public function scan(&$iterator, $pattern = null, $count = 0)
+    {
+    }
+
+    /**
+     * Adds all the element arguments to the HyperLogLog data structure stored at the key.
+     *
+     * @param string $key
+     * @param array  $elements
+     *
+     * @return bool
+     *
+     * @link    https://redis.io/commands/pfadd
+     * @example $redis->pfAdd('key', array('elem1', 'elem2'))
+     */
+    public function pfAdd($key, array $elements)
+    {
+    }
+
+    /**
+     * When called with a single key, returns the approximated cardinality computed by the HyperLogLog data
+     * structure stored at the specified variable, which is 0 if the variable does not exist.
+     *
+     * @param string|array $key
+     *
+     * @return int
+     *
+     * @link    https://redis.io/commands/pfcount
+     * @example
+     * <pre>
+     * $redis->pfAdd('key1', array('elem1', 'elem2'));
+     * $redis->pfAdd('key2', array('elem3', 'elem2'));
+     * $redis->pfCount('key1'); // int(2)
+     * $redis->pfCount(array('key1', 'key2')); // int(3)
+     */
+    public function pfCount($key)
+    {
+    }
+
+    /**
+     * Merge multiple HyperLogLog values into an unique value that will approximate the cardinality
+     * of the union of the observed Sets of the source HyperLogLog structures.
+     *
+     * @param string $destKey
+     * @param array  $sourceKeys
+     *
+     * @return bool
+     *
+     * @link    https://redis.io/commands/pfmerge
+     * @example
+     * <pre>
+     * $redis->pfAdd('key1', array('elem1', 'elem2'));
+     * $redis->pfAdd('key2', array('elem3', 'elem2'));
+     * $redis->pfMerge('key3', array('key1', 'key2'));
+     * $redis->pfCount('key3'); // int(3)
+     */
+    public function pfMerge($destKey, array $sourceKeys)
+    {
+    }
+
+    /**
+     * Send arbitrary things to the redis server.
+     *
+     * @param string $command   Required command to send to the server.
+     * @param mixed  $arguments Optional variable amount of arguments to send to the server.
+     *
+     * @return mixed
+     *
+     * @example
+     * <pre>
+     * $redis->rawCommand('SET', 'key', 'value'); // bool(true)
+     * $redis->rawCommand('GET", 'key'); // string(5) "value"
+     * </pre>
+     */
+    public function rawCommand($command, $arguments)
+    {
+    }
+
+    /**
+     * Detect whether we're in ATOMIC/MULTI/PIPELINE mode.
+     *
+     * @return int Either Redis::ATOMIC, Redis::MULTI or Redis::PIPELINE
+     *
+     * @example $redis->getMode();
+     */
+    public function getMode()
+    {
+    }
+
+    /**
+     * Acknowledge one or more messages on behalf of a consumer group.
+     *
+     * @param string $stream
+     * @param string $group
+     * @param array  $messages
+     *
+     * @return int The number of messages Redis reports as acknowledged.
+     *
+     * @link    https://redis.io/commands/xack
+     * @example
+     * <pre>
+     * $redis->xAck('stream', 'group1', ['1530063064286-0', '1530063064286-1']);
+     * </pre>
+     */
+    public function xAck($stream, $group, $messages)
+    {
+    }
+
+    /**
+     * Add a message to a stream
+     *
+     * @param string $key
+     * @param string $id
+     * @param array  $messages
+     * @param int    $maxLen
+     * @param bool   $isApproximate
+     *
+     * @return string The added message ID.
+     *
+     * @link    https://redis.io/commands/xadd
+     * @example
+     * <pre>
+     * $redis->xAdd('mystream', "*", ['field' => 'value']);
+     * $redis->xAdd('mystream', "*", ['field' => 'value'], 10);
+     * $redis->xAdd('mystream', "*", ['field' => 'value'], 10, true);
+     * </pre>
+     */
+    public function xAdd($key, $id, $messages, $maxLen = 0, $isApproximate = false)
+    {
+    }
+
+    /**
+     * Claim ownership of one or more pending messages
+     *
+     * @param string $key
+     * @param string $group
+     * @param string $consumer
+     * @param int    $minIdleTime
+     * @param array  $ids
+     * @param array  $options ['IDLE' => $value, 'TIME' => $value, 'RETRYCOUNT' => $value, 'FORCE', 'JUSTID']
+     *
+     * @return array Either an array of message IDs along with corresponding data, or just an array of IDs
+     * (if the 'JUSTID' option was passed).
+     *
+     * @link    https://redis.io/commands/xclaim
+     * @example
+     * <pre>
+     * $ids = ['1530113681011-0', '1530113681011-1', '1530113681011-2'];
+     *
+     * // Without any options
+     * $redis->xClaim('mystream', 'group1', 'myconsumer1', 0, $ids);
+     *
+     * // With options
+     * $redis->xClaim(
+     *     'mystream', 'group1', 'myconsumer2', 0, $ids,
+     *     [
+     *         'IDLE' => time() * 1000,
+     *         'RETRYCOUNT' => 5,
+     *         'FORCE',
+     *         'JUSTID'
+     *     ]
+     * );
+     * </pre>
+     */
+    public function xClaim($key, $group, $consumer, $minIdleTime, $ids, $options = [])
+    {
+    }
+
+    /**
+     * Delete one or more messages from a stream
+     *
+     * @param string $key
+     * @param array  $ids
+     *
+     * @return int The number of messages removed
+     *
+     * @link    https://redis.io/commands/xdel
+     * @example
+     * <pre>
+     * $redis->xDel('mystream', ['1530115304877-0', '1530115305731-0']);
+     * </pre>
+     */
+    public function xDel($key, $ids)
+    {
+    }
+
+    /**
+     * @param string $operation  e.g.: 'HELP', 'SETID', 'DELGROUP', 'CREATE', 'DELCONSUMER'
+     * @param string $key
+     * @param string $group
+     * @param string $msgId
+     * @param bool   $mkStream
+     *
+     * @return mixed This command returns different types depending on the specific XGROUP command executed.
+     *
+     * @link    https://redis.io/commands/xgroup
+     * @example
+     * <pre>
+     * $redis->xGroup('CREATE', 'mystream', 'mygroup', 0);
+     * $redis->xGroup('CREATE', 'mystream', 'mygroup', 0, true); // create stream
+     * $redis->xGroup('DESTROY', 'mystream', 'mygroup');
+     * </pre>
+     */
+    public function xGroup($operation, $key, $group, $msgId = '', $mkStream = false)
+    {
+    }
+
+    /**
+     * Get information about a stream or consumer groups
+     *
+     * @param string $operation  e.g.: 'CONSUMERS', 'GROUPS', 'STREAM', 'HELP'
+     * @param string $stream
+     * @param string $group
+     *
+     * @return mixed This command returns different types depending on which subcommand is used.
+     *
+     * @link    https://redis.io/commands/xinfo
+     * @example
+     * <pre>
+     * $redis->xInfo('STREAM', 'mystream');
+     * </pre>
+     */
+    public function xInfo($operation, $stream, $group)
+    {
+    }
+
+    /**
+     * Get the length of a given stream.
+     *
+     * @param string $stream
+     *
+     * @return int The number of messages in the stream.
+     *
+     * @link    https://redis.io/commands/xlen
+     * @example
+     * <pre>
+     * $redis->xLen('mystream');
+     * </pre>
+     */
+    public function xLen($stream)
+    {
+    }
+
+    /**
+     * Get information about pending messages in a given stream
+     *
+     * @param string $stream
+     * @param string $group
+     * @param string $start
+     * @param string $end
+     * @param int    $count
+     * @param string $consumer
+     *
+     * @return array Information about the pending messages, in various forms depending on
+     * the specific invocation of XPENDING.
+     *
+     * @link https://redis.io/commands/xpending
+     * @example
+     * <pre>
+     * $redis->xPending('mystream', 'mygroup');
+     * $redis->xPending('mystream', 'mygroup', '-', '+', 1, 'consumer-1');
+     * </pre>
+     */
+    public function xPending($stream, $group, $start = null, $end = null, $count = null, $consumer = null)
+    {
+    }
+
+    /**
+     * Get a range of messages from a given stream
+     *
+     * @param string $stream
+     * @param string $start
+     * @param string $end
+     * @param int    $count
+     *
+     * @return array The messages in the stream within the requested range.
+     *
+     * @link    https://redis.io/commands/xrange
+     * @example
+     * <pre>
+     * // Get everything in this stream
+     * $redis->xRange('mystream', '-', '+');
+     * // Only the first two messages
+     * $redis->xRange('mystream', '-', '+', 2);
+     * </pre>
+     */
+    public function xRange($stream, $start, $end, $count = null)
+    {
+    }
+
+    /**
+     * Read data from one or more streams and only return IDs greater than sent in the command.
+     *
+     * @param array      $streams
+     * @param int|string $count
+     * @param int|string $block
+     *
+     * @return array The messages in the stream newer than the IDs passed to Redis (if any)
+     *
+     * @link    https://redis.io/commands/xread
+     * @example
+     * <pre>
+     * $redis->xRead(['stream1' => '1535222584555-0', 'stream2' => '1535222584555-0']);
+     * </pre>
+     */
+    public function xRead($streams, $count = null, $block = null)
+    {
+    }
+
+    /**
+     * This method is similar to xRead except that it supports reading messages for a specific consumer group.
+     *
+     * @param string   $group
+     * @param string   $consumer
+     * @param array    $streams
+     * @param int|null $count
+     * @param int|null $block
+     *
+     * @return array The messages delivered to this consumer group (if any).
+     *
+     * @link    https://redis.io/commands/xreadgroup
+     * @example
+     * <pre>
+     * // Consume messages for 'mygroup', 'consumer1'
+     * $redis->xReadGroup('mygroup', 'consumer1', ['s1' => 0, 's2' => 0]);
+     * // Read a single message as 'consumer2' for up to a second until a message arrives.
+     * $redis->xReadGroup('mygroup', 'consumer2', ['s1' => 0, 's2' => 0], 1, 1000);
+     * </pre>
+     */
+    public function xReadGroup($group, $consumer, $streams, $count = null, $block = null)
+    {
+    }
+
+    /**
+     * This is identical to xRange except the results come back in reverse order.
+     * Also note that Redis reverses the order of "start" and "end".
+     *
+     * @param string $stream
+     * @param string $end
+     * @param string $start
+     * @param int    $count
+     *
+     * @return array The messages in the range specified
+     *
+     * @link    https://redis.io/commands/xrevrange
+     * @example
+     * <pre>
+     * $redis->xRevRange('mystream', '+', '-');
+     * </pre>
+     */
+    public function xRevRange($stream, $end, $start, $count = null)
+    {
+    }
+
+    /**
+     * Trim the stream length to a given maximum.
+     * If the "approximate" flag is pasesed, Redis will use your size as a hint but only trim trees in whole nodes
+     * (this is more efficient)
+     *
+     * @param string $stream
+     * @param int    $maxLen
+     * @param bool   $isApproximate
+     *
+     * @return int The number of messages trimed from the stream.
+     *
+     * @link    https://redis.io/commands/xtrim
+     * @example
+     * <pre>
+     * // Trim to exactly 100 messages
+     * $redis->xTrim('mystream', 100);
+     * // Let Redis approximate the trimming
+     * $redis->xTrim('mystream', 100, true);
+     * </pre>
+     */
+    public function xTrim($stream, $maxLen, $isApproximate)
+    {
+    }
+
+    /**
+     * Adds a values to the set value stored at key.
+     *
+     * @param string $key Required key
+     * @param array  $values Required values
+     *
+     * @return  int|bool The number of elements added to the set.
+     * If this value is already in the set, FALSE is returned
+     *
+     * @link    https://redis.io/commands/sadd
+     * @link    https://github.com/phpredis/phpredis/commit/3491b188e0022f75b938738f7542603c7aae9077
+     * @since   phpredis 2.2.8
+     * @example
+     * <pre>
+     * $redis->sAddArray('k', array('v1'));                // boolean
+     * $redis->sAddArray('k', array('v1', 'v2', 'v3'));    // boolean
+     * </pre>
+     */
+    public function sAddArray($key, array $values)
+    {
+    }
+}
+
+class RedisException extends Exception
+{
+}
+
+/**
+ * @mixin \Redis
+ */
+class RedisArray
+{
+    /**
+     * Constructor
+     *
+     * @param string|array $hosts Name of the redis array from redis.ini or array of hosts to construct the array with
+     * @param array        $opts  Array of options
+     *
+     * @link    https://github.com/nicolasff/phpredis/blob/master/arrays.markdown
+     */
+    public function __construct($hosts, array $opts = null)
+    {
+    }
+
+    /**
+     * @return array list of hosts for the selected array
+     */
+    public function _hosts()
+    {
+    }
+
+    /**
+     * @return string the name of the function used to extract key parts during consistent hashing
+     */
+    public function _function()
+    {
+    }
+
+    /**
+     * @param string $key The key for which you want to lookup the host
+     *
+     * @return  string  the host to be used for a certain key
+     */
+    public function _target($key)
+    {
+    }
+
+    /**
+     * Use this function when a new node is added and keys need to be rehashed.
+     */
+    public function _rehash()
+    {
+    }
+
+    /**
+     * Returns an associative array of strings and integers, with the following keys:
+     * - redis_version
+     * - redis_git_sha1
+     * - redis_git_dirty
+     * - redis_build_id
+     * - redis_mode
+     * - os
+     * - arch_bits
+     * - multiplexing_api
+     * - atomicvar_api
+     * - gcc_version
+     * - process_id
+     * - run_id
+     * - tcp_port
+     * - uptime_in_seconds
+     * - uptime_in_days
+     * - hz
+     * - lru_clock
+     * - executable
+     * - config_file
+     * - connected_clients
+     * - client_longest_output_list
+     * - client_biggest_input_buf
+     * - blocked_clients
+     * - used_memory
+     * - used_memory_human
+     * - used_memory_rss
+     * - used_memory_rss_human
+     * - used_memory_peak
+     * - used_memory_peak_human
+     * - used_memory_peak_perc
+     * - used_memory_peak
+     * - used_memory_overhead
+     * - used_memory_startup
+     * - used_memory_dataset
+     * - used_memory_dataset_perc
+     * - total_system_memory
+     * - total_system_memory_human
+     * - used_memory_lua
+     * - used_memory_lua_human
+     * - maxmemory
+     * - maxmemory_human
+     * - maxmemory_policy
+     * - mem_fragmentation_ratio
+     * - mem_allocator
+     * - active_defrag_running
+     * - lazyfree_pending_objects
+     * - mem_fragmentation_ratio
+     * - loading
+     * - rdb_changes_since_last_save
+     * - rdb_bgsave_in_progress
+     * - rdb_last_save_time
+     * - rdb_last_bgsave_status
+     * - rdb_last_bgsave_time_sec
+     * - rdb_current_bgsave_time_sec
+     * - rdb_last_cow_size
+     * - aof_enabled
+     * - aof_rewrite_in_progress
+     * - aof_rewrite_scheduled
+     * - aof_last_rewrite_time_sec
+     * - aof_current_rewrite_time_sec
+     * - aof_last_bgrewrite_status
+     * - aof_last_write_status
+     * - aof_last_cow_size
+     * - changes_since_last_save
+     * - aof_current_size
+     * - aof_base_size
+     * - aof_pending_rewrite
+     * - aof_buffer_length
+     * - aof_rewrite_buffer_length
+     * - aof_pending_bio_fsync
+     * - aof_delayed_fsync
+     * - loading_start_time
+     * - loading_total_bytes
+     * - loading_loaded_bytes
+     * - loading_loaded_perc
+     * - loading_eta_seconds
+     * - total_connections_received
+     * - total_commands_processed
+     * - instantaneous_ops_per_sec
+     * - total_net_input_bytes
+     * - total_net_output_bytes
+     * - instantaneous_input_kbps
+     * - instantaneous_output_kbps
+     * - rejected_connections
+     * - maxclients
+     * - sync_full
+     * - sync_partial_ok
+     * - sync_partial_err
+     * - expired_keys
+     * - evicted_keys
+     * - keyspace_hits
+     * - keyspace_misses
+     * - pubsub_channels
+     * - pubsub_patterns
+     * - latest_fork_usec
+     * - migrate_cached_sockets
+     * - slave_expires_tracked_keys
+     * - active_defrag_hits
+     * - active_defrag_misses
+     * - active_defrag_key_hits
+     * - active_defrag_key_misses
+     * - role
+     * - master_replid
+     * - master_replid2
+     * - master_repl_offset
+     * - second_repl_offset
+     * - repl_backlog_active
+     * - repl_backlog_size
+     * - repl_backlog_first_byte_offset
+     * - repl_backlog_histlen
+     * - master_host
+     * - master_port
+     * - master_link_status
+     * - master_last_io_seconds_ago
+     * - master_sync_in_progress
+     * - slave_repl_offset
+     * - slave_priority
+     * - slave_read_only
+     * - master_sync_left_bytes
+     * - master_sync_last_io_seconds_ago
+     * - master_link_down_since_seconds
+     * - connected_slaves
+     * - min-slaves-to-write
+     * - min-replicas-to-write
+     * - min_slaves_good_slaves
+     * - used_cpu_sys
+     * - used_cpu_user
+     * - used_cpu_sys_children
+     * - used_cpu_user_children
+     * - cluster_enabled
+     *
+     * @link    https://redis.io/commands/info
+     * @return  array
+     * @example
+     * <pre>
+     * $redis->info();
+     * </pre>
+     */
+    public function info() {
+    }
+}
diff --git a/.phan/internal_stubs/memcache.phan_php b/.phan/internal_stubs/memcache.phan_php
new file mode 100644
index 0000000000..080129f499
--- /dev/null
+++ b/.phan/internal_stubs/memcache.phan_php
@@ -0,0 +1,460 @@
+<?php
+
+// Start of memcache v.3.0.8
+
+class MemcachePool  {
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Open memcached server connection
+     * @link https://php.net/manual/en/memcache.connect.php
+     * @param string $host <p>
+     * Point to the host where memcached is listening for connections. This parameter
+     * may also specify other transports like <em>unix:///path/to/memcached.sock</em>
+     * to use UNIX domain sockets, in this case <b>port</b> must also
+     * be set to <em>0</em>.
+     * </p>
+     * @param int $port [optional] <p>
+     * Point to the port where memcached is listening for connections. Set this
+     * parameter to <em>0</em> when using UNIX domain sockets.
+     * </p>
+     * <p>
+     * Please note: <b>port</b> defaults to
+     * {@link https://php.net/manual/ru/memcache.ini.php#ini.memcache.default-port memcache.default_port}
+     * if not specified. For this reason it is wise to specify the port
+     * explicitly in this method call.
+     * </p>
+     * @param int $timeout [optional] <p>Value in seconds which will be used for connecting to the daemon. Think twice before changing the default value of 1 second - you can lose all the advantages of caching if your connection is too slow.</p>
+     * @return bool <p>Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.</p>
+     */
+    public function connect ($host, $port, $timeout = 1) {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Add a memcached server to connection pool
+     * @link https://php.net/manual/en/memcache.addserver.php
+     * @param string $host <p>
+     * Point to the host where memcached is listening for connections. This parameter
+     * may also specify other transports like unix:///path/to/memcached.sock
+     * to use UNIX domain sockets, in this case <i>port</i> must also
+     * be set to 0.
+     * </p>
+     * @param int $port [optional] <p>
+     * Point to the port where memcached is listening for connections.
+     * Set this
+     * parameter to 0 when using UNIX domain sockets.
+     * </p>
+     * <p>
+     * Please note: <i>port</i> defaults to
+     * memcache.default_port
+     * if not specified. For this reason it is wise to specify the port
+     * explicitly in this method call.
+     * </p>
+     * @param bool $persistent [optional] <p>
+     * Controls the use of a persistent connection. Default to <b>TRUE</b>.
+     * </p>
+     * @param int $weight [optional] <p>
+     * Number of buckets to create for this server which in turn control its
+     * probability of it being selected. The probability is relative to the
+     * total weight of all servers.
+     * </p>
+     * @param int $timeout [optional] <p>
+     * Value in seconds which will be used for connecting to the daemon. Think
+     * twice before changing the default value of 1 second - you can lose all
+     * the advantages of caching if your connection is too slow.
+     * </p>
+     * @param int $retry_interval [optional] <p>
+     * Controls how often a failed server will be retried, the default value
+     * is 15 seconds. Setting this parameter to -1 disables automatic retry.
+     * Neither this nor the <i>persistent</i> parameter has any
+     * effect when the extension is loaded dynamically via <b>dl</b>.
+     * </p>
+     * <p>
+     * Each failed connection struct has its own timeout and before it has expired
+     * the struct will be skipped when selecting backends to serve a request. Once
+     * expired the connection will be successfully reconnected or marked as failed
+     * for another <i>retry_interval</i> seconds. The typical
+     * effect is that each web server child will retry the connection about every
+     * <i>retry_interval</i> seconds when serving a page.
+     * </p>
+     * @param bool $status [optional] <p>
+     * Controls if the server should be flagged as online. Setting this parameter
+     * to <b>FALSE</b> and <i>retry_interval</i> to -1 allows a failed
+     * server to be kept in the pool so as not to affect the key distribution
+     * algorithm. Requests for this server will then failover or fail immediately
+     * depending on the <i>memcache.allow_failover</i> setting.
+     * Default to <b>TRUE</b>, meaning the server should be considered online.
+     * </p>
+     * @param callable $failure_callback [optional] <p>
+     * Allows the user to specify a callback function to run upon encountering an
+     * error. The callback is run before failover is attempted. The function takes
+     * two parameters, the hostname and port of the failed server.
+     * </p>
+     * @param int $timeoutms [optional] <p>
+     * </p>
+     * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function addServer ($host, $port = 11211, $persistent = true, $weight = null, $timeout = 1, $retry_interval = 15, $status = true, callable $failure_callback = null, $timeoutms = null) {}
+
+    /**
+     * (PECL memcache &gt;= 2.1.0)<br/>
+     * Changes server parameters and status at runtime
+     * @link https://secure.php.net/manual/en/memcache.setserverparams.php
+     * @param string $host <p>Point to the host where memcached is listening for connections.</p.
+     * @param int $port [optional] <p>
+     * Point to the port where memcached is listening for connections.
+     * </p>
+     * @param int $timeout [optional] <p>
+     * Value in seconds which will be used for connecting to the daemon. Think twice before changing the default value of 1 second - you can lose all the advantages of caching if your connection is too slow.
+     * </p>
+     * @param int $retry_interval [optional] <p>
+     * Controls how often a failed server will be retried, the default value
+     * is 15 seconds. Setting this parameter to -1 disables automatic retry.
+     * Neither this nor the <b>persistent</b> parameter has any
+     * effect when the extension is loaded dynamically via {@link https://secure.php.net/manual/en/function.dl.php dl()}.
+     * </p>
+     * @param bool $status [optional] <p>
+     * Controls if the server should be flagged as online. Setting this parameter
+     * to <b>FALSE</b> and <b>retry_interval</b> to -1 allows a failed
+     * server to be kept in the pool so as not to affect the key distribution
+     * algorithm. Requests for this server will then failover or fail immediately
+     * depending on the <b>memcache.allow_failover</b> setting.
+     * Default to <b>TRUE</b>, meaning the server should be considered online.
+     * </p>
+     * @param callable $failure_callback [optional] <p>
+     * Allows the user to specify a callback function to run upon encountering an error. The callback is run before failover is attempted.
+     * The function takes two parameters, the hostname and port of the failed server.
+     * </p>
+     * @return bool <p>Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.</p>
+     */
+    public function setServerParams ($host, $port = 11211, $timeout = 1, $retry_interval = 15, $status = true, callable $failure_callback = null) {}
+
+    /**
+     *
+     */
+    public function setFailureCallback () {}
+
+    /**
+     * (PECL memcache &gt;= 2.1.0)<br/>
+     * Returns server status
+     * @link https://php.net/manual/en/memcache.getserverstatus.php
+     * @param string $host Point to the host where memcached is listening for connections.
+     * @param int $port Point to the port where memcached is listening for connections.
+     * @return int Returns a the servers status. 0 if server is failed, non-zero otherwise
+     */
+    public function getServerStatus ($host, $port = 11211) {}
+
+    /**
+     *
+     */
+    public function findServer () {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Return version of the server
+     * @link https://php.net/manual/en/memcache.getversion.php
+     * @return string|false Returns a string of server version number or <b>FALSE</b> on failure.
+     */
+    public function getVersion () {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Add an item to the server. If the key already exists, the value will not be added and <b>FALSE</b> will be returned.
+     * @link https://php.net/manual/en/memcache.add.php
+     * @param string $key The key that will be associated with the item.
+     * @param mixed $var The variable to store. Strings and integers are stored as is, other types are stored serialized.
+     * @param int $flag [optional] <p>
+     * Use <b>MEMCACHE_COMPRESSED</b> to store the item
+     * compressed (uses zlib).
+     * </p>
+     * @param int $expire [optional] <p>Expiration time of the item.
+     * If it's equal to zero, the item will never expire.
+     * You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).</p>
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure. Returns <b>FALSE</b> if such key already exist. For the rest Memcache::add() behaves similarly to Memcache::set().
+     */
+    public function add ($key , $var, $flag = null, $expire = null) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Stores an item var with key on the memcached server. Parameter expire is expiration time in seconds.
+     * If it's 0, the item never expires (but memcached server doesn't guarantee this item to be stored all the time,
+     * it could be deleted from the cache to make place for other items).
+     * You can use MEMCACHE_COMPRESSED constant as flag value if you want to use on-the-fly compression (uses zlib).
+     * @link https://php.net/manual/en/memcache.set.php
+     * @param string $key The key that will be associated with the item.
+     * @param mixed $var The variable to store. Strings and integers are stored as is, other types are stored serialized.
+     * @param int $flag [optional] Use MEMCACHE_COMPRESSED to store the item compressed (uses zlib).
+     * @param int $expire [optional] Expiration time of the item. If it's equal to zero, the item will never expire. You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function set ($key, $var, $flag = null, $expire = null) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Replace value of the existing item
+     * @link https://php.net/manual/en/memcache.replace.php
+     * @param string $key <p>The key that will be associated with the item.</p>
+     * @param mixed $var <p>The variable to store. Strings and integers are stored as is, other types are stored serialized.</p>
+     * @param int $flag [optional] <p>Use <b>MEMCACHE_COMPRESSED</b> to store the item compressed (uses zlib).</p>
+     * @param int $expire [optional] <p>Expiration time of the item. If it's equal to zero, the item will never expire. You can also use Unix timestamp or a number of seconds starting from current time, but in the latter case the number of seconds may not exceed 2592000 (30 days).</p>
+     * @return bool Returns TRUE on success or FALSE on failure.
+     */
+    public function replace ($key,  $var, $flag = null, $expire = null) {}
+
+	public function cas () {}
+
+	public function append () {}
+
+    /**
+     * @return string
+     */
+    public function prepend () {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Retrieve item from the server
+     * @link https://php.net/manual/en/memcache.get.php
+     * @param string|array $key <p>
+     * The key or array of keys to fetch.
+     * </p>
+     * @param int|array $flags [optional] <p>
+     * If present, flags fetched along with the values will be written to this parameter. These
+     * flags are the same as the ones given to for example {@link https://php.net/manual/en/memcache.set.php Memcache::set()}.
+     * The lowest byte of the int is reserved for pecl/memcache internal usage (e.g. to indicate
+     * compression and serialization status).
+     * </p>
+     * @return string|array|false <p>
+     * Returns the string associated with the <b>key</b> or
+     * an array of found key-value pairs when <b>key</b> is an {@link https://php.net/manual/en/language.types.array.php array}.
+     * Returns <b>FALSE</b> on failure, <b>key</b> is not found or
+     * <b>key</b> is an empty {@link https://php.net/manual/en/language.types.array.php array}.
+     * </p>
+     */
+    public function get ($key, &$flags = null) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Delete item from the server
+     * https://secure.php.net/manual/ru/memcache.delete.php
+     * @param $key string The key associated with the item to delete.
+     * @param $timeout int [optional] This deprecated parameter is not supported, and defaults to 0 seconds. Do not use this parameter.
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function delete ($key, $timeout = 0 ) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Get statistics of the server
+     * @link https://php.net/manual/ru/memcache.getstats.php
+     * @param string $type [optional] <p>
+     * The type of statistics to fetch.
+     * Valid values are {reset, malloc, maps, cachedump, slabs, items, sizes}.
+     * According to the memcached protocol spec these additional arguments "are subject to change for the convenience of memcache developers".</p>
+     * @param int $slabid [optional] <p>
+     * Used in conjunction with <b>type</b> set to
+     * cachedump to identify the slab to dump from. The cachedump
+     * command ties up the server and is strictly to be used for
+     * debugging purposes.
+     * </p>
+     * @param int $limit [optional] <p>
+     * Used in conjunction with <b>type</b> set to cachedump to limit the number of entries to dump.
+     * </p>
+     * @return array|false Returns an associative array of server statistics or <b>FALSE</b> on failure.
+     */
+    public function getStats ($type = null, $slabid = null, $limit = 100) {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Get statistics from all servers in pool
+     * @link https://php.net/manual/en/memcache.getextendedstats.php
+     * @param string $type [optional] <p>The type of statistics to fetch. Valid values are {reset, malloc, maps, cachedump, slabs, items, sizes}. According to the memcached protocol spec these additional arguments "are subject to change for the convenience of memcache developers".</p>
+     * @param int $slabid [optional] <p>
+     * Used in conjunction with <b>type</b> set to
+     * cachedump to identify the slab to dump from. The cachedump
+     * command ties up the server and is strictly to be used for
+     * debugging purposes.
+     * </p>
+     * @param int $limit Used in conjunction with type set to cachedump to limit the number of entries to dump.
+     * @return array|false Returns a two-dimensional associative array of server statistics or <b>FALSE</b>
+     * Returns a two-dimensional associative array of server statistics or <b>FALSE</b>
+     * on failure.
+     */
+    public function getExtendedStats ($type = null, $slabid = null, $limit = 100) {}
+
+    /**
+     * (PECL memcache &gt;= 2.0.0)<br/>
+     * Enable automatic compression of large values
+     * @link https://php.net/manual/en/memcache.setcompressthreshold.php
+     * @param int $thresold <p>Controls the minimum value length before attempting to compress automatically.</p>
+     * @param float $min_saving [optional] <p>Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.</p>
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function setCompressThreshold ($thresold, $min_saving = 0.2) {}
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Increment item's value
+     * @link https://php.net/manual/en/memcache.increment.php
+     * @param $key string Key of the item to increment.
+     * @param $value int [optional] increment the item by <b>value</b>
+     * @return int|false Returns new items value on success or <b>FALSE</b> on failure.
+     */
+    public function increment ($key, $value = 1) {}
+
+    /**
+     * (PECL memcache &gt;= 0.2.0)<br/>
+     * Decrement item's value
+     * @link https://php.net/manual/en/memcache.decrement.php
+     * @param $key string Key of the item do decrement.
+     * @param $value int Decrement the item by <b>value</b>.
+     * @return int|false Returns item's new value on success or <b>FALSE</b> on failure.
+     */
+    public function decrement ($key, $value = 1) {}
+
+    /**
+     * (PECL memcache &gt;= 0.4.0)<br/>
+     * Close memcached server connection
+     * @link https://php.net/manual/en/memcache.close.php
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function close () {}
+
+    /**
+     * (PECL memcache &gt;= 1.0.0)<br/>
+     * Flush all existing items at the server
+     * @link https://php.net/manual/en/memcache.flush.php
+     * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    public function flush () {}
+
+}
+
+/**
+ * Represents a connection to a set of memcache servers.
+ * @link https://php.net/manual/en/class.memcache.php
+ */
+class Memcache extends MemcachePool  {
+
+
+	/**
+	 * (PECL memcache &gt;= 0.4.0)<br/>
+	 * Open memcached server persistent connection
+	 * @link https://php.net/manual/en/memcache.pconnect.php
+	 * @param string $host <p>
+	 * Point to the host where memcached is listening for connections. This parameter
+	 * may also specify other transports like unix:///path/to/memcached.sock
+	 * to use UNIX domain sockets, in this case <i>port</i> must also
+	 * be set to 0.
+	 * </p>
+	 * @param int $port [optional] <p>
+	 * Point to the port where memcached is listening for connections. Set this
+	 * parameter to 0 when using UNIX domain sockets.
+	 * </p>
+	 * @param int $timeout [optional] <p>
+	 * Value in seconds which will be used for connecting to the daemon. Think
+	 * twice before changing the default value of 1 second - you can lose all
+	 * the advantages of caching if your connection is too slow.
+	 * </p>
+	 * @return mixed a Memcache object or <b>FALSE</b> on failure.
+	 */
+	public function pconnect ($host, $port, $timeout = 1) {}
+}
+
+//  string $host [, int $port [, int $timeout ]]
+
+/**
+ * (PECL memcache >= 0.2.0)</br>
+ * Memcache::connect — Open memcached server connection
+ * @link https://php.net/manual/en/memcache.connect.php
+ * @param string $host <p>
+ * Point to the host where memcached is listening for connections.
+ * This parameter may also specify other transports like
+ * unix:///path/to/memcached.sock to use UNIX domain sockets,
+ * in this case port must also be set to 0.
+ * </p>
+ * @param int $port [optional] <p>
+ * Point to the port where memcached is listening for connections.
+ * Set this parameter to 0 when using UNIX domain sockets.
+ * Note:  port defaults to memcache.default_port if not specified.
+ * For this reason it is wise to specify the port explicitly in this method call.
+ * </p>
+ * @param int $timeout [optional] <p>
+ * Value in seconds which will be used for connecting to the daemon.
+ * </p>
+ * @return bool Returns <b>TRUE</b> on success or <b>FALSE</b> on failure.
+ */
+function memcache_connect ($host, $port, $timeout = 1) {}
+
+/**
+ * (PECL memcache >= 0.4.0)
+ * Memcache::pconnect — Open memcached server persistent connection
+ * 
+ * @link https://php.net/manual/en/memcache.pconnect.php#example-5242
+ * @param      $host
+ * @param null $port
+ * @param int  $timeout
+ * @return Memcache
+ */
+function memcache_pconnect ($host, $port=null, $timeout=1) {}
+
+function memcache_add_server () {}
+
+function memcache_set_server_params () {}
+
+function memcache_set_failure_callback () {}
+
+function memcache_get_server_status () {}
+
+function memcache_get_version () {}
+
+function memcache_add () {}
+
+function memcache_set () {}
+
+function memcache_replace () {}
+
+function memcache_cas () {}
+
+function memcache_append () {}
+
+function memcache_prepend () {}
+
+function memcache_get () {}
+
+function memcache_delete () {}
+
+/**
+ * (PECL memcache &gt;= 0.2.0)<br/>
+ * Turn debug output on/off
+ * @link https://php.net/manual/en/function.memcache-debug.php
+ * @param bool $on_off <p>
+ * Turns debug output on if equals to <b>TRUE</b>.
+ * Turns debug output off if equals to <b>FALSE</b>.
+ * </p>
+ * @return bool <b>TRUE</b> if PHP was built with --enable-debug option, otherwise
+ * returns <b>FALSE</b>.
+ */
+function memcache_debug ($on_off) {}
+
+function memcache_get_stats () {}
+
+function memcache_get_extended_stats () {}
+
+function memcache_set_compress_threshold () {}
+
+function memcache_increment () {}
+
+function memcache_decrement () {}
+
+function memcache_close () {}
+
+function memcache_flush () {}
+
+define ('MEMCACHE_COMPRESSED', 2);
+define ('MEMCACHE_USER1', 65536);
+define ('MEMCACHE_USER2', 131072);
+define ('MEMCACHE_USER3', 262144);
+define ('MEMCACHE_USER4', 524288);
+define ('MEMCACHE_HAVE_SESSION', 1);
+
+// End of memcache v.3.0.8
+?>
diff --git a/.phan/internal_stubs/memcached.phan_php b/.phan/internal_stubs/memcached.phan_php
new file mode 100644
index 0000000000..f734bcbe59
--- /dev/null
+++ b/.phan/internal_stubs/memcached.phan_php
@@ -0,0 +1,1308 @@
+<?php
+
+// Start of memcached v.3.0.4
+
+/**
+ * Represents a connection to a set of memcached servers.
+ * @link https://php.net/manual/en/class.memcached.php
+ */
+class Memcached  {
+
+	/**
+	 * <p>Enables or disables payload compression. When enabled,
+	 * item values longer than a certain threshold (currently 100 bytes) will be
+	 * compressed during storage and decompressed during retrieval
+	 * transparently.</p>
+	 * <p>Type: boolean, default: <b>TRUE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_COMPRESSION = -1001;
+	const OPT_COMPRESSION_TYPE = -1004;
+
+	/**
+	 * <p>This can be used to create a "domain" for your item keys. The value
+	 * specified here will be prefixed to each of the keys. It cannot be
+	 * longer than 128 characters and will reduce the
+	 * maximum available key size. The prefix is applied only to the item keys,
+	 * not to the server keys.</p>
+	 * <p>Type: string, default: "".</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_PREFIX_KEY = -1002;
+
+	/**
+	 * <p>
+	 * Specifies the serializer to use for serializing non-scalar values.
+	 * The valid serializers are <b>Memcached::SERIALIZER_PHP</b>
+	 * or <b>Memcached::SERIALIZER_IGBINARY</b>. The latter is
+	 * supported only when memcached is configured with
+	 * --enable-memcached-igbinary option and the
+	 * igbinary extension is loaded.
+	 * </p>
+	 * <p>Type: integer, default: <b>Memcached::SERIALIZER_PHP</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_SERIALIZER = -1003;
+
+	/**
+	 * <p>Indicates whether igbinary serializer support is available.</p>
+	 * <p>Type: boolean.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HAVE_IGBINARY = 0;
+
+	/**
+	 * <p>Indicates whether JSON serializer support is available.</p>
+	 * <p>Type: boolean.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HAVE_JSON = 0;
+	const HAVE_SESSION = 1;
+	const HAVE_SASL = 0;
+
+	/**
+	 * <p>Specifies the hashing algorithm used for the item keys. The valid
+	 * values are supplied via <b>Memcached::HASH_*</b> constants.
+	 * Each hash algorithm has its advantages and its disadvantages. Go with the
+	 * default if you don't know or don't care.</p>
+	 * <p>Type: integer, default: <b>Memcached::HASH_DEFAULT</b></p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_HASH = 2;
+
+	/**
+	 * <p>The default (Jenkins one-at-a-time) item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_DEFAULT = 0;
+
+	/**
+	 * <p>MD5 item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_MD5 = 1;
+
+	/**
+	 * <p>CRC item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_CRC = 2;
+
+	/**
+	 * <p>FNV1_64 item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_FNV1_64 = 3;
+
+	/**
+	 * <p>FNV1_64A item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_FNV1A_64 = 4;
+
+	/**
+	 * <p>FNV1_32 item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_FNV1_32 = 5;
+
+	/**
+	 * <p>FNV1_32A item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_FNV1A_32 = 6;
+
+	/**
+	 * <p>Hsieh item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_HSIEH = 7;
+
+	/**
+	 * <p>Murmur item key hashing algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const HASH_MURMUR = 8;
+
+	/**
+	 * <p>Specifies the method of distributing item keys to the servers.
+	 * Currently supported methods are modulo and consistent hashing. Consistent
+	 * hashing delivers better distribution and allows servers to be added to
+	 * the cluster with minimal cache losses.</p>
+	 * <p>Type: integer, default: <b>Memcached::DISTRIBUTION_MODULA.</b></p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_DISTRIBUTION = 9;
+
+	/**
+	 * <p>Modulo-based key distribution algorithm.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const DISTRIBUTION_MODULA = 0;
+
+	/**
+	 * <p>Consistent hashing key distribution algorithm (based on libketama).</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const DISTRIBUTION_CONSISTENT = 1;
+	const DISTRIBUTION_VIRTUAL_BUCKET = 6;
+
+	/**
+	 * <p>Enables or disables compatibility with libketama-like behavior. When
+	 * enabled, the item key hashing algorithm is set to MD5 and distribution is
+	 * set to be weighted consistent hashing distribution. This is useful
+	 * because other libketama-based clients (Python, Ruby, etc.) with the same
+	 * server configuration will be able to access the keys transparently.
+	 * </p>
+	 * <p>
+	 * It is highly recommended to enable this option if you want to use
+	 * consistent hashing, and it may be enabled by default in future
+	 * releases.
+	 * </p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_LIBKETAMA_COMPATIBLE = 16;
+	const OPT_LIBKETAMA_HASH = 17;
+	const OPT_TCP_KEEPALIVE = 32;
+
+	/**
+	 * <p>Enables or disables buffered I/O. Enabling buffered I/O causes
+	 * storage commands to "buffer" instead of being sent. Any action that
+	 * retrieves data causes this buffer to be sent to the remote connection.
+	 * Quitting the connection or closing down the connection will also cause
+	 * the buffered data to be pushed to the remote connection.</p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_BUFFER_WRITES = 10;
+
+	/**
+	 * <p>Enable the use of the binary protocol. Please note that you cannot
+	 * toggle this option on an open connection.</p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_BINARY_PROTOCOL = 18;
+
+	/**
+	 * <p>Enables or disables asynchronous I/O. This is the fastest transport
+	 * available for storage functions.</p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_NO_BLOCK = 0;
+
+	/**
+	 * <p>Enables or disables the no-delay feature for connecting sockets (may
+	 * be faster in some environments).</p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_TCP_NODELAY = 1;
+
+	/**
+	 * <p>The maximum socket send buffer in bytes.</p>
+	 * <p>Type: integer, default: varies by platform/kernel
+	 * configuration.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_SOCKET_SEND_SIZE = 4;
+
+	/**
+	 * <p>The maximum socket receive buffer in bytes.</p>
+	 * <p>Type: integer, default: varies by platform/kernel
+	 * configuration.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_SOCKET_RECV_SIZE = 5;
+
+	/**
+	 * <p>In non-blocking mode this set the value of the timeout during socket
+	 * connection, in milliseconds.</p>
+	 * <p>Type: integer, default: 1000.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_CONNECT_TIMEOUT = 14;
+
+	/**
+	 * <p>The amount of time, in seconds, to wait until retrying a failed
+	 * connection attempt.</p>
+	 * <p>Type: integer, default: 0.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_RETRY_TIMEOUT = 15;
+
+	/**
+	 * <p>Socket sending timeout, in microseconds. In cases where you cannot
+	 * use non-blocking I/O this will allow you to still have timeouts on the
+	 * sending of data.</p>
+	 * <p>Type: integer, default: 0.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_SEND_TIMEOUT = 19;
+
+	/**
+	 * <p>Socket reading timeout, in microseconds. In cases where you cannot
+	 * use non-blocking I/O this will allow you to still have timeouts on the
+	 * reading of data.</p>
+	 * <p>Type: integer, default: 0.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_RECV_TIMEOUT = 20;
+
+	/**
+	 * <p>Timeout for connection polling, in milliseconds.</p>
+	 * <p>Type: integer, default: 1000.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_POLL_TIMEOUT = 8;
+
+	/**
+	 * <p>Enables or disables caching of DNS lookups.</p>
+	 * <p>Type: boolean, default: <b>FALSE</b>.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_CACHE_LOOKUPS = 6;
+
+	/**
+	 * <p>Specifies the failure limit for server connection attempts. The
+	 * server will be removed after this many continuous connection
+	 * failures.</p>
+	 * <p>Type: integer, default: 0.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const OPT_SERVER_FAILURE_LIMIT = 21;
+	const OPT_AUTO_EJECT_HOSTS = 28;
+	const OPT_HASH_WITH_PREFIX_KEY = 25;
+	const OPT_NOREPLY = 26;
+	const OPT_SORT_HOSTS = 12;
+	const OPT_VERIFY_KEY = 13;
+	const OPT_USE_UDP = 27;
+	const OPT_NUMBER_OF_REPLICAS = 29;
+	const OPT_RANDOMIZE_REPLICA_READ = 30;
+	const OPT_CORK = 31;
+	const OPT_REMOVE_FAILED_SERVERS = 35;
+	const OPT_DEAD_TIMEOUT = 36;
+	const OPT_SERVER_TIMEOUT_LIMIT = 37;
+	const OPT_MAX = 38;
+	const OPT_IO_BYTES_WATERMARK = 23;
+	const OPT_IO_KEY_PREFETCH = 24;
+	const OPT_IO_MSG_WATERMARK = 22;
+	const OPT_LOAD_FROM_FILE = 34;
+	const OPT_SUPPORT_CAS = 7;
+	const OPT_TCP_KEEPIDLE = 33;
+	const OPT_USER_DATA = 11;
+
+
+	/**
+	 * <p>The operation was successful.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_SUCCESS = 0;
+
+	/**
+	 * <p>The operation failed in some fashion.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_FAILURE = 1;
+
+	/**
+	 * <p>DNS lookup failed.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_HOST_LOOKUP_FAILURE = 2;
+
+	/**
+	 * <p>Failed to read network data.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_UNKNOWN_READ_FAILURE = 7;
+
+	/**
+	 * <p>Bad command in memcached protocol.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_PROTOCOL_ERROR = 8;
+
+	/**
+	 * <p>Error on the client side.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_CLIENT_ERROR = 9;
+
+	/**
+	 * <p>Error on the server side.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_SERVER_ERROR = 10;
+
+	/**
+	 * <p>Failed to write network data.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_WRITE_FAILURE = 5;
+
+	/**
+	 * <p>Failed to do compare-and-swap: item you are trying to store has been
+	 * modified since you last fetched it.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_DATA_EXISTS = 12;
+
+	/**
+	 * <p>Item was not stored: but not because of an error. This normally
+	 * means that either the condition for an "add" or a "replace" command
+	 * wasn't met, or that the item is in a delete queue.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_NOTSTORED = 14;
+
+	/**
+	 * <p>Item with this key was not found (with "get" operation or "cas"
+	 * operations).</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_NOTFOUND = 16;
+
+	/**
+	 * <p>Partial network data read error.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_PARTIAL_READ = 18;
+
+	/**
+	 * <p>Some errors occurred during multi-get.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_SOME_ERRORS = 19;
+
+	/**
+	 * <p>Server list is empty.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_NO_SERVERS = 20;
+
+	/**
+	 * <p>End of result set.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_END = 21;
+
+	/**
+	 * <p>System error.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_ERRNO = 26;
+
+	/**
+	 * <p>The operation was buffered.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_BUFFERED = 32;
+
+	/**
+	 * <p>The operation timed out.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_TIMEOUT = 31;
+
+	/**
+	 * <p>Bad key.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_BAD_KEY_PROVIDED = 33;
+	const RES_STORED = 15;
+	const RES_DELETED = 22;
+	const RES_STAT = 24;
+	const RES_ITEM = 25;
+	const RES_NOT_SUPPORTED = 28;
+	const RES_FETCH_NOTFINISHED = 30;
+	const RES_SERVER_MARKED_DEAD = 35;
+	const RES_UNKNOWN_STAT_KEY = 36;
+	const RES_INVALID_HOST_PROTOCOL = 34;
+	const RES_MEMORY_ALLOCATION_FAILURE = 17;
+	const RES_E2BIG = 37;
+	const RES_KEY_TOO_BIG = 39;
+	const RES_SERVER_TEMPORARILY_DISABLED = 47;
+	const RES_SERVER_MEMORY_ALLOCATION_FAILURE = 48;
+	const RES_AUTH_PROBLEM = 40;
+	const RES_AUTH_FAILURE = 41;
+	const RES_AUTH_CONTINUE = 42;
+	const RES_CONNECTION_FAILURE = 3;
+	const RES_CONNECTION_BIND_FAILURE = 4;
+	const RES_READ_FAILURE = 6;
+	const RES_DATA_DOES_NOT_EXIST = 13;
+	const RES_VALUE = 23;
+	const RES_FAIL_UNIX_SOCKET = 27;
+	const RES_NO_KEY_PROVIDED = 29;
+	const RES_INVALID_ARGUMENTS = 38;
+	const RES_PARSE_ERROR = 43;
+	const RES_PARSE_USER_ERROR = 44;
+	const RES_DEPRECATED = 45;
+	const RES_IN_PROGRESS = 46;
+	const RES_MAXIMUM_RETURN = 49;
+
+
+
+	/**
+	 * <p>Failed to create network socket.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_CONNECTION_SOCKET_CREATE_FAILURE = 11;
+
+	/**
+	 * <p>Payload failure: could not compress/decompress or serialize/unserialize the value.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const RES_PAYLOAD_FAILURE = -1001;
+
+	/**
+	 * <p>The default PHP serializer.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const SERIALIZER_PHP = 1;
+
+	/**
+	 * <p>The igbinary serializer.
+	 * Instead of textual representation it stores PHP data structures in a
+	 * compact binary form, resulting in space and time gains.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const SERIALIZER_IGBINARY = 2;
+
+	/**
+	 * <p>The JSON serializer. Requires PHP 5.2.10+.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const SERIALIZER_JSON = 3;
+	const SERIALIZER_JSON_ARRAY = 4;
+	const COMPRESSION_FASTLZ = 2;
+	const COMPRESSION_ZLIB = 1;
+
+	/**
+	 * <p>A flag for <b>Memcached::getMulti</b> and
+	 * <b>Memcached::getMultiByKey</b> to ensure that the keys are
+	 * returned in the same order as they were requested in. Non-existing keys
+	 * get a default value of NULL.</p>
+	 * @link https://php.net/manual/en/memcached.constants.php
+	 */
+	const GET_PRESERVE_ORDER = 1;
+	const GET_ERROR_RETURN_VALUE = false;
+
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Create a Memcached instance
+	 * @link https://php.net/manual/en/memcached.construct.php
+	 * @param $persistent_id [optional]
+	 * @param $callback [optional]
+	 */
+	public function __construct ($persistent_id = '', $on_new_object_cb = null) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Return the result code of the last operation
+	 * @link https://php.net/manual/en/memcached.getresultcode.php
+	 * @return int Result code of the last Memcached operation.
+	 */
+	public function getResultCode () {}
+
+	/**
+	 * (PECL memcached &gt;= 1.0.0)<br/>
+	 * Return the message describing the result of the last operation
+	 * @link https://php.net/manual/en/memcached.getresultmessage.php
+	 * @return string Message describing the result of the last Memcached operation.
+	 */
+	public function getResultMessage () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Retrieve an item
+	 * @link https://php.net/manual/en/memcached.get.php
+	 * @param string $key <p>
+	 * The key of the item to retrieve.
+	 * </p>
+	 * @param callable $cache_cb [optional] <p>
+	 * Read-through caching callback or <b>NULL</b>.
+	 * </p>
+	 * @param int $flags [optional] <p>
+	 * The flags for the get operation.
+	 * </p>
+	 * @return mixed the value stored in the cache or <b>FALSE</b> otherwise.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function get ($key, callable $cache_cb = null, $flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Retrieve an item from a specific server
+	 * @link https://php.net/manual/en/memcached.getbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key of the item to fetch.
+	 * </p>
+	 * @param callable $cache_cb [optional] <p>
+	 * Read-through caching callback or <b>NULL</b>
+	 * </p>
+	 * @param int $flags [optional] <p>
+	 * The flags for the get operation.
+	 * </p>
+	 * @return mixed the value stored in the cache or <b>FALSE</b> otherwise.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function getByKey ($server_key, $key, callable $cache_cb = null, $flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Retrieve multiple items
+	 * @link https://php.net/manual/en/memcached.getmulti.php
+	 * @param array $keys <p>
+	 * Array of keys to retrieve.
+	 * </p>
+	 * @param int $flags [optional] <p>
+	 * The flags for the get operation.
+	 * </p>
+	 * @return mixed the array of found items or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function getMulti (array $keys, $flags = null) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Retrieve multiple items from a specific server
+	 * @link https://php.net/manual/en/memcached.getmultibykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param array $keys <p>
+	 * Array of keys to retrieve.
+	 * </p>
+	 * @param int $flags [optional] <p>
+	 * The flags for the get operation.
+	 * </p>
+	 * @return array|false the array of found items or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function getMultiByKey ($server_key, array $keys, $flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Request multiple items
+	 * @link https://php.net/manual/en/memcached.getdelayed.php
+	 * @param array $keys <p>
+	 * Array of keys to request.
+	 * </p>
+	 * @param bool $with_cas [optional] <p>
+	 * Whether to request CAS token values also.
+	 * </p>
+	 * @param callable $value_cb [optional] <p>
+	 * The result callback or <b>NULL</b>.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function getDelayed (array $keys, $with_cas = null, callable $value_cb = null) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Request multiple items from a specific server
+	 * @link https://php.net/manual/en/memcached.getdelayedbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param array $keys <p>
+	 * Array of keys to request.
+	 * </p>
+	 * @param bool $with_cas [optional] <p>
+	 * Whether to request CAS token values also.
+	 * </p>
+	 * @param callable $value_cb [optional] <p>
+	 * The result callback or <b>NULL</b>.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function getDelayedByKey ($server_key, array $keys, $with_cas = null, callable $value_cb = null) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Fetch the next result
+	 * @link https://php.net/manual/en/memcached.fetch.php
+	 * @return array|false the next result or <b>FALSE</b> otherwise.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_END</b> if result set is exhausted.
+	 */
+	public function fetch () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Fetch all the remaining results
+	 * @link https://php.net/manual/en/memcached.fetchall.php
+	 * @return array|false the results or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function fetchAll () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Store an item
+	 * @link https://php.net/manual/en/memcached.set.php
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function set ($key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Store an item on a specific server
+	 * @link https://php.net/manual/en/memcached.setbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function setByKey ($server_key, $key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Set a new expiration on an item
+	 * @link https://php.net/manual/en/memcached.touch.php
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param int $expiration <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function touch ($key, $expiration = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Set a new expiration on an item on a specific server
+	 * @link https://php.net/manual/en/memcached.touchbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param int $expiration <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function touchByKey ($server_key, $key, $expiration) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Store multiple items
+	 * @link https://php.net/manual/en/memcached.setmulti.php
+	 * @param array $items <p>
+	 * An array of key/value pairs to store on the server.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function setMulti (array $items, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Store multiple items on a specific server
+	 * @link https://php.net/manual/en/memcached.setmultibykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param array $items <p>
+	 * An array of key/value pairs to store on the server.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function setMultiByKey ($server_key, array $items, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Compare and swap an item
+	 * @link https://php.net/manual/en/memcached.cas.php
+	 * @param float $cas_token <p>
+	 * Unique value associated with the existing item. Generated by memcache.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_DATA_EXISTS</b> if the item you are trying
+	 * to store has been modified since you last fetched it.
+	 */
+	public function cas ($cas_token, $key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Compare and swap an item on a specific server
+	 * @link https://php.net/manual/en/memcached.casbykey.php
+	 * @param float $cas_token <p>
+	 * Unique value associated with the existing item. Generated by memcache.
+	 * </p>
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_DATA_EXISTS</b> if the item you are trying
+	 * to store has been modified since you last fetched it.
+	 */
+	public function casByKey ($cas_token, $server_key, $key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Add an item under a new key
+	 * @link https://php.net/manual/en/memcached.add.php
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key already exists.
+	 */
+	public function add ($key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Add an item under a new key on a specific server
+	 * @link https://php.net/manual/en/memcached.addbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key already exists.
+	 */
+	public function addByKey ($server_key, $key, $value, $expiration = 0, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Append data to an existing item
+	 * @link https://php.net/manual/en/memcached.append.php
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param string $value <p>
+	 * The string to append.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function append ($key, $value) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Append data to an existing item on a specific server
+	 * @link https://php.net/manual/en/memcached.appendbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param string $value <p>
+	 * The string to append.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function appendByKey ($server_key, $key, $value) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Prepend data to an existing item
+	 * @link https://php.net/manual/en/memcached.prepend.php
+	 * @param string $key <p>
+	 * The key of the item to prepend the data to.
+	 * </p>
+	 * @param string $value <p>
+	 * The string to prepend.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function prepend ($key, $value) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Prepend data to an existing item on a specific server
+	 * @link https://php.net/manual/en/memcached.prependbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key of the item to prepend the data to.
+	 * </p>
+	 * @param string $value <p>
+	 * The string to prepend.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function prependByKey ($server_key, $key, $value) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Replace the item under an existing key
+	 * @link https://php.net/manual/en/memcached.replace.php
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function replace ($key, $value, $expiration = null, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Replace the item under an existing key on a specific server
+	 * @link https://php.net/manual/en/memcached.replacebykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key under which to store the value.
+	 * </p>
+	 * @param mixed $value <p>
+	 * The value to store.
+	 * </p>
+	 * @param int $expiration [optional] <p>
+	 * The expiration time, defaults to 0. See Expiration Times for more info.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTSTORED</b> if the key does not exist.
+	 */
+	public function replaceByKey ($server_key, $key, $value, $expiration = null, $udf_flags = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Delete an item
+	 * @link https://php.net/manual/en/memcached.delete.php
+	 * @param string $key <p>
+	 * The key to be deleted.
+	 * </p>
+	 * @param int $time [optional] <p>
+	 * The amount of time the server will wait to delete the item.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function delete ($key, $time = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Delete multiple items
+	 * @link https://php.net/manual/en/memcached.deletemulti.php
+	 * @param array $keys <p>
+	 * The keys to be deleted.
+	 * </p>
+	 * @param int $time [optional] <p>
+	 * The amount of time the server will wait to delete the items.
+	 * </p>
+	 * @return array Returns array indexed by keys and where values are indicating whether operation succeeded or not.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function deleteMulti (array $keys, $time = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Delete an item from a specific server
+	 * @link https://php.net/manual/en/memcached.deletebykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key to be deleted.
+	 * </p>
+	 * @param int $time [optional] <p>
+	 * The amount of time the server will wait to delete the item.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function deleteByKey ($server_key, $key, $time = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Delete multiple items from a specific server
+	 * @link https://php.net/manual/en/memcached.deletemultibykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param array $keys <p>
+	 * The keys to be deleted.
+	 * </p>
+	 * @param int $time [optional] <p>
+	 * The amount of time the server will wait to delete the items.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * The <b>Memcached::getResultCode</b> will return
+	 * <b>Memcached::RES_NOTFOUND</b> if the key does not exist.
+	 */
+	public function deleteMultiByKey ($server_key, array $keys, $time = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Increment numeric item's value
+	 * @link https://php.net/manual/en/memcached.increment.php
+	 * @param string $key <p>
+	 * The key of the item to increment.
+	 * </p>
+	 * @param int $offset [optional] <p>
+	 * The amount by which to increment the item's value.
+	 * </p>
+	 * @param int $initial_value [optional] <p>
+	 * The value to set the item to if it doesn't currently exist.
+	 * </p>
+	 * @param int $expiry [optional] <p>
+	 * The expiry time to set on the item.
+	 * </p>
+	 * @return int|false new item's value on success or <b>FALSE</b> on failure.
+	 */
+	public function increment ($key, $offset = 1, $initial_value = 0, $expiry = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Decrement numeric item's value
+	 * @link https://php.net/manual/en/memcached.decrement.php
+	 * @param string $key <p>
+	 * The key of the item to decrement.
+	 * </p>
+	 * @param int $offset [optional] <p>
+	 * The amount by which to decrement the item's value.
+	 * </p>
+	 * @param int $initial_value [optional] <p>
+	 * The value to set the item to if it doesn't currently exist.
+	 * </p>
+	 * @param int $expiry [optional] <p>
+	 * The expiry time to set on the item.
+	 * </p>
+	 * @return int|false item's new value on success or <b>FALSE</b> on failure.
+	 */
+	public function decrement ($key, $offset = 1, $initial_value = 0, $expiry = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Increment numeric item's value, stored on a specific server
+	 * @link https://php.net/manual/en/memcached.incrementbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key of the item to increment.
+	 * </p>
+	 * @param int $offset [optional] <p>
+	 * The amount by which to increment the item's value.
+	 * </p>
+	 * @param int $initial_value [optional] <p>
+	 * The value to set the item to if it doesn't currently exist.
+	 * </p>
+	 * @param int $expiry [optional] <p>
+	 * The expiry time to set on the item.
+	 * </p>
+	 * @return int|false new item's value on success or <b>FALSE</b> on failure.
+	 */
+	public function incrementByKey ($server_key, $key, $offset = 1, $initial_value = 0, $expiry = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Decrement numeric item's value, stored on a specific server
+	 * @link https://php.net/manual/en/memcached.decrementbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @param string $key <p>
+	 * The key of the item to decrement.
+	 * </p>
+	 * @param int $offset [optional] <p>
+	 * The amount by which to decrement the item's value.
+	 * </p>
+	 * @param int $initial_value [optional] <p>
+	 * The value to set the item to if it doesn't currently exist.
+	 * </p>
+	 * @param int $expiry [optional] <p>
+	 * The expiry time to set on the item.
+	 * </p>
+	 * @return int|false item's new value on success or <b>FALSE</b> on failure.
+	 */
+	public function decrementByKey ($server_key, $key, $offset = 1, $initial_value = 0, $expiry = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Add a server to the server pool
+	 * @link https://php.net/manual/en/memcached.addserver.php
+	 * @param string $host <p>
+	 * The hostname of the memcache server. If the hostname is invalid, data-related
+	 * operations will set
+	 * <b>Memcached::RES_HOST_LOOKUP_FAILURE</b> result code.
+	 * </p>
+	 * @param int $port <p>
+	 * The port on which memcache is running. Usually, this is
+	 * 11211.
+	 * </p>
+	 * @param int $weight [optional] <p>
+	 * The weight of the server relative to the total weight of all the
+	 * servers in the pool. This controls the probability of the server being
+	 * selected for operations. This is used only with consistent distribution
+	 * option and usually corresponds to the amount of memory available to
+	 * memcache on that server.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function addServer ($host, $port, $weight = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.1)<br/>
+	 * Add multiple servers to the server pool
+	 * @link https://php.net/manual/en/memcached.addservers.php
+	 * @param array $servers
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function addServers (array $servers) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Get the list of the servers in the pool
+	 * @link https://php.net/manual/en/memcached.getserverlist.php
+	 * @return array The list of all servers in the server pool.
+	 */
+	public function getServerList () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Map a key to a server
+	 * @link https://php.net/manual/en/memcached.getserverbykey.php
+	 * @param string $server_key <p>
+	 * The key identifying the server to store the value on or retrieve it from. Instead of hashing on the actual key for the item, we hash on the server key when deciding which memcached server to talk to. This allows related items to be grouped together on a single server for efficiency with multi operations.
+	 * </p>
+	 * @return array an array containing three keys of host,
+	 * port, and weight on success or <b>FALSE</b>
+	 * on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function getServerByKey ($server_key) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Clears all servers from the server list
+	 * @link https://php.net/manual/en/memcached.resetserverlist.php
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function resetServerList () {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Close any open connections
+	 * @link https://php.net/manual/en/memcached.quit.php
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function quit () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Get server pool statistics
+	 * @link https://php.net/manual/en/memcached.getstats.php
+	 * @param string $type
+	 * @return array Array of server statistics, one entry per server.
+	 */
+	public function getStats ($type = null) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.5)<br/>
+	 * Get server pool version info
+	 * @link https://php.net/manual/en/memcached.getversion.php
+	 * @return array Array of server versions, one entry per server.
+	 */
+	public function getVersion () {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Gets the keys stored on all the servers
+	 * @link https://php.net/manual/en/memcached.getallkeys.php
+	 * @return array|false the keys stored on all the servers on success or <b>FALSE</b> on failure.
+	 */
+	public function getAllKeys () {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Invalidate all items in the cache
+	 * @link https://php.net/manual/en/memcached.flush.php
+	 * @param int $delay [optional] <p>
+	 * Numer of seconds to wait before invalidating the items.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 * Use <b>Memcached::getResultCode</b> if necessary.
+	 */
+	public function flush ($delay = 0) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Retrieve a Memcached option value
+	 * @link https://php.net/manual/en/memcached.getoption.php
+	 * @param int $option <p>
+	 * One of the Memcached::OPT_* constants.
+	 * </p>
+	 * @return mixed the value of the requested option, or <b>FALSE</b> on
+	 * error.
+	 */
+	public function getOption ($option) {}
+
+	/**
+	 * (PECL memcached &gt;= 0.1.0)<br/>
+	 * Set a Memcached option
+	 * @link https://php.net/manual/en/memcached.setoption.php
+	 * @param int $option
+	 * @param mixed $value
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function setOption ($option, $value) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Set Memcached options
+	 * @link https://php.net/manual/en/memcached.setoptions.php
+	 * @param array $options <p>
+	 * An associative array of options where the key is the option to set and
+	 * the value is the new value for the option.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function setOptions (array $options) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Set the credentials to use for authentication
+	 * @link https://secure.php.net/manual/en/memcached.setsaslauthdata.php
+	 * @param string $username <p>
+	 * The username to use for authentication.
+	 * </p>
+	 * @param string $password <p>
+	 * The password to use for authentication.
+	 * </p>
+	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+	 */
+	public function setSaslAuthData (string $username , string $password) {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Check if a persitent connection to memcache is being used
+	 * @link https://php.net/manual/en/memcached.ispersistent.php
+	 * @return bool true if Memcache instance uses a persistent connection, false otherwise.
+	 */
+	public function isPersistent () {}
+
+	/**
+	 * (PECL memcached &gt;= 2.0.0)<br/>
+	 * Check if the instance was recently created
+	 * @link https://php.net/manual/en/memcached.ispristine.php
+	 * @return bool the true if instance is recently created, false otherwise.
+	 */
+	public function isPristine () {}
+
+	public function flushBuffers () {}
+
+	public function setEncodingKey ( $key ) {}
+
+	public function getLastDisconnectedServer () {}
+
+	public function getLastErrorErrno () {}
+
+	public function getLastErrorCode () {}
+
+	public function getLastErrorMessage () {}
+
+	public function setBucket (array $host_map, array $forward_map, $replicas) {}
+
+}
+
+/**
+ * @link https://php.net/manual/en/class.memcachedexception.php
+ */
+class MemcachedException extends RuntimeException  {
+
+}
+// End of memcached v.3.0.4
+?>
diff --git a/.travis.yml b/.travis.yml
index ed54c47a1c..e7bc556453 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,9 @@ php:
   - '7.1'
   - '7.2'
   - '7.3'
+  - '7.4'
 branches:
   only:
-    - develop
-    - master
     - build_test
 notifications:
   email:
@@ -45,10 +44,11 @@ before_install:
   - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
         composer install --dev --prefer-dist;
     fi
-  - if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "7.1" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
-        export TRAVIS_TAG=$(curl --fail --user "${GH_API_USER}" -s https://api.github.com/repos/getgrav/grav/releases/latest | grep tag_name | head -n 1 | cut -d '"' -f 4);
-        eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.8 bash)";
-        go get github.com/aktau/github-release;
+  - |
+    if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "7.1" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
+        export TRAVIS_TAG=$(curl -H "Authorization: token ${GH_TOKEN}" --fail -s https://api.github.com/repos/getgrav/grav/releases/latest | grep tag_name | head -n 1 | cut -d '"' -f 4);
+        eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.13 bash)";
+        go get github.com/github-release/github-release;
         git clone --quiet --depth=50 --branch=master https://${BB_TOKEN}bitbucket.org/rockettheme/grav-devtools.git $RT_DEVTOOLS  &>/dev/null;
         if [ ! -z "$TRAVIS_TAG" ]; then
             cd ${RT_DEVTOOLS};
@@ -56,7 +56,7 @@ before_install:
         fi;
     fi
 before_script:
-    - if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-rm xdebug.ini; fi
+  - phpenv config-rm xdebug.ini
 script:
   - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
         vendor/bin/codecept run;
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a416b50299..461acadc18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,1381 @@
+# v1.7.37.1
+## 10/05/2022
+
+1. [](#bugfix)
+    * Fixed a bad return type [#3630](https://github.com/getgrav/grav/issues/3630)
+
+# v1.7.37
+## 10/05/2022
+
+1. [](#new)
+    * Added new `onPageHeaders()` event to allow for header modification as needed
+    * Added a `system.pages.dirs` configuration option to allow for configurable paths, and multiple page paths
+    * Added new `Pages::getSimplePagesHash` which is useful for caching pages specific data
+    * Updated to latest vendor libraries
+1. [](#bugfix)
+    * An attempt to workaround windows reading locked file issue [getgrav/grav-plugin-admin#2299](https://github.com/getgrav/grav-plugin-admin/issues/2299)
+    * Force user index file to be updated to fix email addresses [getgrav/grav-plugin-login#229](https://github.com/getgrav/grav-plugin-login/issues/229)
+
+# v1.7.36
+## 09/08/2022
+
+1. [](#new)
+    * Added `authorize-*@:` support for Flex blueprints, e.g. `authorize-disabled@: not delete` disables the field if user does not have access to delete object
+    * Added support for `flex-ignore@` to hide all the nested fields in the blueprint
+1. [](#bugfix)
+    * Fixed login with a capitalised email address when using old users [getgrav/grav-plugin-login#229](https://github.com/getgrav/grav-plugin-login/issues/229)
+
+# v1.7.35
+## 08/04/2022
+
+1. [](#new)
+   * Added support for `multipart/form-data` content type in PUT and PATCH requests
+   * Added support for object relationships
+   * Added variables `$environment` (string), `$request` (PSR-7 ServerRequestInterface|null) and `$uri` (PSR-7 Uri|null) to be used in `setup.php`
+1. [](#improved)
+   * Minor vendor updates
+
+# v1.7.34
+## 06/14/2022
+
+1. [](#new)
+    * Added back Yiddish to Language Codes [#3336](https://github.com/getgrav/grav/pull/3336)
+    * Ignore upcoming `media.json` file in media
+1. [](#bugfix)
+    * Regression: Fixed saving page with a new language causing cache corruption [getgrav/grav-plugin-admin#2282](https://github.com/getgrav/grav-plugin-admin/issues/2282)
+    * Fixed a potential fatal error when using watermark in images
+    * Fixed `bin/grav install` command with arbitrary destination folder name
+    * Fixed Twig `|filter()` allowing code execution
+    * Fixed login and user search by email not being case-insensitive when using Flex Users
+
+# v1.7.33
+## 04/25/2022
+
+1. [](#improved)
+    * When saving yaml and markdown, create also a cached version of the file and recompile it in opcache
+2. [](#bugfix)
+    * Fixed missing changes in **yaml** & **markdown** files if saved multiple times during the same second because of a caching issue
+    * Fixed XSS check not detecting onX events without quotes
+    * Fixed default collection ordering in pages admin
+
+# v1.7.32
+## 03/28/2022
+
+1. [](#new)
+    * Added `|replace_last(search, replace)` filter
+    * Added `parseurl` Twig function to expose PHP's `parse_url` function
+2. [](#improved)
+    * Added multi-language support for page routes in `Utils::url()`
+    * Set default maximum length for text fields
+      - `password`: 256
+      - `email`: 320
+      - `text`, `url`, `hidden`, `commalist`: 2048
+      - `text` (multiline), `textarea`: 65536
+3. [](#bugfix)
+   * Fixed issue with `system.cache.gzip: true` resulted in "Fetch Failed" for PHP 8.0.17 and PHP 8.1.4 [PHP issue #8218](https://github.com/php/php-src/issues/8218)
+   * Fix for multi-lang issues with Security Report
+   * Fixed page search not working with selected language [#3316](https://github.com/getgrav/grav/issues/3316)
+
+# v1.7.31
+## 03/14/2022
+
+1. [](#new)
+   * Added new local Multiavatar (local generation). **This will be default in Grav 1.8**
+   * Added support to get image size for SVG vector images [#3533](https://github.com/getgrav/grav/pull/3533)
+   * Added XSS check for uploaded SVG files before they get stored
+   * Fixed phpstan issues (All level 2, Framework level 5)
+2. [](#improved)
+   * Moved Accounts out of Experimental section of System configuration to new "Accounts" tab
+3. [](#bugfix)
+   * Fixed `'mbstring' extension is not loaded` error, use Polyfill instead [#3504](https://github.com/getgrav/grav/pull/3504)
+   * Fixed new `Utils::pathinfo()` and `Utils::basename()` being too strict for legacy use [#3542](https://github.com/getgrav/grav/issues/3542)
+   * Fixed non-standard video html atributes generated by `{{ media.html() }}` [#3540](https://github.com/getgrav/grav/issues/3540)
+   * Fixed entity sanitization for XSS detection
+   * Fixed avatar save location when `account://` stream points to custom directory
+   * Fixed bug in `Utils::url()` when path contains part of root
+
+# v1.7.30
+## 02/07/2022
+
+1. [](#new)
+    * Added twig filter `|field_parent` to get parent field name
+2. [](#bugfix)
+    * Fixed error while deleting retina image in admin
+    * Fixed "Page Authors" field in Security tab, wrongly loading and saving the value [#3525](https://github.com/getgrav/grav/issues/3525)
+    * Fixed accounts filter only matches against email address [getgrav/grav-plugin-admin#2224](https://github.com/getgrav/grav-plugin-admin/issues/2224)
+
+# v1.7.29.1
+## 01/31/2022
+
+1. [](#bugfix)
+    * Fixed `Call to undefined method` error when upgrading from Grav 1.6 [#3523](https://github.com/getgrav/grav/issues/3523)
+
+# v1.7.29
+## 01/28/2022
+
+1. [](#new)
+    * Added support for registering assets from `HtmlBlock`
+    * Added unicode-safe `Utils::basename()` and `Utils::pathinfo()` methods
+2. [](#improved)
+    * Improved `Filesystem::basename()` and `Filesystem::pathinfo()` to be unicode-safe
+    * Made path handling unicode-safe, use new `Utils::basename()` and `Utils::pathinfo()` everywhere
+3. [](#bugfix)
+    * Fixed error on thumbnail image creation
+    * Fixed MimeType for `gzip` (`application/x-gzip`)
+
+# v1.7.28
+## 01/24/2022
+
+1. [](#new)
+    * Added links and modules support to `HtmlBlock` class
+    * Added module support for twig script tag: `{% script module 'theme://js/module.mjs' %}`
+    * Added twig tag for links: `{% link icon 'theme://images/favicon.png' priority: 20 with { type: 'image/png' } %}`
+    * Added `HtmlBlock` support for `{% style %}`, `{% script %}` and `{% link %}` tags
+    * Support for page-level `redirect_default_route` frontmatter header override
+3. [](#bugfix)
+    * Fixed XSS check not detecting escaped `&#58`
+
+# v1.7.27.1
+## 01/12/2022
+
+3. [](#bugfix)
+   * Fixed a typo in CSS Asset pipeline that was erroneously joining files with `;`
+
+# v1.7.27
+## 01/12/2022
+
+1. [](#new)
+   * Support for `YubiKey OTP` 2-Factor authenticator
+   * Added support for generic `assets.link()` for external references. No pipeline support
+   * Added support for `assets.addJsModule()` with full pipeline support
+   * Added `Utils::getExtensionsByMime()` method to get all the registered extensions for the specific mime type
+   * Added `Media::getRoute()` and `Media::getRawRoute()` methods to get page route if available
+   * Added `Medium::getAlternatives()` to be able to list all the retina sizes
+2. [](#improved)
+   * Improved `Utils::download()` method to allow overrides on download name, mime and expires header
+   * Improved `onPageFallBackUrl` event
+   * Reorganized the Asset system configuration blueprint for clarity
+3. [](#bugfix)
+   * Fixed CLI `--env` and `--lang` options having no effect if they aren't added before all the other options
+   * Fixed scaled image medium filename when using non-existing retina file
+   * Fixed an issue with JS `imports` and pipelining Assets
+
+# v1.7.26.1
+## 01/04/2022
+
+3. [](#bugfix)
+   * Fixed `UserObject::getAccess()` after cloning the object
+
+# v1.7.26
+## 01/03/2022
+
+1. [](#new)
+    * Made `Grav::redirect()` to accept `Route` class
+    * Added `translated()` method to `PageTranslateInterface`
+    * Added second parameter to `UserObject::isMyself()` method
+    * Added `UserObject::$isAuthorizedCallable` to allow `$user->isAuthorized()` customization
+    * Use secure session cookies in HTTPS by default (`system.session.secure_https: true`)
+    * Added new `Plugin::inheritedConfigOption()` function to access plugin specific functions for page overrides
+2. [](#improved)
+   * Upgraded vendor libs for PHP 8.1 compatibility
+   * Upgraded to **composer v2.1.14** for PHP 8.1 compatibility
+   * Added third `$name` parameter to `Blueprint::flattenData()` method, useful for flattening repeating data
+   * `ControllerResponseTrait`: Redirect response should be json if the extension is .json
+   * When symlinking Grav install, include also tests
+   * Updated copyright year to `2022`
+3. [](#bugfix)
+   * Fixed bad key lookup in `FlexRelatedDirectoryTrait::getCollectionByProperty()`
+   * Fixed RequestHandlers `NotFoundException` having empty request
+   * Block `.json` files in web server configs
+   * Disabled pretty debug info for Flex as it slows down Twig rendering
+   * Fixed Twig being very slow when template overrides do not exist
+   * Fixed `UserObject::$authorizeCallable` binding to the user object
+   * Fixed `FlexIndex::call()` to return null instead of failing to call undefined method
+   * Fixed Flex directory configuration creating environment configuration when it should not
+
+# v1.7.25
+## 11/16/2021
+
+1. [](#new)
+    * Updated phpstan to v1.0
+    * Added `FlexObject::getDiff()` to see difference to the saved object
+2. [](#improved)
+    * Use Symfony `dump` instead of PHP's `vardump` in side the `{{ vardump(x) }}` Twig vardump function
+    * Added `route` and `request` to `onPagesInitialized` event
+    * Improved page cloning, added method `Page::initialize()`
+    * Improved `FlexObject::getChanges()`: return changed lists and arrays as whole instead of just changed keys/values
+    * Improved form validation JSON responses to contain list of failed fields with their error messages
+    * Improved redirects: send redirect response in JSON if the request was in JSON
+3. [](#bugfix)
+    * Fixed path traversal vulnerability when using `bin/grav server`
+    * Fixed unescaped error messages in JSON error responses
+    * Fixed `|t(variable)` twig filter in admin
+    * Fixed `FlexObject::getChanges()` always returning empty array
+    * Fixed form validation exceptions to use `400 Bad Request` instead of `500 Internal Server Error`
+
+# v1.7.24
+## 10/26/2021
+
+1. [](#new)
+    * Added support for image watermarks
+    * Added support to disable a form, making it readonly
+2. [](#improved)
+    * Flex `$user->authorize()` now checks user groups before `admin.super`, allowing deny rules to work properly
+3. [](#bugfix)
+    * Fixed a bug in `PermissionsReader` in PHP 7.3
+    * Fixed `session_store_active` language option (#3464)
+    * Fixed deprecated warnings on `ArrayAccess` in PHP 8.1
+    * Fixed XSS detection with `&colon;`
+
+# v1.7.23
+## 09/29/2021
+
+1. [](#new)
+    * Added method `Pages::referrerRoute()` to get the referrer route and language
+    * Added true unique `Utils::uniqueId()` / `{{ unique_id() }}` utilities  with length, prefix, and suffix support
+    * Added `UserObject::isMyself()` method to check if flex user is currently logged in
+    * Added support for custom form field options validation with `validate: options: key|ignore`
+2. [](#improved)
+   * Replaced GPL `SVG-Sanitizer` with MIT licensed `DOM-Sanitizer`
+   * `Uri::referrer()` now accepts third parameter, if set to `true`, it returns route without base or language code [#3411](https://github.com/getgrav/grav/issues/3411)
+   * Updated vendor libs with latest
+   * Updated with latest language strings via Crowdin.com
+3. [](#bugfix)
+    * Fixed `Folder::move()` throwing an error when target folder is changed by only appending characters to the end [#3445](https://github.com/getgrav/grav/issues/3445)
+    * Fixed some phpstan issues (all code back to level 1, Framework level 3)
+    * Fixed form reset causing image uploads to fail when using Flex
+
+# v1.7.22
+## 09/16/2021
+
+1. [](#new)
+    * Register plugin autoloaders into plugin objects
+2. [](#improved)
+    * Improve Twig 2 compatibility
+    * Update to customized version of Twig DeferredExtension (Twig 1/2 compatible)
+3. [](#bugfix)
+    * Fixed conflicting `$_original` variable in `Flex Pages`
+
+# v1.7.21
+## 09/14/2021
+
+1. [](#new)
+    * Added `|yaml` filter to convert input to YAML
+    * Added `route` and `request` to `onPageNotFound` event
+    * Added file upload/remove support for `Flex Forms`
+    * Added support for `flex-required@: not exists` and `flex-required@: '!exists'` in blueprints
+    * Added `$object->getOriginalData()` to get flex objects data before it was modified with `update()`
+    * Throwing exceptions from Twig templates fires `onDisplayErrorPage.[code]` event allowing better error pages
+2. [](#improved)
+    * Use a simplified text-based `cron` field for scheduler
+    * Add timestamp to logging output of scheduler jobs to see when they ran
+3. [](#bugfix)
+    * Fixed escaping in PageIndex::getLevelListing()
+    * Fixed validation of `number` type [#3433](https://github.com/getgrav/grav/issues/3433)
+    * Fixed excessive `security.yaml` file creation [#3432](https://github.com/getgrav/grav/issues/3432)
+    * Fixed incorrect port :0 with nginx unix socket setup [#3439](https://github.com/getgrav/grav/issues/3439)
+    * Fixed `Session::setFlashCookieObject()` to use the same options as the main session cookie
+
+# v1.7.20
+## 09/01/2021
+
+2. [](#improved)
+    * Added support for `task` and `action` inside JSON request body
+
+# v1.7.19
+## 08/31/2021
+
+1. [](#new)
+    * Include active form and request in `onPageTask` and `onPageAction` events (defaults to `null`)
+    * Added `UserObject::$authorizeCallable` to allow `$user->authorize()` customization
+2. [](#improved)
+    * Added meta support for `UploadedFile` class
+    * Added support for multiple mime-types per file extension [#3422](https://github.com/getgrav/grav/issues/3422)
+    * Added `setCurrent()` method to Page Collection [#3398](https://github.com/getgrav/grav/pull/3398)
+    * Initialize `$grav['uri']` before session
+3. [](#bugfix)
+    * Fixed `Warning: Undefined array key "SERVER_SOFTWARE" in index.php` [#3408](https://github.com/getgrav/grav/issues/3408)
+    * Fixed error in `loadDirectoryConfig()` if configuration hasn't been saved [#3409](https://github.com/getgrav/grav/issues/3409)
+    * Fixed GPM not using non-standard cache path [#3410](https://github.com/getgrav/grav/issues/3410)
+    * Fixed broken `environment://` stream when it doesn't have configuration
+    * Fixed `Flex Object` missing key field value when using `FolderStorage`
+    * Fixed broken Twig try tag when catch has not been defined or is empty
+    * Fixed `FlexForm` serialization
+    * Fixed form validation for numeric values in PHP 8
+    * Fixed `flex-options@` in blueprints duplicating items in array
+    * Fixed wrong form issue with flex objects after cache clear
+    * Fixed Flex object types not implementing `MediaInterface`
+    * Fixed issue with `svgImageFunction()` that was causing broken output
+
+# v1.7.18
+## 07/19/2021
+
+1. [](#improved)
+    * Added support for loading Flex Directory configuration from main configuration
+    * Move SVGs that cannot be sanitized to quarantine folder under `log://quarantine`
+    * Added support for CloudFlare-forwarded client IP in the `URI::ip()` method
+1. [](#bugfix)
+    * Fixed error when using Flex `SimpleStorage` with no entries
+    * Fixed page search to include slug field [#3316](https://github.com/getgrav/grav/issues/3316)
+    * Fixed Admin becoming unusable when GPM cannot be reached [#3383](https://github.com/getgrav/grav/issues/3383)
+    * Fixed `Failed to save entry: Forbidden` when moving a page to a visible page [#3389](https://github.com/getgrav/grav/issues/3389)
+    * Better support for Symfony local server on linux [#3400](https://github.com/getgrav/grav/pull/3400)
+    * Fixed `open_basedir()` error with some forms
+
+# v1.7.17
+## 06/15/2021
+
+1. [](#new)
+    * Interface `FlexDirectoryInterface` now extends `FlexAuthorizeInterface`
+1. [](#improved)
+    * Allow to unset an asset attribute by specifying null (ie, `'defer': null`)
+    * Support specifying custom attributes to assets in a collection [Read more](https://learn.getgrav.org/17/themes/asset-manager#collections-with-attributes?target=_blank) [#3358](https://github.com/getgrav/grav/issues/3358)
+    * File `frontmatter.yaml` isn't part of media, ignore it
+    * Switched default `JQuery` collection to use 3.x rather than 2.x
+1. [](#bugfix)
+    * Fixed missing styles when CSS/JS Pipeline is used and `asset://` folder is missing
+    * Fixed permission check when moving a page [#3382](https://github.com/getgrav/grav/issues/3382)
+
+# v1.7.16
+## 06/02/2021
+
+1. [](#new)
+    * Added 'addFrame()' method to ImageMedium [#3323](https://github.com/getgrav/grav/pull/3323)
+1. [](#improved)
+    * Set `cache.clear_images_by_default` to `false` by default
+    * Improve error on bad nested form data [#3364](https://github.com/getgrav/grav/issues/3364)
+1. [](#bugfix)
+    * Improve Plugin and Theme initialization to fix PHP8 bug [#3368](https://github.com/getgrav/grav/issues/3368)
+    * Fixed `pathinfo()` twig filter in PHP7
+    * Fixed the first visible child page getting ordering number `999999.` [#3365](https://github.com/getgrav/grav/issues/3365)
+    * Fixed flex pages search using only folder name [#3316](https://github.com/getgrav/grav/issues/3316)
+    * Fixed flex pages using wrong type in `onBlueprintCreated` event [#3157](https://github.com/getgrav/grav/issues/3157)
+    * Fixed wrong SRI paths invoked when Grav instance as a sub folder [#3358](https://github.com/getgrav/grav/issues/3358)
+    * Fixed SRI trying to calculate remote assets, only ever set integrity for local files. Use the SRI provided by the remote source and manually add it in the `addJs/addCss` call for remote support. [#3358](https://github.com/getgrav/grav/issues/3358)
+    * Fix for weird regex issue with latest PHP versions on Intel Macs causing params to not parse properly in URI object
+
+# v1.7.15
+## 05/19/2021
+
+1. [](#improved)
+    * Allow optional start date in page collections [#3350](https://github.com/getgrav/grav/pull/3350)
+    * Added `page` and `output` properties to `onOutputGenerated` and `onOutputRendered` events
+1. [](#bugfix)
+    * Fixed twig deprecated TwigFilter messages [#3348](https://github.com/getgrav/grav/issues/3348)
+    * Fixed fatal error with some markdown links [getgrav/grav-premium-issues#95](https://github.com/getgrav/grav-premium-issues/issues/95)
+    * Fixed markdown media operations not working when using `image://` stream [#3333](https://github.com/getgrav/grav/issues/3333) [#3349](https://github.com/getgrav/grav/issues/3349)
+    * Fixed copying page without changing the slug [getgrav/grav-plugin-admin#2135](https://github.com/getgrav/grav-plugin-admin/issues/2139)
+    * Fixed missing and commonly used methods when using `system.twig.undefined_functions = false` [getgrav/grav-plugin-admin#2138](https://github.com/getgrav/grav-plugin-admin/issues/2138)
+    * Fixed uploading images into Flex Object if field destination is not set
+
+# v1.7.14
+## 04/29/2021
+
+1. [](#new)
+    * Added `MediaUploadTrait::checkFileMetadata()` method
+1. [](#improved)
+    * Updating a theme should always keep the custom files [getgrav/grav-plugin-admin#2135](https://github.com/getgrav/grav-plugin-admin/issues/2135)
+1. [](#bugfix)
+    * Fixed broken numeric language codes in Flex Pages [#3332](https://github.com/getgrav/grav/issues/3332)
+    * Fixed broken `exif_imagetype()` twig function
+
+# v1.7.13
+## 04/23/2021
+
+1. [](#new)
+    * Added support for getting translated collection of Flex Pages using `$collection->withTranslated('de')`
+1. [](#improved)
+    * Moved `gregwar/Image` and `gregwar/Cache` in-house to official `getgrav/Image` and `getgrav/Cache` packagist packages. This will help environments with very strict proxy setups that don't allow VCS setup. [#3289](https://github.com/getgrav/grav/issues/3289)
+    * Improved XSS Invalid Protocol detection regex [#3298](https://github.com/getgrav/grav/issues/3298)
+    * Added support for user provided folder in Flex `$page->copy()`
+1. [](#bugfix)
+    * Fixed `The "Grav/Common/Twig/TwigExtension" extension is not enabled` when using markdown twig tag [#3317](https://github.com/getgrav/grav/issues/3317)
+    * Fixed text field maxlength validation newline issue [#3324](https://github.com/getgrav/grav/issues/3324)
+    * Fixed a bug in Flex Object `refresh()` method
+
+# v1.7.12
+## 04/15/2021
+
+1. [](#improved)
+    * Improve JSON support for the request
+1. [](#bugfix)
+    * Fixed absolute path support for Windows [#3297](https://github.com/getgrav/grav/issues/3297)
+    * Fixed adding tags in admin after upgrading Grav [#3315](https://github.com/getgrav/grav/issues/3315)
+
+# v1.7.11
+## 04/13/2021
+
+1. [](#new)
+    * Added configuration options to allow PHP methods to be used in Twig functions (`system.twig.safe_functions`) and filters (`system.twig.safe_filters`)
+    * Deprecated using PHP methods in Twig without them being in the safe lists
+    * Prevent dangerous PHP methods from being used as Twig functions and filters
+    * Restrict filesystem Twig functions to accept only local filesystem and grav streams
+1. [](#improved)
+    * Better GPM detection of unauthorized installations
+1. [](#bugfix)
+  * **IMPORTANT** Fixed security vulnerability with Twig allowing dangerous PHP functions by default [GHSA-g8r4-p96j-xfxc](https://github.com/getgrav/grav/security/advisories/GHSA-g8r4-p96j-xfxc)
+    * Fixed nxinx appending repeating `?_url=` in some redirects
+    * Fixed deleting page with language code not removing the folder if it was the last language [#3305](https://github.com/getgrav/grav/issues/3305)
+    * Fixed fatal error when using markdown links with `image://` stream [#3285](https://github.com/getgrav/grav/issues/3285)
+    * Fixed `system.languages.session_store_active` not having any effect [#3269](https://github.com/getgrav/grav/issues/3269)
+    * Fixed fatal error if `system.pages.types` is not an array [#2984](https://github.com/getgrav/grav/issues/2984)
+
+# v1.7.10
+## 04/06/2021
+
+1. [](#new)
+    * Added initial support for running Grav library from outside the webroot [#3297](https://github.com/getgrav/grav/issues/3297)
+1. [](#improved)
+    * Improved password handling when saving a user
+1. [](#bugfix)
+    * Ignore errors when using `set_time_limit` in `Archiver` and `GPM\Response` classes [#3023](https://github.com/getgrav/grav/issues/3023)
+    * Fixed `Folder::move()` deleting the folder if you move folder into itself, created empty file instead
+    * Fixed moving `Flex Page` to itself causing the page to be lost [#3227](https://github.com/getgrav/grav/issues/3227)
+    * Fixed `PageStorage` from detecting files as pages
+    * Fixed `UserIndex` not implementing `UserCollectionInterface`
+    * Fixed missing `onAdminAfterDelete` event call in `Flex Pages`
+    * Fixed system templates not getting scanned [#3296](https://github.com/getgrav/grav/issues/3296)
+    * Fixed incorrect routing if url path looks like a domain name [#2184](https://github.com/getgrav/grav/issues/2184)
+
+# v1.7.9
+## 03/19/2021
+
+1. [](#new)
+    * Added `Media::hide()` method to hide files from media
+    * Added `Utils::getPathFromToken()` method which works also with `Flex Objects`
+    * Added `FlexMediaTrait::getMediaField()`, which can be used to access custom media set in the blueprint fields
+    * Added `FlexMediaTrait::getFieldSettings()`, which can be used to get media field settings
+1. [](#improved)
+    * Method `Utils::getPagePathFromToken()` now calls the more generic `Utils::getPathFromToken()`
+    * Updated `SECURITY.md` to use security@getgrav.org
+1. [](#bugfix)
+    * Fixed broken media upload in `Flex` with `@self/path`, `@page` and `@theme` destinations [#3275](https://github.com/getgrav/grav/issues/3275)
+    * Fixed media fields excluding newly deleted files before saving the object
+    * Fixed method `$pages->find()` should never redirect [#3266](https://github.com/getgrav/grav/pull/3266)
+    * Fixed `Page::activeChild()` throwing an error [#3276](https://github.com/getgrav/grav/issues/3276)
+    * Fixed `Flex Page` CRUD ACL when creating a new page (needs Flex Objects plugin update) [grav-plugin-flex-objects#115](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/115)
+    * Fixed the list of pages not showing up in admin [#3280](https://github.com/getgrav/grav/issues/3280)
+    * Fixed text field min/max validation for UTF8 characters [#3281](https://github.com/getgrav/grav/issues/3281)
+    * Fixed redirects using wrong redirect code
+
+# v1.7.8
+## 03/17/2021
+
+1. [](#new)
+    * Added `ControllerResponseTrait::createDownloadResponse()` method
+    * Added full blueprint support to theme if you move existing files in `blueprints/` to `blueprints/pages/` folder [#3255](https://github.com/getgrav/grav/issues/3255)
+    * Added support for `Theme::getFormFieldTypes()` just like in plugins
+1. [](#improved)
+    * Optimized `Flex Pages` for speed
+    * Optimized saving visible/ordered pages when there are a lot of siblings [#3231](https://github.com/getgrav/grav/issues/3231)
+    * Clearing cache now deletes all clockwork files
+    * Improved `system.pages.redirect_default_route` and `system.pages.redirect_trailing_slash` configuration options to accept redirect code
+1. [](#bugfix)
+    * Fixed clockwork error when clearing cache
+    * Fixed missing method `translated()` in `Flex Pages`
+    * Fixed missing `Flex Pages` in site if multi-language support has been enabled
+    * Fixed Grav using blueprints and form fields from disabled plugins
+    * Fixed `FlexIndex::sortBy(['key' => 'ASC'])` having no effect
+    * Fixed default Flex Pages collection ordering to order by filesystem path
+    * Fixed disappearing pages on save if `pages://` stream resolves to multiple folders where the preferred folder doesn't exist
+    * Fixed Markdown image attribute `loading` [#3251](https://github.com/getgrav/grav/pull/3251)
+    * Fixed `Uri::isValidExtension()` returning false positives
+    * Fixed `page.html` returning duplicated content with `system.pages.redirect_default_route` turned on [#3130](https://github.com/getgrav/grav/issues/3130)
+    * Fixed site redirect with redirect code failing when redirecting to sub-pages [#3035](https://github.com/getgrav/grav/pull/3035/files)
+    * Fixed `Uncaught ValueError: Path cannot be empty` when failing to upload a file [#3265](https://github.com/getgrav/grav/issues/3265)
+    * Fixed `Path cannot be empty` when viewing non-existent log file [#3270](https://github.com/getgrav/grav/issues/3270)
+    * Fixed `onAdminSave` original page having empty header [#3259](https://github.com/getgrav/grav/issues/3259)
+
+# v1.7.7
+## 02/23/2021
+
+1. [](#new)
+    * Added `Utils::arrayToQueryParams()` to convert an array into query params
+1. [](#improved)
+    * Added original image support for all flex objects and media fields
+    * Improved `Pagination` class to allow custom pagination query parameter
+1. [](#bugfix)
+    * Fixed avatar of the user not being saved [grav-plugin-flex-objects#111](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/111)
+    * Replaced special space character with regular space in `system/blueprints/user/account_new.yaml`
+
+# v1.7.6
+## 02/17/2021
+
+1. [](#new)
+    * Added `Medium::attribute()` to pass arbitrary attributes [#3065](https://github.com/getgrav/grav/pull/3065)
+    * Added `Plugins::getPlugins()` and `Plugins::getPlugin($name)` to make it easier to access plugin instances [#2277](https://github.com/getgrav/grav/pull/2277)
+    * Added `regex_match` and `regex_split` twig functions [#2788](https://github.com/getgrav/grav/pull/2788)
+    * Updated all languages from [Crowdin](https://crowdin.com/project/grav-core) - Please update any translations here
+1. [](#improved)
+    * Added abstract `FlexObject`, `FlexCollection` and `FlexIndex` classes to `\Grav\Common\Flex` namespace (extend those instead of Framework or Generic classes)
+    * Updated bundled `composer.phar` binary to latest version `2.0.9`
+    * Improved session fixation handling in PHP 7.4+ (cannot fix it in PHP 7.3 due to PHP bug)
+    * Added optional password/database attributes for redis in `system.yaml`
+    * Added ability to filter enabled or disabled with bin/gpm index [#3187](https://github.com/getgrav/grav/pull/3187)
+    * Added `$grav->getVersion()` or `grav.version` in twig to get the current Grav version [#3142](https://github.com/getgrav/grav/issues/3142)
+    * Added second parameter to `$blueprint->flattenData()` to include every field, including those which have no data
+    * Added support for setting session domain [#2040](https://github.com/getgrav/grav/pull/2040)
+    * Better support inheriting languages when using child themes [#3226](https://github.com/getgrav/grav/pull/3226)
+    * Added option for `FlexForm` constructor to reset the form
+1. [](#bugfix)
+    * Fixed issue with `content-security-policy` not being properly supported with `http-equiv` + support single quotes
+    * Fixed CLI progressbar in `backup` and `security` commands to use styled output [#3198](https://github.com/getgrav/grav/issues/3198)
+    * Fixed page save failing because of uploaded images [#3191](https://github.com/getgrav/grav/issues/3191)
+    * Fixed `Flex Pages` using only default language in frontend [#106](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/106)
+    * Fixed empty `route()` and `raw_route()` when getting translated pages [#3184](https://github.com/getgrav/grav/pull/3184)
+    * Fixed error on `bin/gpm plugin uninstall` [#3207](https://github.com/getgrav/grav/issues/3207)
+    * Fixed broken min/max validation for field `type: int`
+    * Fixed lowering uppercase characters in usernames when saving from frontend [#2565](https://github.com/getgrav/grav/pull/2565)
+    * Fixed save error when editing accounts that have been created with capital letters in their username [#3211](https://github.com/getgrav/grav/issues/3211)
+    * Fixed renaming flex objects key when using file storage
+    * Fixed wrong values in Admin pages list [#3214](https://github.com/getgrav/grav/issues/3214)
+    * Fixed pipelined asset using different hash when extra asset is added to before/after position [#2781](https://github.com/getgrav/grav/issues/2781)
+    * Fixed trailing slash redirect to only apply to GET/HEAD requests and use 301 status code [#3127](https://github.com/getgrav/grav/issues/3127)
+    * Fixed root page to always contain trailing slash [#3127](https://github.com/getgrav/grav/issues/3127)
+    * Fixed `<meta name="flattr:*" content="*">` to use name instead property [#3010](https://github.com/getgrav/grav/pull/3010)
+    * Fixed behavior of opposite filters in `Pages::getCollection()` to match Grav 1.6 [#3216](https://github.com/getgrav/grav/pull/3216)
+    * Fixed modular content with missing template file ending up using non-modular template [#3218](https://github.com/getgrav/grav/issues/3218)
+    * Fixed broken attachment image in Flex Objects Admin when `destination: self@` used [#3225](https://github.com/getgrav/grav/issues/3225)
+    * Fixed bug in page content with both markdown and twig enabled [#3223](https://github.com/getgrav/grav/issues/3223)
+
+# v1.7.5
+## 02/01/2021
+
+1. [](#bugfix)
+    * Revert: Fixed page save failing because of uploaded images [#3191](https://github.com/getgrav/grav/issues/3191) - breaking save
+
+# v1.7.4
+## 02/01/2021
+
+1. [](#new)
+    * Added `FlexForm::setSubmitMethod()` to customize form submit action
+1. [](#improved)
+    * Improved GPM error handling
+1. [](#bugfix)
+    * Fixed `bin/gpm uninstall` script not working because of bad typehint [#3172](https://github.com/getgrav/grav/issues/3172)
+    * Fixed `login: visibility_requires_access` not working in pages [#3176](https://github.com/getgrav/grav/issues/3176)
+    * Fixed cannot change image format [#3173](https://github.com/getgrav/grav/issues/3173)
+    * Fixed saving page in expert mode [#3174](https://github.com/getgrav/grav/issues/3174)
+    * Fixed exception in `$flexPage->frontmatter()` method when setting value
+    * Fixed `onBlueprintCreated` event being called multiple times in `Flex Pages` [grav-plugin-flex-objects#97](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/97)
+    * Fixed wrong ordering in page collections if `intl` extension has been enabled [#3167](https://github.com/getgrav/grav/issues/3167)
+    * Fixed page redirect to the first visible child page (needs to be routable and published, too)
+    * Fixed untranslated module pages showing up in the menu
+    * Fixed page save failing because of uploaded images [#3191](https://github.com/getgrav/grav/issues/3191)
+    * Fixed incorrect config lookup for loading in `ImageLoadingTrait` [#3192](https://github.com/getgrav/grav/issues/3192)
+
+# v1.7.3
+## 01/21/2021
+
+1. [](#improved)
+    * IMPORTANT - Please [checkout the process](https://getgrav.org/blog/grav-170-cli-self-upgrade-bug) to `self-upgrade` from CLI if you are on **Grav 1.7.0 or 1.7.1**
+    * Added support for symlinking individual plugins and themes by using `bin/grav install -p myplugin` or `-t mytheme`
+    * Added support for symlinking plugins and themes with `hebe.json` file to support custom folder structures
+    * Added support for running post-install scripts in `bin/gpm selfupgrade` if Grav was updated manually
+1. [](#bugfix)
+    * Fixed default GPM Channel back to 'stable' - this was inadvertently left as 'testing' [#3163](https://github.com/getgrav/grav/issues/3163)
+    * Fixed broken stream initialization if `environment://` paths aren't streams
+    * Fixed Clockwork debugger in sub-folder multi-site setups
+    * Fixed `Unsupported option "curl" passed to "Symfony\Component\HttpClient\CurlHttpClient"` in `bin/gpm selfupgrade` [#3165](https://github.com/getgrav/grav/issues/3165)
+
+# v1.7.2
+## 01/21/2021
+
+1. [](#improved)
+    * This release was pulled due to a bug in the installer, 1.7.3 replaces it.
+
+# v1.7.1
+## 01/20/2021
+
+1. [](#bugfix)
+    * Fixed fatal error when `site.taxonomies` contains a bad value
+    * Sanitize valid Page extensions from `Page::template_format()`
+    * Fixed `bin/gpm index` erroring out [#3158](https://github.com/getgrav/grav/issues/3158)
+    * Fixed `bin/gpm selfupgrade` failing to report failed Grav update [#3116](https://github.com/getgrav/grav/issues/3116)
+    * Fixed `bin/gpm selfupgrade` error on `Call to undefined method` [#3160](https://github.com/getgrav/grav/issues/3160)
+    * Flex Pages: Fixed fatal error when trying to move a page to Root (/) [#3161](https://github.com/getgrav/grav/issues/3161)
+    * Fixed twig parsing errors in pages where twig is parsed after markdown [#3162](https://github.com/getgrav/grav/issues/3162)
+    * Fixed `lighttpd.conf` access-deny rule [#1876](https://github.com/getgrav/grav/issues/1876)
+    * Fixed page metadata being double-escaped [#3121](https://github.com/getgrav/grav/issues/3121)
+
+# v1.7.0
+## 01/19/2021
+
+1. [](#new)
+    * Requires **PHP 7.3.6**
+    * Read about this release in the [Grav 1.7 Released](https://getgrav.org/blog/grav-1.7-released) blog post
+    * Read the full list of all changes in the [Changelog on GitHub](https://github.com/getgrav/grav/blob/1.7.0/CHANGELOG.md)
+    * Please read [Grav 1.7 Upgrade Guide](https://learn.getgrav.org/17/advanced/grav-development/grav-17-upgrade-guide) before upgrading!
+    * Added support for overriding configuration by using environment variables
+    * Use PHP 7.4 serialization (the old `Serializable` methods are now final and cannot be overridden)
+    * Enabled `ETag` setting by default for 304 responses
+    * Added `FlexCollection::getDistinctValues()` to get all the assigned values from the field
+    * `Flex Pages` method `$page->header()` returns `\Grav\Common\Page\Header` object, old `Page` class still returns `stdClass`
+1. [](#improved)
+    * Make it possible to use an absolute path when loading a blueprint
+    * Make serialize methods final in `ContentBlock`, `AbstractFile`, `FormTrait`, `ObjectCollectionTrait` and `ObjectTrait`
+    * Added support for relative paths in `PageObject::getLevelListing()` [#3110](https://github.com/getgrav/grav/issues/3110)
+    * Better `--env` and `--lang` support for `bin/grav`, `bin/gpm` and `bin/plugin` console commands
+      * **BC BREAK** Shorthand for `--env`: `-e` will not work anymore as it conflicts with some plugins
+    * Added support for locking the `start` and `limit` in a Page Collection
+1. [](#bugfix)
+    * Fixed port issue with `system.custom_base_url`
+    * Hide errors with `exif_read_data` in `ImageFile`
+    * Fixed unserialize in `MarkdownFormatter` and `Framework\File` classes
+    * Fixed pages with session messages should never be cached [#3108](https://github.com/getgrav/grav/issues/3108)
+    * Fixed `Filesystem::normalize()` with dot-dot paths
+    * Fixed Flex sorting issues [grav-plugin-flex-objects#92](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/92)
+    * Fixed Clockwork missing dumped arrays and objects
+    * Fixed fatal error in PHP 8 when trying to access root page
+    * Fixed Array->String conversion error when `languages:translations: false` [admin#1896](https://github.com/getgrav/grav-plugin-admin/issues/1896)
+    * Fixed `Inflector` methods when translation is missing `GRAV.INFLECTOR_*` translations
+    * Fixed exception when changing parent of new page [grav-plugin-admin#2018](https://github.com/getgrav/grav-plugin-admin/issues/2018)
+    * Fixed ordering issue with moving pages [grav-plugin-admin#2015](https://github.com/getgrav/grav-plugin-admin/issues/2015)
+    * Fixed Flex Pages cache not invalidating if saving an old `Page` object [#3152](https://github.com/getgrav/grav/issues/3152)
+    * Fixed multiple issues with `system.language.translations: false`
+    * Fixed page collections containing dummy items for untranslated default language [#2985](https://github.com/getgrav/grav/issues/2985)
+    * Fixed streams in `setup.php` being overridden by `system/streams.yaml` [#2450](https://github.com/getgrav/grav/issues/2450)
+    * Fixed `ERR_TOO_MANY_REDIRECTS` with HTTPS = 'On' [#3155](https://github.com/getgrav/grav/issues/3155)
+    * Fixed page collection pagination not behaving as it did in Grav 1.6
+
+# v1.7.0-rc.20
+## 12/15/2020
+
+1. [](#new)
+    * Update phpstan to version 0.12
+    * Auto-Escape enabled by default. Manually enable **Twig Compatibility** and disable **Auto-Escape** to use the old setting.
+    * Updated unit tests to use codeception 4.1
+    * Added support for setting `GRAV_ENVIRONMENT` by using environment variable or a constant
+    * Added support for setting `GRAV_SETUP_PATH` by using environment variable (constant already worked)
+    * Added support for setting `GRAV_ENVIRONMENTS_PATH` by using environment variable or a constant
+    * Added support for setting `GRAV_ENVIRONMENT_PATH` by using environment variable or a constant
+1. [](#improved)
+    * Improved `bin/grav install` command
+1. [](#bugfix)
+    * Fixed potential error when upgrading Grav
+    * Fixed broken list in `bin/gpm index` [#3092](https://github.com/getgrav/grav/issues/3092)
+    * Fixed CLI/GPM command failures returning 0 (success) value [#3017](https://github.com/getgrav/grav/issues/3017)
+    * Fixed unimplemented `PageObject::getOriginal()` call [#3098](https://github.com/getgrav/grav/issues/3098)
+    * Fixed `Argument 1 passed to Grav\Common\User\DataUser\User::filterUsername() must be of the type string` [#3101](https://github.com/getgrav/grav/issues/3101)
+    * Fixed broken check if php exif module is enabled in `ImageFile::fixOrientation()`
+    * Fixed `StaticResizeTrait::resize()` bad image height/width attributes if `null` values are passed to the method
+    * Fixed twig script/style tag `{% script 'file.js' at 'bottom' %}`, replaces broken `in` operator [#3084](https://github.com/getgrav/grav/issues/3084)
+    * Fixed dropped query params when `?` is preceded with `/` [#2964](https://github.com/getgrav/grav/issues/2964)
+
+# v1.7.0-rc.19
+## 12/02/2020
+
+1. [](#bugfix)
+    * Updated composer libraries with latest Toolbox v1.5.6 that contains critical fixes
+
+# v1.7.0-rc.18
+## 12/02/2020
+
+1. [](#new)
+    * Set minimum requirements to **PHP 7.3.6**
+    * Updated Clockwork to v5.0
+    * Added `FlexDirectoryInterface` interface
+    * Renamed `PageCollectionInterface::nonModular()` into `PageCollectionInterface::pages()` and deprecated the old method
+    * Renamed `PageCollectionInterface::modular()` into `PageCollectionInterface::modules()` and deprecated the old method'
+    * Upgraded `bin/composer.phar` to `2.0.2` which is all new and much faster
+    * Added search option `same_as` to Flex Objects
+    * Added PHP 8 compatible `function_exists()`: `Utils::functionExists()`
+    * New sites have `compatibility` features turned off by default, upgrading from older versions will keep the settings on
+1. [](#improved)
+    * Updated bundled JQuery to latest version `3.5.1`
+    * Forward a `sid` to GPM when downloading a premium package via CLI
+    * Allow `JsonFormatter` options to be passed as a string
+    * Hide Flex Pages frontend configuration (not ready for production use)
+    * Improve Flex configuration: gather views together in blueprint
+    * Added XSS detection to all forms. See [documentation](https://learn.getgrav.org/17/forms/forms/form-options#xss-checks)
+    * Better handling of missing repository index [grav-plugin-admin#1916](https://github.com/getgrav/grav-plugin-admin/issues/1916)
+    * Added support for having all sites / environments under `user/env` folder [#3072](https://github.com/getgrav/grav/issues/3072)
+    * Added `FlexObject::refresh()` method to make sure object is up to date
+1. [](#bugfix)
+    * *Menu Visibility Requires Access* Security option setting wrong frontmatter [login#265](https://github.com/getgrav/grav-plugin-login/issues/265)
+    * Accessing page with unsupported file extension (jpg, pdf, xsl) will use wrong mime type [#3031](https://github.com/getgrav/grav/issues/3031)
+    * Fixed media crashing on a bad image
+    * Fixed bug in collections where filter `type: false` did not work
+    * Fixed `print_r()` in twig
+    * Fixed sorting by groups in `Flex Users`
+    * Changing `Flex Page` template causes the other language versions of that page to lose their content [admin#1958](https://github.com/getgrav/grav-plugin-admin/issues/1958)
+    * Fixed plugins getting initialized multiple times (by CLI commands for example)
+    * Fixed `header.admin.children_display_order` in Flex Pages to work just like with regular pages
+    * Fixed `Utils::isFunctionDisabled()` method if there are spaces in `disable_functions` [#3023](https://github.com/getgrav/grav/issues/3023)
+    * Fixed potential fatal error when creating flex index using cache [#3062](https://github.com/getgrav/grav/issues/3062)
+    * Fixed fatal error in `CompiledFile` if the cached version is broken
+    * Fixed updated media missing from media when editing Flex Object after page reload
+    * Fixed issue with `config-default@` breaking on set [#1972](https://github.com/getgrav/grav-plugin-admin/issues/1971)
+    * Escape titles in Flex pages list [flex-objects#84](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/84)
+    * Fixed Purge successful message only working in Scheduler but broken in CLI and Admin [#1935](https://github.com/getgrav/grav-plugin-admin/issues/1935)
+    * Fixed `system://` stream is causing issues in Admin, making Media tab to disappear and possibly causing other issues [#3072](https://github.com/getgrav/grav/issues/3072)
+    * Fixed CLI self-upgrade from Grav 1.6 [#3079](https://github.com/getgrav/grav/issues/3079)
+    * Fixed `bin/grav yamllinter -a` and `-f` not following symlinks [#3080](https://github.com/getgrav/grav/issues/3080)
+    * Fixed `|safe_email` filter to return safe and escaped UTF-8 HTML [#3072](https://github.com/getgrav/grav/issues/3072)
+    * Fixed exception in CLI GPM and backup commands when `php-zip` is not enabled [#3075](https://github.com/getgrav/grav/issues/3075)
+    * Fix for XSS advisory [GHSA-cvmr-6428-87w9](https://github.com/getgrav/grav/security/advisories/GHSA-cvmr-6428-87w9)
+    * Fixed Flex and Page ordering to be natural and case insensitive [flex-objects#87](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/87)
+    * Fixed plugin/theme priority ordering to be numeric
+
+# v1.7.0-rc.17
+## 10/07/2020
+
+1. [](#new)
+    * Added a `Uri::getAllHeaders()` compatibility function
+1. [](#improved)
+    * Fall back through various templates scenarios if they don't exist in theme to avoid unhelpful error.
+    * Added default templates for `external.html.twig`, `default.html.twig`, and `modular.html.twig`
+    * Improve Media classes
+    * _POTENTIAL BREAKING CHANGE:_ Added reload argument to `FlexStorageInterface::getMetaData()`
+1. [](#bugfix)
+    * Fixed `Security::sanitizeSVG()` creating an empty file if SVG file cannot be parsed
+    * Fixed infinite loop in blueprints with `extend@` to a parent stream
+    * Added missing `Stream::create()` method
+    * Added missing `onBlueprintCreated` event for Flex Pages
+    * Fixed `onBlueprintCreated` firing multiple times recursively
+    * Fixed media upload failing with custom folders
+    * Fixed `unset()` in `ObjectProperty` class
+    * Fixed `FlexObject::freeMedia()` method causing media to become null
+    * Fixed bug in `Flex Form` making it impossible to set nested values
+    * Fixed `Flex User` avatar when using folder storage, also allow multiple images
+    * Fixed Referer reference during GPM calls.
+    * Fixed fatal error with toggled lists
+
+# v1.7.0-rc.16
+## 09/01/2020
+
+1. [](#new)
+    * Added a new `svg_image()` twig function to make it easier to 'include' SVG source in Twig
+    * Added a helper `Utils::fullPath()` to get the full path to a file be it stream, relative, etc.
+1. [](#improved)
+    * Added `themes` to cached blueprints and configuration
+1. [](#bugfix)
+    * Fixed `Flex Pages` issue with `getRoute()` returning path with language prefix for default language if set not to do that
+    * Fixed `Flex Pages` bug where reordering pages causes page content to disappear if default language uses wrong extension (`.md` vs `.en.md`)
+    * Fixed `Flex Pages` bug where `onAdminSave` passes page as `$event['page']` instead of `$event['object']` [#2995](https://github.com/getgrav/grav/issues/2995)
+    * Fixed `Flex Pages` bug where changing a modular page template added duplicate file [admin#1899](https://github.com/getgrav/grav-plugin-admin/issues/1899)
+    * Fixed `Flex Pages` bug where renaming slug causes bad ordering range after save [#2997](https://github.com/getgrav/grav/issues/2997)
+
+# v1.7.0-rc.15
+## 07/22/2020
+
+1. [](#bugfix)
+    * Fixed Flex index file caching [#2962](https://github.com/getgrav/grav/issues/2962)
+    * Fixed various issues with Exif data reading and images being incorrectly rotated [#1923](https://github.com/getgrav/grav-plugin-admin/issues/1923)
+
+# v1.7.0-rc.14
+## 07/09/2020
+
+1. [](#improved)
+    * Added ability to `noprocess` specific items only in Link/Image Excerpts, e.g. `http://foo.com/page?id=foo&target=_blank&noprocess=id` [#2954](https://github.com/getgrav/grav/pull/2954)
+1. [](#bugfix)
+    * Regression: Default language fix broke `Language::getLanguageURLPrefix()` and `Language::isIncludeDefaultLanguage()` methods when not using multi-language
+    * Reverted `Language::getDefault()` and `Language::getLanguage()` to return false again because of plugin compatibility (updated docblocks)
+    * Fixed UTF-8 issue in `Excerpts::getExcerptsFromHtml`
+    * Fixed some compatibility issues with recent Changes to `Assets` handling
+    * Fixed issue with `CSS_IMPORTS_REGEX` breaking with complex URLs [#2958](https://github.com/getgrav/grav/issues/2958)
+    * Moved duplicated `CSS_IMPORT_REGEX` to local variable in `AssetUtilsTrait::moveImports()`
+    * Fixed page media only accepting images [#2943](https://github.com/getgrav/grav/issues/2943)
+
+# v1.7.0-rc.13
+## 07/01/2020
+
+1. [](#new)
+    * Added support for uploading and deleting images directly in `Media`
+    * Added new `onAfterCacheClear` event
+1. [](#improved)
+    * Improved `CvsFormatter` to attempt to encode non-scalar variables into JSON before giving up
+    * Moved image loading into its own trait to be used by images+static images
+    * Adjusted asset types to enable extension of assets in class [#2937](https://github.com/getgrav/grav/pull/2937)
+    * Composer update for vendor library updates
+    * Updated bundled `composer.phar` to `2.0.0-dev`
+1. [](#bugfix)
+    * Fixed `MediaUploadTrait::copyUploadedFile()` not adding uploaded media to the collection
+    * Fixed regression in saving media to a new Flex Object [admin#1867](https://github.com/getgrav/grav-plugin-admin/issues/1867)
+    * Fixed `Trying to get property 'username' of non-object` error in Flex [flex-objects#62](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/62)
+    * Fixed retina images not working in Flex [flex-objects#64](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/64)
+    * Fixed plugin initialization in CLI
+    * Fixed broken logic in `Page::topParent()` when dealing with first-level pages
+    * Fixed broken `Flex Page` authorization for groups
+    * Fixed missing `onAdminSave` and `onAdminAfterSave` events when using `Flex Pages` and `Flex Users` [flex-objects#58](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/58)
+    * Fixed new `User Group` allowing bad group name to be saved [admin#1917](https://github.com/getgrav/grav-plugin-admin/issues/1917)
+    * Fixed `Language::getDefault()` returning false and not 'en'
+    * Fixed non-text links in `Excerpts::getExcerptFromHtml`
+    * Fixed CLI commands not properly intializing Plugins so events can fire
+
+# v1.7.0-rc.12
+## 06/08/2020
+
+1. [](#improved)
+    * Changed `Folder::hasChildren` to `Folder::countChildren`
+    * Added `Content Editor` option to user account blueprint
+1. [](#bugfix)
+    * Fixed new `Flex Page` not having correct form fields for the page type
+    * Fixed new `Flex User` erroring out on save (thanks @mikebi42)
+    * Fixed `Flex Object` request cache clear when saving object
+    * Fixed blueprint value filtering in lists [#2923](https://github.com/getgrav/grav/issues/2923)
+    * Fixed blueprint for `system.pages.hide_empty_folders` [#1925](https://github.com/getgrav/grav/issues/2925)
+    * Fixed file field in `Flex Objects` (use `Grav\Common\Flex\Types\GenericObject` instead of `FlexObject`) [flex-objects#37](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/37)
+    * Fixed saving nested file fields in `Flex Objects` [flex-objects#34](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/34)
+    * JSON Route of homepage with no ‘route’ set is valid [form#425](https://github.com/getgrav/grav-plugin-form/issues/425)
+
+# v1.7.0-rc.11
+## 05/14/2020
+
+1. [](#new)
+    * Added support for native `loading=lazy` attributes on images.  Can be set in `system.images.defaults` or per md image with `?loading=lazy` [#2910](https://github.com/getgrav/grav/issues/2910)
+1. [](#improved)
+    * Added `PageCollection::all()` to mimic Pages class
+    * Added system configuration support for `HTTP_X_Forwarded` headers (host disabled by default)
+    * Updated `PHPUserAgentParser` to 1.0.0
+    * Improved docblocks
+    * Fixed some phpstan issues
+    * Tighten vendor requirements
+1. [](#bugfix)
+    * Fix for uppercase image extensions
+    * Fix for `&` errors in HTML when passed to `Excerpts.php`
+
+# v1.7.0-rc.10
+## 04/30/2020
+
+1. [](#new)
+    * Changed `Response::get()` used by **GPM/Admin** to use [Symfony HttpClient v4.4](https://symfony.com/doc/current/components/http_client.html) (`composer install --nodev` required for Git installations)
+    * Added new `Excerpts::processLinkHtml()` method
+1. [](#bugfix)
+    * Fixed `Flex Pages` admin with PHP `intl` extension enabled when using custom page order
+    * Fixed saving non-numeric-prefix `Flex Page` changing to numeric-prefix [flex-objects#56](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/56)
+    * Copying `Flex Page` in admin does nothing [flex-objects#55](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/55)
+    * Force GPM progress to be between 0-100%
+
+# v1.7.0-rc.9
+## 04/27/2020
+
+1. [](#new)
+    * Support for `webp` image format in Page Media [#1168](https://github.com/getgrav/grav/issues/1168)
+    * Added `Route::getBase()` method
+1. [](#improved)
+    * Support symlinks when saving `File`
+1. [](#bugfix)
+    * Fixed flex objects with integer keys not working [#2863](https://github.com/getgrav/grav/issues/2863)
+    * Fixed `Pages::instances()` returning null values when using `Flex Pages` [#2889](https://github.com/getgrav/grav/issues/2889)
+    * Fixed Flex Page parent `header.admin.children_display_order` setting being ignored in Admin [#2881](https://github.com/getgrav/grav/issues/2881)
+    * Implemented missing Flex `$pageCollection->batch()` and `$pageCollection->order()` methods
+    * Fixed user avatar creation for new `Flex Users` when using folder storage
+    * Fixed `Trying to access array offset on value of type null` PHP 7.4 error in `Plugin.php`
+    * Fixed Gregwar Image library using `.jpeg` for cached images, rather use `.jpg`
+    * Fixed `Flex Pages` with `00.home` page not having ordering set
+    * Fixed `Flex Pages` not updating empty content on save [#2890](https://github.com/getgrav/grav/issues/2890)
+    * Fixed creating new Flex User with file storage
+    * Fixed saving new `Flex Object` with custom key
+    * Fixed broken `Plugin::config()` method
+
+# v1.7.0-rc.8
+## 03/19/2020
+
+1. [](#new)
+    * Added `MediaTrait::freeMedia()` method to free media (and memory)
+    * Added `Folder::hasChildren()` method to determine if a folder has child folders
+1. [](#improved)
+    * Save memory when updating large flex indexes
+    * Better `Content-Encoding` handling in Apache when content compression is disabled [#2619](https://github.com/getgrav/grav/issues/2619)
+1. [](#bugfix)
+    * Fixed creating new `Flex User` when folder storage has been selected
+    * Fixed some bugs in Flex root page methods
+    * Fixed bad default redirect code in `ControllerResponseTrait::createRedirectResponse()`
+    * Fixed issue with PHP `HTTP_X_HTTP_METHOD_OVERRIDE` [#2847](https://github.com/getgrav/grav/issues/2847)
+    * Fixed numeric usernames not working in `Flex Users`
+    * Implemented missing Flex `$page->move()` method
+
+# v1.7.0-rc.7
+## 03/05/2020
+
+1. [](#new)
+    * Added `Session::regenerateId()` method to properly prevent session fixation issues
+    * Added configuration option `system.strict_mode.blueprint_compat` to maintain old `validation: strict` behavior [#1273](https://github.com/getgrav/grav/issues/1273)
+1. [](#improved)
+    * Improved Flex events
+    * Updated CLI commands to use the new methods to initialize Grav
+1. [](#bugfix)
+    * Fixed Flex Pages having broken `isFirst()`, `isLast()`, `prevSibling()`, `nextSibling()` and `adjacentSibling()`
+    * Fixed broken ordering sometimes when saving/moving visible `Flex Page` [#2837](https://github.com/getgrav/grav/issues/2837)
+    * Fixed ordering being lost when saving modular `Flex Page`
+    * Fixed `validation: strict` not working in blueprints (see `system.strict_mode.blueprint_compat` setting) [#1273](https://github.com/getgrav/grav/issues/1273)
+    * Fixed `Blueprint::extend()` and `Blueprint::embed()` not initializing dynamic properties
+    * Fixed fatal error on storing flex flash using new object without a key
+    * Regression: Fixed unchecking toggleable having no effect in Flex forms
+    * Fixed changing page template in Flex Pages [#2828](https://github.com/getgrav/grav/issues/2828)
+
+# v1.7.0-rc.6
+## 02/11/2020
+
+1. [](#new)
+    * Plugins & Themes: Call `$plugin->autoload()` and `$theme->autoload()` automatically when object gets initialized
+    * CLI: Added `$grav->initializeCli()` method
+    * Flex Directory: Implemented customizable configuration
+    * Flex Storages: Added support for renaming directory entries
+1. [](#improved)
+    * Vendor updates to latest
+1. [](#bugfix)
+    * Regression: Fixed fatal error in blueprints [#2811](https://github.com/getgrav/grav/issues/2811)
+    * Regression: Fixed bad method call in FlexDirectory::getAuthorizeRule()
+    * Regression: Fixed fatal error in admin if the site has custom permissions in `onAdminRegisterPermissions`
+    * Regression: Fixed flex user index with folder storage
+    * Regression: Fixed fatal error in `bin/plugin` command
+    * Fixed `FlexObject::triggerEvent()` not emitting events [#2816](https://github.com/getgrav/grav/issues/2816)
+    * Grav 1.7: Fixed saving Flex configuration with ignored values becoming null
+    * Grav 1.7: Fixed `bin/plugin` initialization
+    * Grav 1.7: Fixed Flex Page cache key not taking account active language
+
+# v1.7.0-rc.5
+## 02/03/2020
+
+1. [](#bugfix)
+    * Regression: Flex not working in PHP 7.2 or older
+    * Fixed creating first user from admin not clearing Flex User directory cache [#2809](https://github.com/getgrav/grav/issues/2809)
+    * Fixed Flex Pages allowing root page to be deleted
+
+# v1.7.0-rc.4
+## 02/03/2020
+
+1. [](#new)
+    * _POTENTIAL BREAKING CHANGE:_ Upgraded Parsedown to 1.7 for Parsedown-Extra 0.8. Plugins that extend Parsedown may need a fix to render as HTML
+    * Added `$grav['flex']` to access all registered Flex Directories
+    * Added `$grav->dispatchEvent()` method for PSR-14 events
+    * Added `FlexRegisterEvent` which triggers when `$grav['flex']` is being accessed the first time
+    * Added Flex cache configuration options
+    * Added `PluginsLoadedEvent` which triggers after plugins have been loaded but not yet initialized
+    * Added `SessionStartEvent` which triggers when session is started
+    * Added `PermissionsRegisterEvent` which triggers when `$grav['permissions']` is being accessed the first time
+    * Added support for Flex Directory specific configuration
+    * Added support for more advanced ACL
+    * Added `flatten_array` filter to form field validation
+    * Added support for `security@: or: [admin.super, admin.pages]` in blueprints (nested AND/OR mode support)
+1. [](#improved)
+    * Blueprint validation: Added `validate: value_type: bool|int|float|string|trim` to `array` to filter all the values inside the array
+    * Twig `url()` takes now third parameter (`true`) to return URL on non-existing file instead of returning false
+1. [](#bugfix)
+    * Grav 1.7: Fixed blueprint loading issues [#2782](https://github.com/getgrav/grav/issues/2782)
+    * Fixed PHP 7.4 compatibility issue with `Stream`
+    * Fixed new `Flex Users` being stored with wrong filename, login issues [#2785](https://github.com/getgrav/grav/issues/2785)
+    * Fixed `ignore_empty: true` not removing empty values in blueprint filtering
+    * Fixed `{{ false|string }}` twig to return '0' instead of ''
+    * Fixed twig `url()` failing if stream has extra slash in it (e.g. `user:///data`)
+    * Fixed `Blueprint::filter()` returning null instead of array if there is nothing to return
+    * Fixed `Cannot use a scalar value as an array` error in `Utils::arrayUnflattenDotNotation()`, ignore nested structure instead
+    * Fixed `Route` instance in multi-site setups
+    * Fixed `system.translations: false` breaking `Inflector` methods
+    * Fixed filtering ignored (eg. `security@: admin.super`) fields causing `Flex Objects` to lose data on save
+    * Grav 1.7: Fixed `Flex Pages` unserialize issues if Flex-Objects Plugin has not been installed
+    * Grav 1.7: Require Flex-Objects Plugin to edit Flex Accounts
+    * Grav 1.7: Fixed bad result on testing `isPage()` when using Flex Pages
+
+# v1.7.0-rc.3
+## 01/02/2020
+
+1. [](#new)
+    * Added root page support for `Flex Pages`
+1. [](#improved)
+    * Twig filter `|yaml_serialize`: added support for `JsonSerializable` objects and other array-like objects
+    * Added support for returning Flex Page specific permissions for admin and testing
+    * Updated copyright dates to `2020`
+    * Various vendor updates
+1. [](#bugfix)
+    * Grav 1.7: Fixed error on page initialization [#2753](https://github.com/getgrav/grav/issues/2753)
+    * Fixed checking ACL for another user (who is not currently logged in) in a Flex Object or Directory
+    * Fixed bug in Windows where `Filesystem::dirname()` returns backslashes
+    * Fixed Flex object issues in Windows [#2773](https://github.com/getgrav/grav/issues/2773)
+
+# v1.7.0-rc.2
+## 12/04/2019
+
+1. [](#new)
+    * Updated Symfony Components to 4.4
+    * Added support for page specific CRUD permissions (`Flex Pages` only)
+    * Added new `-r <job-id>` option for Scheduler CLI command to force-run a job [#2720](https://github.com/getgrav/grav/issues/2720)
+    * Added `Utils::isAssoc()` and `Utils::isNegative()` helper methods
+    * Changed `UserInterface::authorize()` to return `null` having the same meaning as `false` if access is denied because of no matching rule
+    * Changed `FlexAuthorizeInterface::isAuthorized()` to return `null` having the same meaning as `false` if access is denied because of no matching rule
+    * Moved all Flex type classes under `Grav\Common\Flex`
+    * DEPRECATED `Grav\Common\User\Group` in favor of `$grav['user_groups']`, which contains Flex UserGroup collection
+    * DEPRECATED `$page->modular()` in favor of `$page->isModule()` for better readability
+    * Fixed phpstan issues in all code up to level 3
+1. [](#improved)
+    * Improved twig `|array` filter to work with iterators and objects with `toArray()` method
+    * Updated Flex `SimpleStorage` code to feature match the other storages
+    * Improved user and group ACL to support deny permissions (`Flex Users` only)
+    * Improved twig `authorize()` function to work better with nested rule parameters
+    * Output the current username that Scheduler is using if crontab not setup
+    * Translations: rename MODULAR to MODULE everywhere
+    * Optimized `Flex Pages` collection filtering
+    * Frontend optimizations for `Flex Pages`
+1. [](#bugfix)
+    * Regression: Fixed Grav update bug [#2722](https://github.com/getgrav/grav/issues/2722)
+    * Fixed fatal error when calling `{{ grav.undefined }}`
+    * Grav 1.7: Reverted `$object->getStorageKey()` interface as it was not a good idea, added `getMasterKey()` for pages
+    * Grav 1.7: Fixed logged in user being able to delete his own account from admin account manager
+
+# v1.7.0-rc.1
+## 11/06/2019
+
+1. [](#new)
+    * Added `Flex Pages` to Grav core and removed Flex Objects plugin dependency
+    * Added `Utils::simpleTemplate()` method for very simple variable templating
+    * Added `array_diff()` twig function
+    * Added `template_from_string()` twig function
+    * Updated Symfony Components to 4.3
+1. [](#improved)
+    * Improved `Scheduler` cron command check and more useful CLI information
+    * Improved `Flex Users`: obey blueprints and allow Flex to be used in admin only
+    * Improved `Flex` to support custom site template paths
+    * Changed Twig `{% cache %}` tag to not need unique key, and `lifetime` is now optional
+    * Added mime support for file formatters
+    * Updated built-in `composer.phar` to latest `1.9.0`
+    * Updated vendor libraries
+    * Use `Symfony EventDispatcher` directly and not rockettheme/toolbox wrapper
+1. [](#bugfix)
+    * Fixed exception caused by missing template type based on `Accept:` header [#2705](https://github.com/getgrav/grav/issues/2705)
+    * Fixed `Page::untranslatedLanguages()` not being symmetrical to `Page::translatedLanguages()`
+    * Fixed `Flex Pages` not calling `onPageProcessed` event when cached
+    * Fixed phpstan issues in Framework up to level 7
+    * Fixed issue with duplicate configuration settings in Flex Directory
+    * Fixed fatal error if there are numeric folders in `Flex Pages`
+    * Fixed error on missing `Flex` templates in if `Flex Objects` plugin isn't installed
+    * Fixed `PageTranslateTrait::getAllLanguages()` and `getAllLanguages()` to include default language
+    * Fixed multi-language saving issues with default language in `Flex Pages`
+    * Selfupgrade CLI: Fixed broken selfupgrade assets reference [#2681](https://github.com/getgrav/grav/issues/2681)
+    * Grav 1.7: Fixed PHP 7.1 compatibility issues
+    * Grav 1.7: Fixed fatal error in multi-site setups
+    * Grav 1.7: Fixed `Flex Pages` routing if using translated slugs or `system.hide_in_urls` setting
+    * Grav 1.7: Fixed bug where Flex index file couldn't be disabled
+
+# v1.7.0-beta.10
+## 10/03/2019
+
+1. [](#improved)
+    * Flex: Removed extra exists check when creating object (messes up "non-existing" pages)
+    * Support customizable null character replacement in `CSVFormatter::decode()`
+1. [](#bugfix)
+    * Fixed wrong Grav param separator when using `Route` class
+    * Fixed Flex User Avatar not fully backwards compatible with old user
+    * Grav 1.7: Fixed prev/next page missing pages if pagination was turned on in page header
+    * Grav 1.7: Reverted setting language for every page during initialization
+    * Grav 1.7: Fixed numeric language inconsistencies
+
+# v1.7.0-beta.9
+## 09/26/2019
+
+1. [](#new)
+    * Added a new `{% cache %}` Twig tag eliminating need for `twigcache` extension.
+1. [](#improved)
+    * Improved blueprint initialization in Flex Objects (fixes content aware fields)
+    * Improved Flex FolderStorage class to better hide storage specific logic
+    * Exception will output a badly formatted line in `CsvFormatter::decode()`
+1. [](#bugfix)
+    * Fixed error when activating Flex Accounts in GRAV system configuration (PHP 7.1)
+    * Fixed Grav parameter handling in `RouteFactory::createFromString()`
+
+# v1.7.0-beta.8
+## 09/19/2019
+
+1. [](#new)
+    * Added new `Security::sanitizeSVG()` function
+    * Backwards compatibility break: `FlexStorageInterface::getStoragePath()` and `getMediaPath()` can now return null
+1. [](#improved)
+    * Several FlexObject loading improvements
+    * Added `bin/grav page-system-validator [-r|--record] [-c|--check]` to test Flex Pages
+    * Improved language support for `Route` class
+1. [](#bugfix)
+    * Regression: Fixed language fallback
+    * Regression: Fixed translations when language code is used for non-language purposes
+    * Regression: Allow SVG avatar images for users
+    * Fixed error in `Session::getFlashObject()` if Flex Form is being used
+    * Fixed broken Twig `dump()`
+    * Fixed `Page::modular()` and `Page::modularTwig()` returning `null` for folders and other non-initialized pages
+    * Fixed 404 error when you click to non-routable menu item with children: redirect to the first child instead
+    * Fixed wrong `Pages::dispatch()` calls (with redirect) when we really meant to call `Pages::find()`
+    * Fixed avatars not being displayed with flex users [#2431](https://github.com/getgrav/grav/issues/2431)
+    * Fixed initial Flex Object state when creating a new objects in a form
+
+# v1.7.0-beta.7
+## 08/30/2019
+
+1. [](#improved)
+    * Improved language support
+1. [](#bugfix)
+    * `FlexForm`: Fixed some compatibility issues with Form plugin
+
+# v1.7.0-beta.6
+## 08/29/2019
+
+1. [](#new)
+    * Added experimental support for `Flex Pages` (**Flex Objects** plugin required)
+1. [](#improved)
+    * Improved `bin/grav yamllinter` CLI command by adding an option to find YAML Linting issues from the whole site or custom folder
+    * Added support for not instantiating pages, useful to speed up tasks
+    * Greatly improved speed of loading Flex collections
+1. [](#bugfix)
+    * Fixed `$page->summary()` always striping HTML tags if the summary was set by `$page->setSummary()`
+    * Fixed `Flex->getObject()` when using Flex Key
+    * Grav 1.7: Fixed enabling PHP Debug Bar causes fatal error in Gantry [#2634](https://github.com/getgrav/grav/issues/2634)
+    * Grav 1.7: Fixed broken taxonomies [#2633](https://github.com/getgrav/grav/issues/2633)
+    * Grav 1.7: Fixed unpublished blog posts being displayed on the front-end [#2650](https://github.com/getgrav/grav/issues/2650)
+
+# v1.7.0-beta.5
+## 08/11/2019
+
+1. [](#new)
+    * Added a new `bin/grav server` CLI command to easily run Symfony or PHP built-in webservers
+    * Added `hasFlexFeature()` method to test if `FlexObject` or `FlexCollection` implements a given feature
+    * Added `getFlexFeatures()` method to return all features that `FlexObject` or `FlexCollection` implements
+    * DEPRECATED `FlexDirectory::update()` and `FlexDirectory::remove()`
+    * Added `FlexStorage::getMetaData()` to get updated object meta information for listed keys
+    * Added `Language::getPageExtensions()` to get full list of supported page language extensions
+    * Added `$grav->close()` method to properly terminate the request with a response
+    * Added `Pages::getCollection()` method
+1. [](#improved)
+    * Better support for Symfony local server `symfony server:start`
+    * Make `Route` objects immutable
+    * `FlexDirectory::getObject()` can now be called without any parameters to create a new object
+    * Flex objects no longer return temporary key if they do not have one; empty key is returned instead
+    * Updated vendor libraries
+    * Moved `collection()` and `evaluate()` logic from `Page` class into `Pages` class
+1. [](#bugfix)
+    * Fixed `Form` not to use deleted flash object until the end of the request fixing issues with reset
+    * Fixed `FlexForm` to allow multiple form instances with non-existing objects
+    * Fixed `FlexObject` search by using `key`
+    * Grav 1.7: Fixed clockwork messages with arrays and objects
+
+# v1.7.0-beta.4
+## 07/01/2019
+
+1. [](#new)
+    * Updated with Grav 1.6.12 features, improvements & fixes
+    * Added new configuration option `system.debugger.censored` to hide potentially sensitive information
+    * Added new configuration option `system.languages.include_default_lang_file_extension` to keep default language in `.md` files if set to `false`
+    * Added configuration option to set fallback content languages individually for every language
+1. [](#improved)
+    * Updated Vendor libraries
+1. [](#bugfix)
+    * Fixed `.md` page to be assigned to the default language and to be listed in translated/untranslated page list
+    * Fixed `Language::getFallbackPageExtensions()` to fall back only to default language instead of going through all languages
+    * Fixed `Language::getFallbackPageExtensions()` returning wrong file extensions when passing custom page extension
+
+# v1.7.0-beta.3
+## 06/24/2019
+
+1. [](#bugfix)
+    * Fixed Clockwork on Windows machines
+    * Fixed parent field issues on Windows machines
+    * Fixed unreliable Clockwork calls in sub-folders
+
+# v1.7.0-beta.2
+## 06/21/2019
+
+1. [](#new)
+    * Updated with Grav 1.6.11 fixes
+1. [](#improved)
+    * Updated the Clockwork text
+
+# v1.7.0-beta.1
+## 06/14/2019
+
+1. [](#new)
+    * Added support for [Clockwork](https://underground.works/clockwork) developer tools (now default debugger)
+    * Added support for [Tideways XHProf](https://github.com/tideways/php-xhprof-extension) PHP Extension for profiling method calls
+    * Added Twig profiling for Clockwork debugger
+    * Added support for Twig 2.11 (compatible with Twig 1.40+)
+    * Optimization: Initialize debugbar only after the configuration has been loaded
+    * Optimization: Combine some early Grav processors into a single one
+
+# v1.6.31
+## 12/14/2020
+
+1. [](#improved)
+    * Allow all CSS and JS via `robots.txt` [#2006](https://github.com/getgrav/grav/issues/2006) [#3067](https://github.com/getgrav/grav/issues/3067)
+1. [](#bugfix)
+    * Fixed `pages` field escaping issues, needs admin update, too [admin#1990](https://github.com/getgrav/grav-plugin-admin/issues/1990)
+    * Fix `svg-image` issue with classes applied to all elements [#3068](https://github.com/getgrav/grav/issues/3068)
+
+# v1.6.30
+## 12/03/2020
+
+1. [](#bugfix)
+    * Rollback `samesite` cookie logic as it causes issues with PHP < 7.3 [#309](https://github.com/getgrav/grav/issues/3089)
+    * Fixed issue with `.travis.yml` due to GitHub API deprecated functionality
+
+# v1.6.29
+## 12/02/2020
+
+1. [](#new)
+    * Added basic support for `user/config/versions.yaml`
+1. [](#improved)
+    * Updated bundled JQuery to latest version `3.5.1`
+    * Forward a `sid` to GPM when downloading a premium package via CLI
+    * Better handling of missing repository index [grav-plugin-admin#1916](https://github.com/getgrav/grav-plugin-admin/issues/1916)
+    * Set `grav_cli` as referrer when using `Response` from CLI
+    * Add option for timeout in `self-upgrade` command [#3013](https://github.com/getgrav/grav/pull/3013)
+    * Allow to set SameSite from system.yaml [#3063](https://github.com/getgrav/grav/pull/3063)
+    * Update media.yaml with some MS Office mimetypes [#3070](https://github.com/getgrav/grav/pull/3070)
+1. [](#bugfix)
+    * Fixed hardcoded system folder in blueprints, config and language streams
+    * Added `.htaccess` rule to block attempts to use Twig in the request URL
+    * Fix compatibility with Symfony 4.2 and up. [#3048](https://github.com/getgrav/grav/pull/3048)
+    * Fix failing example custom shceduled job. [#3050](https://github.com/getgrav/grav/pull/3050)
+    * Fix for XSS advisory [GHSA-cvmr-6428-87w9](https://github.com/getgrav/grav/security/advisories/GHSA-cvmr-6428-87w9)
+    * Fix uploads_dangerous_extensions checking [#3060](https://github.com/getgrav/grav/pull/3060)
+    * Remove redundant prefixing of `.` to extension [#3060](https://github.com/getgrav/grav/pull/3060)
+    * Check exact extension in checkFilename utility [#3061](https://github.com/getgrav/grav/pull/3061)
+
+# v1.6.28
+## 10/07/2020
+
+1. [](#new)
+    * Back-ported twig `{% cache %}` tag from Grav 1.7
+    * Back-ported `Utils::fullPath()` helper function from Grav 1.7
+    * Back-ported `{{ svg_image() }}` Twig function from Grav 1.7
+    * Back-ported `Folder::countChildren()` function from Grav 1.7
+1. [](#improved)
+    * Use new `{{ theme_var() }}` enhanced logic from Grav 1.7
+    * Improved `Excerpts` class with fixes and functionality from Grav 1.7
+    * Ensure `onBlueprintCreated()` is initialized first
+    * Do not cache default `404` error page
+    * Composer update of vendor libraries
+    * Switched `Caddyfile` to use new Caddy2 syntax + improved usability
+1. [](#bugfix)
+    * Fixed Referer reference during GPM calls.
+    * Fixed fatal error with toggled lists
+
+# v1.6.27
+## 09/01/2020
+
+1. [](#improved)
+    * Right trim route for safety
+    * Use the proper ellipsis for summary [#2939](https://github.com/getgrav/grav/pull/2939)
+    * Left pad schedule times with zeros [#2921](https://github.com/getgrav/grav/pull/2921)
+
+# v1.6.26
+## 06/08/2020
+
+1. [](#improved)
+    * Added new configuration option to control the supported attributes in markdown links [#2882](https://github.com/getgrav/grav/issues/2882)
+1. [](#bugfix)
+    * Fixed blueprint for `system.pages.hide_empty_folders` [#1925](https://github.com/getgrav/grav/issues/2925)
+    * JSON Route of homepage with no ‘route’ set is valid
+    * Fix case-insensitive search of location header [form#425](https://github.com/getgrav/grav-plugin-form/issues/425)
+
+# v1.6.25
+## 05/14/2020
+
+1. [](#improved)
+    * Added system configuration support for `HTTP_X_Forwarded` headers (host disabled by default)
+    * Updated `PHPUserAgentParser` to 1.0.0
+    * Bump `Go` to version 1.13 in `travis.yaml`
+
+# v1.6.24
+## 04/27/2020
+
+1. [](#improved)
+    * Added support for `X-Forwarded-Host` [#2891](https://github.com/getgrav/grav/pull/2891)
+    * Disable XDebug in Travis builds
+
+# v1.6.23
+## 03/19/2020
+
+1. [](#new)
+    * Moved `Parsedown` 1.6 and `ParsedownExtra` 0.7 into `Grav\Framework\Parsedown` to allow fixes
+    * Added `aliases.php` with references to direct `\Parsedown` and `\ParsedownExtra` references
+1. [](#improved)
+    * Upgraded `jQuery` to latest 3.4.1 version [#2859](https://github.com/getgrav/grav/issues/2859)
+1. [](#bugfix)
+    * Fixed PHP 7.4 issue in ParsedownExtra [#2832](https://github.com/getgrav/grav/issues/2832)
+    * Fix for [user reported](https://twitter.com/OriginalSicksec) CVE path-based open redirect
+    * Fix for `stream_set_option` error with PHP 7.4 via Toolbox#28 [#2850](https://github.com/getgrav/grav/issues/2850)
+
+# v1.6.22
+## 03/05/2020
+
+1. [](#new)
+    * Added `Pages::reset()` method
+1. [](#improved)
+    * Updated Negotiation library to address issues [#2513](https://github.com/getgrav/grav/issues/2513)
+1. [](#bugfix)
+    * Fixed issue with search plugins not being able to switch between page translations
+    * Fixed issues with `Pages::baseRoute()` not picking up active language reliably
+    * Reverted `validation: strict` fix as it breaks sites, see [#1273](https://github.com/getgrav/grav/issues/1273)
+
+# v1.6.21
+## 02/11/2020
+
+1. [](#new)
+    * Added `ConsoleCommand::setLanguage()` method to set language to be used from CLI
+    * Added `ConsoleCommand::initializeGrav()` method to properly set up Grav instance to be used from CLI
+    * Added `ConsoleCommand::initializePlugins()`method to properly set up all plugins to be used from CLI
+    * Added `ConsoleCommand::initializeThemes()`method to properly set up current theme to be used from CLI
+    * Added `ConsoleCommand::initializePages()` method to properly set up pages to be used from CLI
+1. [](#improved)
+    * Vendor updates
+1. [](#bugfix)
+    * Fixed `bin/plugin` CLI calling `$themes->init()` way too early (removed it, use above methods instead)
+    * Fixed call to `$grav['page']` crashing CLI
+    * Fixed encoding problems when PHP INI setting `default_charset` is not `utf-8` [#2154](https://github.com/getgrav/grav/issues/2154)
+
+# v1.6.20
+## 02/03/2020
+
+1. [](#bugfix)
+    * Fixed incorrect routing caused by `str_replace()` in `Uri::init()` [#2754](https://github.com/getgrav/grav/issues/2754)
+    * Fixed session cookie is being set twice in the HTTP header [#2745](https://github.com/getgrav/grav/issues/2745)
+    * Fixed session not restarting if user was invalid (downgrading from Grav 1.7)
+    * Fixed filesystem iterator calls with non-existing folders
+    * Fixed `checkbox` field not being saved, requires also Form v4.0.2 [#1225](https://github.com/getgrav/grav/issues/1225)
+    * Fixed `validation: strict` not working in blueprints [#1273](https://github.com/getgrav/grav/issues/1273)
+    * Fixed `Data::filter()` removing empty fields (such as empty list) by default [#2805](https://github.com/getgrav/grav/issues/2805)
+    * Fixed fatal error with non-integer page param value [#2803](https://github.com/getgrav/grav/issues/2803)
+    * Fixed `Assets::addInlineJs()` parameter type mismatch between v1.5 and v1.6 [#2659](https://github.com/getgrav/grav/issues/2659)
+    * Fixed `site.metadata` saving issues [#2615](https://github.com/getgrav/grav/issues/2615)
+
+# v1.6.19
+## 12/04/2019
+
+1. [](#new)
+    * Catch PHP 7.4 deprecation messages and report them in debugbar instead of throwing fatal error
+1. [](#bugfix)
+    * Fixed fatal error when calling `{{ grav.undefined }}`
+    * Fixed multiple issues when there are no pages in the site
+    * PHP 7.4 fix for [#2750](https://github.com/getgrav/grav/issues/2750)
+
+# v1.6.18
+## 12/02/2019
+
+1. [](#bugfix)
+    * PHP 7.4 fix in `Pages::buildSort()`
+    * Updated vendor libraries for PHP 7.4 fixes in Twig and other libraries
+    * Fixed fatal error when `$page->id()` is null [#2731](https://github.com/getgrav/grav/pull/2731)
+    * Fixed cache conflicts on pages with no set id
+    * Fix rewrite rule for for `lighttpd` default config [#721](https://github.com/getgrav/grav/pull/2721)
+
+# v1.6.17
+## 11/06/2019
+
+1. [](#new)
+    * Added working ETag (304 Not Modified) support based on the final rendered HTML
+1. [](#improved)
+    * Safer file handling + customizable null char replacement in `CsvFormatter::decode()`
+    * Change of Behavior: `Inflector::hyphenize` will now automatically trim dashes at beginning and end of a string.
+    * Change in Behavior for `Folder::all()` so no longer fails if trying to copy non-existent dot file [#2581](https://github.com/getgrav/grav/pull/2581)
+    * renamed composer `test-plugins` script to `phpstan-plugins` to be more explicit [#2637](https://github.com/getgrav/grav/pull/2637)
+1. [](#bugfix)
+    * Fixed PHP 7.1 bug in FlexMedia
+    * Fix cache image generation when using cropResize [#2639](https://github.com/getgrav/grav/pull/2639)
+    * Fix `array_merge()` exception with non-array page header metadata [#2701](https://github.com/getgrav/grav/pull/2701)
+
+# v1.6.16
+## 09/19/2019
+
+1. [](#bugfix)
+    * Fixed Flex user creation if file storage is being used [#2444](https://github.com/getgrav/grav/issues/2444)
+    * Fixed `Badly encoded JSON data` warning when uploading files [#2663](https://github.com/getgrav/grav/issues/2663)
+
 # v1.6.15
 ## 08/20/2019
 
@@ -28,7 +1406,7 @@
     * Support new GRAV_BASEDIR environment variable [#2541](https://github.com/getgrav/grav/pull/2541)
     * Allow users to override plugin handler priorities [#2165](https://github.com/getgrav/grav/pull/2165)
 1. [](#improved)
-    * Use new `Utils::getSupportedPageTypes()` to enforce `html,htm` at the front of the list [#2531](https://github.com/getgrav/grav/issues/2531)  
+    * Use new `Utils::getSupportedPageTypes()` to enforce `html,htm` at the front of the list [#2531](https://github.com/getgrav/grav/issues/2531)
     * Updated vendor libraries
     * Markdown filter is now page-aware so that it works with modular references [admin#1731](https://github.com/getgrav/grav-plugin-admin/issues/1731)
     * Check of `GRAV_USER_INSTANCE` constant is already defined [#2621](https://github.com/getgrav/grav/pull/2621)
@@ -47,7 +1425,7 @@
     * Fixed `FlexObject::exists()` failing sometimes just after the object has been saved
     * Fixed CSV formatter not encoding strings with `"` and `,` properly
     * Fixed var order in `Validation.php` [#2610](https://github.com/getgrav/grav/issues/2610)
-    
+
 # v1.6.11
 ## 06/21/2019
 
@@ -78,7 +1456,7 @@
     * Fixed regression with `bin/plugin` not listing the plugins available (1c725c0)
     * Fixed bitwise operator in `TwigExtension::exifFunc()` [#2518](https://github.com/getgrav/grav/issues/2518)
     * Fixed issue with lang prefix incorrectly identifying as admin [#2511](https://github.com/getgrav/grav/issues/2511)
-    * Fixed issue with `U0ils::pathPrefixedBYLanguageCode()` and trailing slash [#2510](https://github.com/getgrav/grav/issues/2511) 
+    * Fixed issue with `U0ils::pathPrefixedBYLanguageCode()` and trailing slash [#2510](https://github.com/getgrav/grav/issues/2511)
     * Fixed regresssion issue of `Utils::Url()` not returning `false` on failure. Added new optional `fail_gracefully` 3rd attribute to return string that caused failure [#2524](https://github.com/getgrav/grav/issues/2524)
 
 # v1.6.9
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 42ef22d36c..99ab478bc3 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,46 +1,133 @@
+
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@getgrav.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
+at [https://www.contributor-covenant.org/translations][translations].
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[homepage]: https://www.contributor-covenant.org
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
diff --git a/LICENSE.txt b/LICENSE.txt
index cb8634f990..771734e143 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Grav
+Copyright (c) 2021 Grav
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index bf3a4820c9..f16f62b4e4 100644
--- a/README.md
+++ b/README.md
@@ -1,29 +1,32 @@
 # ![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav
 
 [![PHPStan](https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan)
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad)
 [![Discord](https://img.shields.io/discord/501836936584101899.svg?logo=discord&colorB=728ADA&label=Discord%20Chat)](https://chat.getgrav.org)
- [![Build Status](https://travis-ci.org/getgrav/grav.svg?branch=develop)](https://travis-ci.org/getgrav/grav) [![OpenCollective](https://opencollective.com/grav/backers/badge.svg)](#backers) [![OpenCollective](https://opencollective.com/grav/sponsors/badge.svg)](#sponsors)
+ [![PHP Tests](https://github.com/getgrav/grav/workflows/PHP%20Tests/badge.svg?branch=develop)](https://github.com/getgrav/grav/actions?query=workflow%3A%22PHP+Tests%22) [![OpenCollective](https://opencollective.com/grav/tiers/backers/badge.svg?label=Backers&color=brightgreen)](#backers) [![OpenCollective](https://opencollective.com/grav/tiers/supporters/badge.svg?label=Supporters&color=brightgreen)](#supporters) [![OpenCollective](https://opencollective.com/grav/tiers/sponsors/badge.svg?label=Sponsors&color=brightgreen)](#sponsors)
 
 Grav is a **Fast**, **Simple**, and **Flexible**, file-based Web-platform.  There is **Zero** installation required.  Just extract the ZIP archive, and you are already up and running.  It follows similar principles to other flat-file CMS platforms, but has a different design philosophy than most. Grav comes with a powerful **Package Management System** to allow for simple installation and upgrading of plugins and themes, as well as simple updating of Grav itself.
 
 The underlying architecture of Grav is designed to use well-established and _best-in-class_ technologies to ensure that Grav is simple to use and easy to extend. Some of these key technologies include:
 
-* [Twig Templating](https://twig.sensiolabs.org/): for powerful control of the user interface
+* [Twig Templating](https://twig.symfony.com/): for powerful control of the user interface
 * [Markdown](https://en.wikipedia.org/wiki/Markdown): for easy content creation
 * [YAML](https://yaml.org): for simple configuration
 * [Parsedown](https://parsedown.org/): for fast Markdown and Markdown Extra support
 * [Doctrine Cache](https://www.doctrine-project.org/projects/doctrine-orm/en/latest/reference/caching.html): layer for performance
-* [Pimple Dependency Injection Container](https://pimple.sensiolabs.org/): for extensibility and maintainability
+* [Pimple Dependency Injection Container](https://github.com/silexphp/Pimple): for extensibility and maintainability
 * [Symfony Event Dispatcher](https://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
 * [Symfony Console](https://symfony.com/doc/current/components/console/introduction.html): for CLI interface
 * [Gregwar Image Library](https://github.com/Gregwar/Image): for dynamic image manipulation
 
 # Requirements
 
-- PHP 7.1.3 or higher. Check the [required modules list](https://learn.getgrav.org/basics/requirements#php-requirements)
+- PHP 7.3.6 or higher. Check the [required modules list](https://learn.getgrav.org/basics/requirements#php-requirements)
 - Check the [Apache](https://learn.getgrav.org/basics/requirements#apache-requirements) or [IIS](https://learn.getgrav.org/basics/requirements#iis-requirements) requirements
 
+# Documentation
+
+The full documentation can be found from [learn.getgrav.org](https://learn.getgrav.org).
+
 # QuickStart
 
 These are the options to get Grav:
@@ -84,6 +87,11 @@ To update plugins and themes:
 $ bin/gpm update
 ```
 
+## Upgrading from older version
+
+* [Upgrading to Grav 1.7](https://learn.getgrav.org/16/advanced/grav-development/grav-17-upgrade-guide)
+* [Upgrading to Grav 1.6](https://learn.getgrav.org/16/advanced/grav-development/grav-16-upgrade-guide)
+* [Upgrading from Grav <1.6](https://learn.getgrav.org/16/advanced/grav-development/grav-15-upgrade-guide)
 
 # Contributing
 We appreciate any contribution to Grav, whether it is related to bugs, grammar, or simply a suggestion or improvement! Please refer to the [Contributing guide](CONTRIBUTING.md) for more guidance on this topic.
@@ -109,12 +117,19 @@ If you discover a possible security issue related to Grav or one of its plugins,
 * More [Awesome Grav Stuff](https://github.com/getgrav/awesome-grav)
 
 # Backers
-Support Grav with a monthly donation to help us continue development. [[Become a backer](https://opencollective.com/grav#backer)]
+Support Grav with a monthly donation to help us continue development. [[Become a backer](https://opencollective.com/grav/contribute)]
 
 <img src="https://opencollective.com/grav/tiers/backers.svg?avatarHeight=36&width=600" />
 
+
+# Supporters
+Support Grav with a monthly donation to help us continue development. [[Become a supporter](https://opencollective.com/grav/contribute)]
+
+<img src="https://opencollective.com/grav/tiers/supporters.svg?avatarHeight=36&width=600" />
+
+
 # Sponsors
-Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/grav#sponsor)]
+Support Grav with a yearly donation to help us continue development. [[Become a sponsor](https://opencollective.com/grav/contribute)]
 
 <img src="https://opencollective.com/grav/tiers/sponsors.svg?avatarHeight=36&width=600" />
 
@@ -128,7 +143,14 @@ See [LICENSE](LICENSE.txt)
 
 # Running Tests
 
-First install the dev dependencies by running `composer update` from the Grav root.
+First install the dev dependencies by running `composer install` from the Grav root.
+
 Then `composer test` will run the Unit Tests, which should be always executed successfully on any site.
 Windows users should use the `composer test-windows` command.
 You can also run a single unit test file, e.g. `composer test tests/unit/Grav/Common/AssetsTest.php`
+
+To run phpstan tests, you should run:
+
+* `composer phpstan` for global tests
+* `composer phpstan-framework` for more strict tests
+* `composer phpstan-plugins` to test all installed plugins
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..30830c7844
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+We are focusing our security updates on the following versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.7.x   | :white_check_mark: |
+| 1.6.x   | :warning:          |
+| < 1.6   | :x:                |
+
+## :warning: Versions
+
+Versions with :warning: will be supported for security issues, however you won't be able to update to them, you will need to manually update through the [`direct-install` command](https://learn.getgrav.org/17/admin-panel/tools).
+
+If you cannot update to the latest stable version available because, for example, your server does not meet the minimum PHP requirements, you can manually install a previous version by downloading the package from our Releases directory (https://github.com/getgrav/grav/releases).
+
+## Reporting a Vulnerability
+
+Please contact security@getgrav.org with a detailed explaination of the security issue found and we will work with you to get it resolved as fast as possible.
diff --git a/assets/.gitkeep b/assets/.gitkeep
index e69de29bb2..8efbf1f12e 100644
--- a/assets/.gitkeep
+++ b/assets/.gitkeep
@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
diff --git a/backup/.gitkeep b/backup/.gitkeep
index e69de29bb2..8efbf1f12e 100644
--- a/backup/.gitkeep
+++ b/backup/.gitkeep
@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
diff --git a/bin/composer.phar b/bin/composer.phar
index b8ce13f23e..f0461904b5 100755
Binary files a/bin/composer.phar and b/bin/composer.phar differ
diff --git a/bin/gpm b/bin/gpm
index 7ad1e4ac5e..12d0c3d365 100755
--- a/bin/gpm
+++ b/bin/gpm
@@ -1,9 +1,14 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 use Grav\Common\Composer;
-use Symfony\Component\Console\Application;
 use Grav\Common\Grav;
+use Grav\Console\Application\GpmApplication;
 
 \define('GRAV_CLI', true);
 \define('GRAV_REQUEST_TIME', microtime(true));
@@ -20,13 +25,12 @@ if (!file_exists(__DIR__ . '/../vendor/autoload.php')){
 
 $autoload = require __DIR__ . '/../vendor/autoload.php';
 
-if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
-    exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
-}
+// Set timezone to default, falls back to system if php.ini not set
+date_default_timezone_set(@date_default_timezone_get());
 
-if (!ini_get('date.timezone')) {
-    date_default_timezone_set('UTC');
-}
+// Set internal encoding.
+@ini_set('default_charset', 'UTF-8');
+mb_internal_encoding('UTF-8');
 
 if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
@@ -36,37 +40,7 @@ if (!function_exists('curl_version')) {
     exit('FATAL: GPM requires PHP Curl module to be installed');
 }
 
-$climate = new League\CLImate\CLImate;
-$climate->arguments->add([
-    'environment' => [
-        'prefix'        => 'e',
-        'longPrefix'    => 'env',
-        'description'   => 'Configuration Environment',
-        'defaultValue'  => 'localhost'
-    ]
-]);
-$climate->arguments->parse();
-
-// Set up environment based on params.
-$environment = $climate->arguments->get('environment');
-
 $grav = Grav::instance(array('loader' => $autoload));
-$grav->setup($environment);
-
-$grav['config']->init();
-$grav['uri']->init();
-$grav['users'];
-
-$app = new Application('Grav Package Manager', GRAV_VERSION);
-$app->addCommands(array(
-    new \Grav\Console\Gpm\IndexCommand(),
-    new \Grav\Console\Gpm\VersionCommand(),
-    new \Grav\Console\Gpm\InfoCommand(),
-    new \Grav\Console\Gpm\InstallCommand(),
-    new \Grav\Console\Gpm\UninstallCommand(),
-    new \Grav\Console\Gpm\UpdateCommand(),
-    new \Grav\Console\Gpm\SelfupgradeCommand(),
-    new \Grav\Console\Gpm\DirectInstallCommand(),
-));
 
+$app = new GpmApplication('Grav Package Manager', GRAV_VERSION);
 $app->run();
diff --git a/bin/grav b/bin/grav
index 7120218c06..1bcba715a3 100755
--- a/bin/grav
+++ b/bin/grav
@@ -1,10 +1,14 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 use Grav\Common\Composer;
 use Grav\Common\Grav;
-use League\CLImate\CLImate;
-use Symfony\Component\Console\Application;
+use Grav\Console\Application\GravApplication;
 
 \define('GRAV_CLI', true);
 \define('GRAV_REQUEST_TIME', microtime(true));
@@ -21,47 +25,18 @@ if (!file_exists(__DIR__ . '/../vendor/autoload.php')){
 
 $autoload = require __DIR__ . '/../vendor/autoload.php';
 
-if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
-    exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
-}
-
-$climate = new League\CLImate\CLImate;
-$climate->arguments->add([
-    'environment' => [
-        'prefix'        => 'e',
-        'longPrefix'    => 'env',
-        'description'   => 'Configuration Environment',
-        'defaultValue'  => 'localhost'
-    ]
-]);
-$climate->arguments->parse();
+// Set timezone to default, falls back to system if php.ini not set
+date_default_timezone_set(@date_default_timezone_get());
 
-// Set up environment based on params.
-$environment = $climate->arguments->get('environment');
+// Set internal encoding.
+@ini_set('default_charset', 'UTF-8');
+mb_internal_encoding('UTF-8');
 
 $grav = Grav::instance(array('loader' => $autoload));
-$grav->setup($environment);
-
-if (!ini_get('date.timezone')) {
-    date_default_timezone_set('UTC');
-}
 
 if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
-$app = new Application('Grav CLI Application', GRAV_VERSION);
-$app->addCommands(array(
-    new \Grav\Console\Cli\InstallCommand(),
-    new \Grav\Console\Cli\ComposerCommand(),
-    new \Grav\Console\Cli\SandboxCommand(),
-    new \Grav\Console\Cli\CleanCommand(),
-    new \Grav\Console\Cli\ClearCacheCommand(),
-    new \Grav\Console\Cli\BackupCommand(),
-    new \Grav\Console\Cli\NewProjectCommand(),
-    new \Grav\Console\Cli\SchedulerCommand(),
-    new \Grav\Console\Cli\SecurityCommand(),
-    new \Grav\Console\Cli\LogViewerCommand(),
-    new \Grav\Console\Cli\YamlLinterCommand(),
-));
+$app = new GravApplication('Grav CLI Application', GRAV_VERSION);
 $app->run();
diff --git a/bin/plugin b/bin/plugin
index 3c431e379c..4a36838580 100755
--- a/bin/plugin
+++ b/bin/plugin
@@ -1,13 +1,14 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 use Grav\Common\Composer;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Grav\Common\Grav;
-use Grav\Common\Filesystem\Folder;
+use Grav\Console\Application\PluginApplication;
 
 \define('GRAV_CLI', true);
 \define('GRAV_REQUEST_TIME', microtime(true));
@@ -24,127 +25,19 @@ if (!file_exists(__DIR__ . '/../vendor/autoload.php')){
 
 $autoload = require __DIR__ . '/../vendor/autoload.php';
 
-if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
-    exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
-}
+// Set timezone to default, falls back to system if php.ini not set
+date_default_timezone_set(@date_default_timezone_get());
 
-if (!ini_get('date.timezone')) {
-    date_default_timezone_set('UTC');
-}
+// Set internal encoding.
+@ini_set('default_charset', 'UTF-8');
+mb_internal_encoding('UTF-8');
 
 if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
-$climate = new League\CLImate\CLImate;
-$climate->arguments->add([
-    'environment' => [
-        'prefix'        => 'e',
-        'longPrefix'    => 'env',
-        'description'   => 'Configuration Environment',
-        'defaultValue'  => 'localhost'
-    ]
-]);
-$climate->arguments->parse();
-
-$environment = $climate->arguments->get('environment');
-
+// Bootstrap Grav container.
 $grav = Grav::instance(array('loader' => $autoload));
-$grav->setup($environment);
-
-$grav['config']->init();
-$grav['uri']->init();
-$grav['users'];
-$grav['plugins']->init();
-$grav['themes']->init();
-
-$app     = new Application('Grav Plugins Commands', GRAV_VERSION);
-$pattern = '([A-Z]\w+Command\.php)';
-
-// get arguments and  strip the application name
-if (null === $argv) {
-    $argv = $_SERVER['argv'];
-}
-
-$bin  = array_shift($argv);
-$name = array_shift($argv);
-$argv = array_merge([$bin], $argv);
-
-$input = new ArgvInput($argv);
-
-/** @var \Grav\Common\Data\Data $plugin */
-$plugin = $grav['plugins']->get($name);
-
-$output = new ConsoleOutput();
-$output->getFormatter()->setStyle('red', new OutputFormatterStyle('red', null, array('bold')));
-$output->getFormatter()->setStyle('white', new OutputFormatterStyle('white', null, array('bold')));
-
-if (!$name) {
-    $output->writeln('');
-    $output->writeln('<red>Usage:</red>');
-    $output->writeln("  {$bin} [slug] [command] [arguments]");
-    $output->writeln('');
-    $output->writeln('<red>Example:</red>');
-    $output->writeln("  {$bin} error log -l 1 --trace");
-    $list = Folder::all('plugins://', ['compare' => 'Pathname', 'pattern' => '/\/cli\/' . $pattern . '$/usm', 'levels' => 2]);
-
-    $total = 0;
-    if (count($list)) {
-        $available = [];
-        $output->writeln('');
-        $output->writeln('<red>Plugins with CLI available:</red>');
-        foreach ($list as $index => $entry) {
-            $split = explode('/', $entry);
-            $entry = array_shift($split);
-            $index = str_pad($index++ + 1, 2, '0', STR_PAD_LEFT);
-            $total = str_pad($total++ + 1, 2, '0', STR_PAD_LEFT);
-            if (\in_array($entry, $available, true)) {
-                $total--;
-                continue;
-            }
-
-            $available[] = $entry;
-            $commands_count = $index - $total + 1;
-            $output->writeln('  ' . $total . '. <red>' . str_pad($entry, 15) . "</red> <white>{$bin} {$entry} list</white>");
-        }
-    }
-
-    exit;
-} else {
-    if (is_null($plugin)) {
-        $output->writeln('');
-        $output->writeln("<red>$name plugin not found</red>");
-        die;
-    }
-
-    if (!$plugin->enabled) {
-        $output->writeln('');
-        $output->writeln("<red>$name not enabled</red>");
-        die;
-    }
-}
-
-if ($plugin === null) {
-    $output->writeln("<red>Grav Plugin <white>'{$name}'</white> is not installed</red>");
-    exit;
-}
-
-$path = 'plugins://' . $name . '/cli';
-
-try {
-    $commands = Folder::all($path, ['compare' => 'Filename', 'pattern' => '/' . $pattern . '$/usm', 'levels' => 1]);
-} catch (\RuntimeException $e) {
-    $output->writeln("<red>No Console Commands for <white>'{$name}'</white> where found in <white>'{$path}'</white></red>");
-    exit;
-}
-
-foreach ($commands as $command_path) {
-    $full_path = $grav['locator']->findResource("plugins://{$name}/cli/{$command_path}");
-    require_once $full_path;
-
-    $command_class = 'Grav\Plugin\Console\\' . preg_replace('/.php$/', '', $command_path);
-    $command = new $command_class();
-    $app->add($command);
-}
 
-$app->run($input);
+$app = new PluginApplication('Grav Plugins Commands', GRAV_VERSION);
+$app->run();
diff --git a/cache/.gitkeep b/cache/.gitkeep
index e69de29bb2..8efbf1f12e 100644
--- a/cache/.gitkeep
+++ b/cache/.gitkeep
@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
diff --git a/codeception.yml b/codeception.yml
index f74c7504be..4b41baa97f 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -1,4 +1,5 @@
 actor: Tester
+bootstrap: _bootstrap.php
 paths:
     tests: tests
     log: tests/_output
@@ -6,7 +7,6 @@ paths:
     support: tests/_support
     envs: tests/_envs
 settings:
-    bootstrap: _bootstrap.php
     colors: true
     memory_limit: 1024M
 extensions:
diff --git a/composer.json b/composer.json
index 60ca21a617..cf446dad68 100644
--- a/composer.json
+++ b/composer.json
@@ -2,99 +2,124 @@
     "name": "getgrav/grav",
     "type": "project",
     "description": "Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS",
-    "keywords": ["cms","flat-file cms","flat cms","flatfile cms","php"],
+    "keywords": [
+        "cms",
+        "flat-file cms",
+        "flat cms",
+        "flatfile cms",
+        "php"
+    ],
     "homepage": "https://getgrav.org",
     "license": "MIT",
     "require": {
-        "php": ">=7.1.3",
+        "php": "^7.3.6 || ^8.0",
         "ext-json": "*",
-        "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-curl": "*",
         "ext-zip": "*",
         "ext-dom": "*",
-        "symfony/polyfill-iconv": "^1.9",
-        "symfony/polyfill-php72": "^1.9",
-        "symfony/polyfill-php73": "^1.9",
-
+        "ext-libxml": "*",
+        "ext-gd": "*",
+        "symfony/polyfill-mbstring": "~1.23",
+        "symfony/polyfill-iconv": "^1.23",
+        "symfony/polyfill-php74": "^1.23",
+        "symfony/polyfill-php80": "^1.23",
+        "symfony/polyfill-php81": "^1.23",
         "psr/simple-cache": "^1.0",
         "psr/http-message": "^1.0",
         "psr/http-server-middleware": "^1.0",
-
-        "kodus/psr7-server": "*",
-        "nyholm/psr7": "^1.0",
-
-        "twig/twig": "~1.40",
-        "erusev/parsedown": "1.6.4",
-        "erusev/parsedown-extra": "~0.7",
-        "symfony/yaml": "~4.2.0",
-        "symfony/console": "~4.2.0",
-        "symfony/event-dispatcher": "~4.2.0",
-        "symfony/var-dumper": "~4.2.0",
-        "symfony/process": "~4.2.0",
-        "doctrine/cache": "^1.8",
-        "doctrine/collections": "^1.5",
-        "guzzlehttp/psr7": "^1.4",
-        "filp/whoops": "~2.2",
-
+        "psr/container": "~1.1.0",
+        "nyholm/psr7-server": "^1.0",
+        "nyholm/psr7": "^1.3",
+        "twig/twig": "~v1.44",
+        "erusev/parsedown": "^1.7",
+        "erusev/parsedown-extra": "~0.8",
+        "symfony/contracts": "~1.1",
+        "symfony/yaml": "~4.4",
+        "symfony/console": "~4.4",
+        "symfony/event-dispatcher": "~4.4",
+        "symfony/var-dumper": "~4.4",
+        "symfony/process": "~4.4",
+        "doctrine/cache": "^1.10",
+        "doctrine/collections": "^1.6",
+        "guzzlehttp/psr7": "^1.7",
+        "filp/whoops": "~2.9",
         "matthiasmullie/minify": "^1.3",
-        "monolog/monolog": "~1.0",
-        "gregwar/image": "2.*",
-        "donatj/phpuseragentparser": "~0.10",
-        "pimple/pimple": "~3.2",
-        "rockettheme/toolbox": "~1.4",
-        "maximebf/debugbar": "~1.15",
-        "league/climate": "^3.4",
-        "antoligy/dom-string-iterators": "^1.0",
-        "miljar/php-exif": "^0.6.4",
-        "composer/ca-bundle": "^1.0",
+        "monolog/monolog": "~1.25",
+        "getgrav/image": "^3.0",
+        "getgrav/cache": "^2.0",
+        "donatj/phpuseragentparser": "~1.1",
+        "pimple/pimple": "~3.5.0",
+        "rockettheme/toolbox": "~1.5",
+        "maximebf/debugbar": "~1.16",
+        "league/climate": "^3.6",
+        "miljar/php-exif": "^0.6",
+        "composer/ca-bundle": "^1.2",
         "dragonmantank/cron-expression": "^1.2",
-        "phive/twig-extensions-deferred": "^1.0",
-        "willdurand/negotiation": "^2.3"
+        "willdurand/negotiation": "^3.0",
+        "itsgoingd/clockwork": "^5.0",
+        "symfony/http-client": "^4.4",
+        "composer/semver": "^1.4",
+        "rhukster/dom-sanitizer": "^1.0",
+        "multiavatar/multiavatar-php": "^1.0"
     },
     "require-dev": {
-        "codeception/codeception": "^2.4",
-        "phpstan/phpstan": "^0.11",
-        "phpstan/phpstan-deprecation-rules": "^0.11.0",
-        "phpunit/php-code-coverage": "~6.0",
-        "fzaninotto/faker": "^1.8",
-        "victorjonsson/markdowndocs": "dev-master"
+        "codeception/codeception": "^4.1",
+        "phpstan/phpstan": "^1.8",
+        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpunit/php-code-coverage": "~9.2",
+        "getgrav/markdowndocs": "^2.0",
+        "codeception/module-asserts": "^1.3",
+        "codeception/module-phpbrowser": "^1.0",
+        "symfony/service-contracts": "*"
+    },
+    "replace": {
+        "symfony/polyfill-php72": "*",
+        "symfony/polyfill-php73": "*"
     },
     "suggest": {
+        "ext-mbstring": "Recommended for better performance",
+        "ext-iconv": "Recommended for better performance",
         "ext-zend-opcache": "Recommended for better performance",
         "ext-intl": "Recommended for multi-language sites",
         "ext-memcache": "Needed to support Memcache servers",
         "ext-memcached": "Needed to support Memcached servers",
-        "ext-redis": "Needed to support Redis servers"
+        "ext-redis": "Needed to support Redis servers",
+        "ext-exif": "Needed to use exif data from images."
     },
     "config": {
         "apcu-autoloader": true,
         "platform": {
-            "php": "7.1.3"
+            "php": "7.3.6"
         }
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator"
-        }
-    ],
     "autoload": {
         "psr-4": {
-            "Grav\\": "system/src/Grav"
+            "Grav\\": "system/src/Grav",
+            "Twig\\": "system/src/Twig"
         },
-        "files": ["system/defines.php"]
+        "files": [
+            "system/defines.php",
+            "system/src/DOMLettersIterator.php",
+            "system/src/DOMWordsIterator.php"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "PHPStan\\": "tests/phpstan/classes"
+        }
     },
     "archive": {
-        "exclude": ["VERSION"]
+        "exclude": [
+            "VERSION"
+        ]
     },
     "scripts": {
-        "api-16": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.16.md",
-        "api-15": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.md",
+        "api-17": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.17.md",
         "post-create-project-cmd": "bin/grav install",
-        "phpstan": "vendor/bin/phpstan analyse -l 2 -c ./tests/phpstan/phpstan.neon system/src --memory-limit=256M",
-        "phpstan-framework": "vendor/bin/phpstan analyse -l 5 -c ./tests/phpstan/phpstan.neon system/src/Grav/Framework --memory-limit=256M",
-        "test-plugins": "vendor/bin/phpstan analyse -l 0 -c ./tests/phpstan/plugins.neon user/plugins --memory-limit=256M",
+        "phpstan": "vendor/bin/phpstan analyse -l 2 -c ./tests/phpstan/phpstan.neon --memory-limit=720M system/src",
+        "phpstan-framework": "vendor/bin/phpstan analyse -l 5 -c ./tests/phpstan/phpstan.neon --memory-limit=480M system/src/Grav/Framework system/src/Grav/Events system/src/Grav/Installer",
+        "phpstan-plugins": "vendor/bin/phpstan analyse -l 1 -c ./tests/phpstan/plugins.neon --memory-limit=400M user/plugins",
         "test": "vendor/bin/codecept run unit",
         "test-windows": "vendor\\bin\\codecept run unit"
     },
diff --git a/composer.lock b/composer.lock
index 647b0810f7..7851fde762 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,75 +4,103 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "171fc8a6af028b50024e0f5f8c3eca82",
+    "content-hash": "3b106a4d1a271673896d67cbdc8623e1",
     "packages": [
         {
-            "name": "antoligy/dom-string-iterators",
-            "version": "v1.0.1",
+            "name": "composer/ca-bundle",
+            "version": "1.3.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/antoligy/dom-string-iterators.git",
-                "reference": "fae88f66e1970d68c5585fc42db44f1217bf74e6"
+                "url": "https://github.com/composer/ca-bundle.git",
+                "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/antoligy/dom-string-iterators/zipball/fae88f66e1970d68c5585fc42db44f1217bf74e6",
-                "reference": "fae88f66e1970d68c5585fc42db44f1217bf74e6",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/30897edbfb15e784fe55587b4f73ceefd3c4d98c",
+                "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "ext-openssl": "*",
+                "ext-pcre": "*",
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.55",
+                "psr/log": "^1.0",
+                "symfony/phpunit-bridge": "^4.2 || ^5",
+                "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "": "src/"
+                    "Composer\\CaBundle\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "CC0-1.0"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Alex Wilson",
-                    "email": "a@ax.gy"
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
+            "keywords": [
+                "cabundle",
+                "cacert",
+                "certificate",
+                "ssl",
+                "tls"
+            ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/ca-bundle/issues",
+                "source": "https://github.com/composer/ca-bundle/tree/1.3.3"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
                 },
                 {
-                    "name": "Kornel Lesinski",
-                    "email": "pornel@pornel.net"
+                    "url": "https://github.com/composer",
+                    "type": "github"
                 },
                 {
-                    "name": "Patrick Galbraith",
-                    "email": "patrick.j.galbraith@gmail.com"
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
                 }
             ],
-            "description": "Composer package for DOMWordsIterator and DOMLettersIterator",
-            "time": "2018-02-03T16:01:11+00:00"
+            "time": "2022-07-20T07:14:26+00:00"
         },
         {
-            "name": "composer/ca-bundle",
-            "version": "1.2.3",
+            "name": "composer/semver",
+            "version": "1.7.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "f26a67e397be0e5c00d7c52ec7b5010098e15ce5"
+                "url": "https://github.com/composer/semver.git",
+                "reference": "647490bbcaf7fc4891c58f47b825eb99d19c377a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/f26a67e397be0e5c00d7c52ec7b5010098e15ce5",
-                "reference": "f26a67e397be0e5c00d7c52ec7b5010098e15ce5",
+                "url": "https://api.github.com/repos/composer/semver/zipball/647490bbcaf7fc4891c58f47b825eb99d19c377a",
+                "reference": "647490bbcaf7fc4891c58f47b825eb99d19c377a",
                 "shasum": ""
             },
             "require": {
-                "ext-openssl": "*",
-                "ext-pcre": "*",
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
-                "psr/log": "^1.0",
-                "symfony/process": "^2.5 || ^3.0 || ^4.0"
+                "phpunit/phpunit": "^4.5 || ^5.0.5"
             },
             "type": "library",
             "extra": {
@@ -82,7 +110,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Composer\\CaBundle\\": "src"
+                    "Composer\\Semver\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -90,58 +118,85 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
                 {
                     "name": "Jordi Boggiano",
                     "email": "j.boggiano@seld.be",
                     "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
                 }
             ],
-            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
             "keywords": [
-                "cabundle",
-                "cacert",
-                "certificate",
-                "ssl",
-                "tls"
+                "semantic",
+                "semver",
+                "validation",
+                "versioning"
             ],
-            "time": "2019-08-02T09:05:43+00:00"
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/semver/issues",
+                "source": "https://github.com/composer/semver/tree/1.7.2"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-12-03T15:47:16+00:00"
         },
         {
             "name": "doctrine/cache",
-            "version": "v1.8.0",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57"
+                "reference": "56cd022adb5514472cb144c087393c1821911d09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57",
-                "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/56cd022adb5514472cb144c087393c1821911d09",
+                "reference": "56cd022adb5514472cb144c087393c1821911d09",
                 "shasum": ""
             },
             "require": {
-                "php": "~7.1"
+                "php": "~7.1 || ^8.0"
             },
             "conflict": {
                 "doctrine/common": ">2.2,<2.4"
             },
             "require-dev": {
                 "alcaeus/mongo-php-adapter": "^1.1",
-                "doctrine/coding-standard": "^4.0",
+                "cache/integration-tests": "dev-master",
+                "doctrine/coding-standard": "^9",
                 "mongodb/mongodb": "^1.1",
-                "phpunit/phpunit": "^7.0",
-                "predis/predis": "~1.0"
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "predis/predis": "~1.0",
+                "psr/cache": "^1.0 || ^2.0 || ^3.0",
+                "symfony/cache": "^4.4 || ^5.4 || ^6",
+                "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
             },
             "suggest": {
                 "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
@@ -152,6 +207,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -160,10 +219,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -173,43 +228,64 @@
                     "email": "schmittjoh@gmail.com"
                 }
             ],
-            "description": "Caching library offering an object-oriented API for many cache backends",
-            "homepage": "https://www.doctrine-project.org",
+            "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
+            "homepage": "https://www.doctrine-project.org/projects/cache.html",
             "keywords": [
+                "abstraction",
+                "apcu",
                 "cache",
-                "caching"
+                "caching",
+                "couchdb",
+                "memcached",
+                "php",
+                "redis",
+                "xcache"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/cache/issues",
+                "source": "https://github.com/doctrine/cache/tree/1.13.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
+                    "type": "tidelift"
+                }
             ],
-            "time": "2018-08-21T18:01:43+00:00"
+            "time": "2022-05-20T20:06:54+00:00"
         },
         {
             "name": "doctrine/collections",
-            "version": "v1.6.2",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/collections.git",
-                "reference": "c5e0bc17b1620e97c968ac409acbff28b8b850be"
+                "reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/c5e0bc17b1620e97c968ac409acbff28b8b850be",
-                "reference": "c5e0bc17b1620e97c968ac409acbff28b8b850be",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/2b44dd4cbca8b5744327de78bafef5945c7e7b5e",
+                "reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "doctrine/deprecations": "^0.5.3 || ^1",
+                "php": "^7.1.3 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "phpstan/phpstan-shim": "^0.9.2",
-                "phpunit/phpunit": "^7.0",
-                "vimeo/psalm": "^3.2.2"
+                "doctrine/coding-standard": "^9.0 || ^10.0",
+                "phpstan/phpstan": "^1.4.8",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5",
+                "vimeo/psalm": "^4.22"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
@@ -220,6 +296,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -228,10 +308,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -249,35 +325,86 @@
                 "iterators",
                 "php"
             ],
-            "time": "2019-06-09T13:48:14+00:00"
+            "support": {
+                "issues": "https://github.com/doctrine/collections/issues",
+                "source": "https://github.com/doctrine/collections/tree/1.8.0"
+            },
+            "time": "2022-09-01T20:12:10+00:00"
+        },
+        {
+            "name": "doctrine/deprecations",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/deprecations.git",
+                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1|^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^9",
+                "phpunit/phpunit": "^7.5|^8.5|^9.5",
+                "psr/log": "^1|^2|^3"
+            },
+            "suggest": {
+                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
+            "homepage": "https://www.doctrine-project.org/",
+            "support": {
+                "issues": "https://github.com/doctrine/deprecations/issues",
+                "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
+            },
+            "time": "2022-05-02T15:47:09+00:00"
         },
         {
             "name": "donatj/phpuseragentparser",
-            "version": "v0.13.0",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/donatj/PhpUserAgent.git",
-                "reference": "5f2da266d2a386f9b231d4344ae37baf7a467c2d"
+                "reference": "a35900b93530715f8669c10e49756adde5c8e6fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/donatj/PhpUserAgent/zipball/5f2da266d2a386f9b231d4344ae37baf7a467c2d",
-                "reference": "5f2da266d2a386f9b231d4344ae37baf7a467c2d",
+                "url": "https://api.github.com/repos/donatj/PhpUserAgent/zipball/a35900b93530715f8669c10e49756adde5c8e6fc",
+                "reference": "a35900b93530715f8669c10e49756adde5c8e6fc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.4.0"
             },
             "require-dev": {
-                "camspiers/json-pretty": "0.1.*",
+                "camspiers/json-pretty": "~1.0",
                 "donatj/drop": "*",
-                "phpunit/phpunit": "~4.8"
+                "ext-json": "*",
+                "phpunit/phpunit": "~4.8|~9"
             },
             "type": "library",
             "autoload": {
                 "files": [
                     "src/UserAgentParser.php"
-                ]
+                ],
+                "psr-4": {
+                    "donatj\\UserAgent\\": "src/UserAgent"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -286,13 +413,13 @@
             "authors": [
                 {
                     "name": "Jesse G. Donat",
-                    "role": "Developer",
                     "email": "donatj@gmail.com",
-                    "homepage": "http://donatstudios.com"
+                    "homepage": "https://donatstudios.com",
+                    "role": "Developer"
                 }
             ],
             "description": "Lightning fast, minimalist PHP UserAgent string parser.",
-            "homepage": "http://donatstudios.com/PHP-Parser-HTTP_USER_AGENT",
+            "homepage": "https://donatstudios.com/PHP-Parser-HTTP_USER_AGENT",
             "keywords": [
                 "browser",
                 "browser detection",
@@ -300,7 +427,21 @@
                 "user agent",
                 "useragent"
             ],
-            "time": "2019-03-08T20:52:23+00:00"
+            "support": {
+                "issues": "https://github.com/donatj/PhpUserAgent/issues",
+                "source": "https://github.com/donatj/PhpUserAgent/tree/v1.7.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/donatj/15",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/donatj",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-08-06T15:41:58+00:00"
         },
         {
             "name": "dragonmantank/cron-expression",
@@ -344,23 +485,27 @@
                 "cron",
                 "schedule"
             ],
+            "support": {
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v1.2.0"
+            },
             "time": "2017-01-23T04:29:33+00:00"
         },
         {
             "name": "erusev/parsedown",
-            "version": "1.6.4",
+            "version": "1.7.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/erusev/parsedown.git",
-                "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548"
+                "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/fbe3fe878f4fe69048bb8a52783a09802004f548",
-                "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
+                "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
                 "shasum": ""
             },
             "require": {
+                "ext-mbstring": "*",
                 "php": ">=5.3.0"
             },
             "require-dev": {
@@ -389,24 +534,31 @@
                 "markdown",
                 "parser"
             ],
-            "time": "2017-11-14T20:44:03+00:00"
+            "support": {
+                "issues": "https://github.com/erusev/parsedown/issues",
+                "source": "https://github.com/erusev/parsedown/tree/1.7.x"
+            },
+            "time": "2019-12-30T22:54:17+00:00"
         },
         {
             "name": "erusev/parsedown-extra",
-            "version": "0.7.1",
+            "version": "0.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/erusev/parsedown-extra.git",
-                "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c"
+                "reference": "91ac3ff98f0cea243bdccc688df43810f044dcef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/0db5cce7354e4b76f155d092ab5eb3981c21258c",
-                "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c",
+                "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/91ac3ff98f0cea243bdccc688df43810f044dcef",
+                "reference": "91ac3ff98f0cea243bdccc688df43810f044dcef",
                 "shasum": ""
             },
             "require": {
-                "erusev/parsedown": "~1.4"
+                "erusev/parsedown": "^1.7.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35"
             },
             "type": "library",
             "autoload": {
@@ -433,30 +585,34 @@
                 "parsedown",
                 "parser"
             ],
-            "time": "2015-11-01T10:19:22+00:00"
+            "support": {
+                "issues": "https://github.com/erusev/parsedown-extra/issues",
+                "source": "https://github.com/erusev/parsedown-extra/tree/0.8.x"
+            },
+            "time": "2019-12-30T23:20:37+00:00"
         },
         {
             "name": "filp/whoops",
-            "version": "2.5.0",
+            "version": "2.14.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "cde50e6720a39fdacb240159d3eea6865d51fd96"
+                "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/cde50e6720a39fdacb240159d3eea6865d51fd96",
-                "reference": "cde50e6720a39fdacb240159d3eea6865d51fd96",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
+                "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9 || ^7.0",
-                "psr/log": "^1.0.1"
+                "php": "^5.5.9 || ^7.0 || ^8.0",
+                "psr/log": "^1.0.1 || ^2.0 || ^3.0"
             },
             "require-dev": {
                 "mockery/mockery": "^0.9 || ^1.0",
-                "phpunit/phpunit": "^4.8.35 || ^5.7",
-                "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0"
+                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
+                "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
             },
             "suggest": {
                 "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -465,7 +621,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
@@ -480,8 +636,8 @@
             "authors": [
                 {
                     "name": "Filipe Dobreira",
-                    "role": "Developer",
-                    "homepage": "https://github.com/filp"
+                    "homepage": "https://github.com/filp",
+                    "role": "Developer"
                 }
             ],
             "description": "php error handling for cool kids",
@@ -494,21 +650,31 @@
                 "throwable",
                 "whoops"
             ],
-            "time": "2019-08-07T09:00:00+00:00"
+            "support": {
+                "issues": "https://github.com/filp/whoops/issues",
+                "source": "https://github.com/filp/whoops/tree/2.14.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/denis-sokolov",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-01-07T12:00:00+00:00"
         },
         {
-            "name": "gregwar/cache",
-            "version": "v1.0.12",
+            "name": "getgrav/cache",
+            "version": "v2.0.0",
             "target-dir": "Gregwar/Cache",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Gregwar/Cache.git",
-                "reference": "305d0f5a12c0beecbbd7e1de236f59f39e0c0ac3"
+                "url": "https://github.com/getgrav/Cache.git",
+                "reference": "56fd63f752779928fcd1074ab7d12f406dde8861"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Gregwar/Cache/zipball/305d0f5a12c0beecbbd7e1de236f59f39e0c0ac3",
-                "reference": "305d0f5a12c0beecbbd7e1de236f59f39e0c0ac3",
+                "url": "https://api.github.com/repos/getgrav/Cache/zipball/56fd63f752779928fcd1074ab7d12f406dde8861",
+                "reference": "56fd63f752779928fcd1074ab7d12f406dde8861",
                 "shasum": ""
             },
             "require": {
@@ -528,6 +694,11 @@
                 {
                     "name": "Gregwar",
                     "email": "g.passault@gmail.com"
+                },
+                {
+                    "name": "Grav CMS",
+                    "email": "hello@getgrav.org",
+                    "homepage": "https://getgrav.org"
                 }
             ],
             "description": "A lightweight file-system cache system",
@@ -537,27 +708,30 @@
                 "file-system",
                 "system"
             ],
-            "time": "2016-09-23T08:16:04+00:00"
+            "support": {
+                "source": "https://github.com/getgrav/Cache/tree/v2.0.0"
+            },
+            "time": "2021-04-20T05:48:00+00:00"
         },
         {
-            "name": "gregwar/image",
-            "version": "v2.0.25",
+            "name": "getgrav/image",
+            "version": "v3.0.0",
             "target-dir": "Gregwar/Image",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Gregwar/Image.git",
-                "reference": "03534d5760cbea5c96e6292041ff81a3bb205c36"
+                "url": "https://github.com/getgrav/Image.git",
+                "reference": "02c1bb2c179dd894c4f6610c9c49da364ee7d264"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Gregwar/Image/zipball/03534d5760cbea5c96e6292041ff81a3bb205c36",
-                "reference": "03534d5760cbea5c96e6292041ff81a3bb205c36",
+                "url": "https://api.github.com/repos/getgrav/Image/zipball/02c1bb2c179dd894c4f6610c9c49da364ee7d264",
+                "reference": "02c1bb2c179dd894c4f6610c9c49da364ee7d264",
                 "shasum": ""
             },
             "require": {
                 "ext-gd": "*",
-                "gregwar/cache": "^1.0.6",
-                "php": "^5.3 || ^7.0"
+                "getgrav/cache": "^2.0",
+                "php": "^5.6 || ^7.0 || ^8.0"
             },
             "require-dev": {
                 "sllh/php-cs-fixer-styleci-bridge": "~1.0",
@@ -581,6 +755,11 @@
                     "name": "Grégoire Passault",
                     "email": "g.passault@gmail.com",
                     "homepage": "http://www.gregwar.com/"
+                },
+                {
+                    "name": "Grav CMS",
+                    "email": "hello@getgrav.org",
+                    "homepage": "https://getgrav.org"
                 }
             ],
             "description": "Image handling",
@@ -589,20 +768,23 @@
                 "gd",
                 "image"
             ],
-            "time": "2019-03-01T15:55:29+00:00"
+            "support": {
+                "source": "https://github.com/getgrav/Image/tree/v3.0.0"
+            },
+            "time": "2021-04-20T05:50:18+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.6.1",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
                 "shasum": ""
             },
             "require": {
@@ -615,37 +797,58 @@
             },
             "require-dev": {
                 "ext-zlib": "*",
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
             },
             "suggest": {
-                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
                 },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
                 {
                     "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
                     "homepage": "https://github.com/Tobion"
                 }
             ],
@@ -660,39 +863,58 @@
                 "uri",
                 "url"
             ],
-            "time": "2019-07-01T23:21:34+00:00"
+            "support": {
+                "issues": "https://github.com/guzzle/psr7/issues",
+                "source": "https://github.com/guzzle/psr7/tree/1.9.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-06-20T21:43:03+00:00"
         },
         {
-            "name": "kodus/psr7-server",
-            "version": "1.0.1",
+            "name": "itsgoingd/clockwork",
+            "version": "v5.1.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/kodus/psr7-server.git",
-                "reference": "dcfd0116451b0f0e7c6b23b831757ed288347278"
+                "url": "https://github.com/itsgoingd/clockwork.git",
+                "reference": "74ee05a61296aa7298164ef5346f0a568aa6106e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kodus/psr7-server/zipball/dcfd0116451b0f0e7c6b23b831757ed288347278",
-                "reference": "dcfd0116451b0f0e7c6b23b831757ed288347278",
+                "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/74ee05a61296aa7298164ef5346f0a568aa6106e",
+                "reference": "74ee05a61296aa7298164ef5346f0a568aa6106e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
-                "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0"
-            },
-            "replace": {
-                "nyholm/psr7-server": "^0.3"
-            },
-            "require-dev": {
-                "nyholm/nsa": "^1.1",
-                "nyholm/psr7": "^1.0",
-                "phpunit/phpunit": "^7.0"
+                "ext-json": "*",
+                "php": ">=5.6"
             },
             "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Clockwork\\Support\\Laravel\\ClockworkServiceProvider"
+                    ],
+                    "aliases": {
+                        "Clockwork": "Clockwork\\Support\\Laravel\\Facade"
+                    }
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "Nyholm\\Psr7Server\\": "src/"
+                    "Clockwork\\": "Clockwork/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -701,45 +923,57 @@
             ],
             "authors": [
                 {
-                    "name": "Tobias Nyholm",
-                    "email": "tobias.nyholm@gmail.com"
-                },
-                {
-                    "name": "Martijn van der Ven",
-                    "email": "martijn@vanderven.se"
+                    "name": "itsgoingd",
+                    "email": "itsgoingd@luzer.sk",
+                    "homepage": "https://twitter.com/itsgoingd"
                 }
             ],
-            "description": "Helper classes to handle PSR-7 server requests",
-            "homepage": "http://tnyholm.se",
+            "description": "php dev tools in your browser",
+            "homepage": "https://underground.works/clockwork",
             "keywords": [
-                "psr-17",
-                "psr-7"
+                "Devtools",
+                "debugging",
+                "laravel",
+                "logging",
+                "lumen",
+                "profiling",
+                "slim"
+            ],
+            "support": {
+                "issues": "https://github.com/itsgoingd/clockwork/issues",
+                "source": "https://github.com/itsgoingd/clockwork/tree/v5.1.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/itsgoingd",
+                    "type": "github"
+                }
             ],
-            "time": "2019-06-17T10:48:13+00:00"
+            "time": "2022-09-25T20:21:14+00:00"
         },
         {
             "name": "league/climate",
-            "version": "3.5.0",
+            "version": "3.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/climate.git",
-                "reference": "0d2fdbf8829f60f6ba6433df68d6f3fe1271b8e6"
+                "reference": "a785a3ac8f584eed4abd45e4e16fe64c46659a28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/climate/zipball/0d2fdbf8829f60f6ba6433df68d6f3fe1271b8e6",
-                "reference": "0d2fdbf8829f60f6ba6433df68d6f3fe1271b8e6",
+                "url": "https://api.github.com/repos/thephpleague/climate/zipball/a785a3ac8f584eed4abd45e4e16fe64c46659a28",
+                "reference": "a785a3ac8f584eed4abd45e4e16fe64c46659a28",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
-                "psr/log": "^1.0",
+                "php": "^7.3 || ^8.0",
+                "psr/log": "^1.0 || ^2.0 || ^3.0",
                 "seld/cli-prompt": "^1.0"
             },
             "require-dev": {
-                "mikey179/vfsstream": "^1.4",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^5.7.16"
+                "mikey179/vfsstream": "^1.6.10",
+                "mockery/mockery": "^1.4.2",
+                "phpunit/phpunit": "^9.5.10"
             },
             "suggest": {
                 "ext-mbstring": "If ext-mbstring is not available you MUST install symfony/polyfill-mbstring"
@@ -755,17 +989,17 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Craig Duncan",
-                    "role": "Developer",
-                    "email": "git@duncanc.co.uk",
-                    "homepage": "https://github.com/duncan3dc"
-                },
                 {
                     "name": "Joe Tannenbaum",
-                    "role": "Developer",
                     "email": "hey@joe.codes",
-                    "homepage": "http://joe.codes/"
+                    "homepage": "http://joe.codes/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Craig Duncan",
+                    "email": "git@duncanc.co.uk",
+                    "homepage": "https://github.com/duncan3dc",
+                    "role": "Developer"
                 }
             ],
             "description": "PHP's best friend for the terminal. CLImate allows you to easily output colored text, special formats, and more.",
@@ -776,20 +1010,24 @@
                 "php",
                 "terminal"
             ],
-            "time": "2019-02-10T18:25:19+00:00"
+            "support": {
+                "issues": "https://github.com/thephpleague/climate/issues",
+                "source": "https://github.com/thephpleague/climate/tree/3.8.2"
+            },
+            "time": "2022-06-18T14:42:08+00:00"
         },
         {
             "name": "matthiasmullie/minify",
-            "version": "1.3.61",
+            "version": "1.3.69",
             "source": {
                 "type": "git",
                 "url": "https://github.com/matthiasmullie/minify.git",
-                "reference": "d5acb8ce5b6acb7d11bafe97cecc533f6e4fd751"
+                "reference": "a61c949cccd086808063611ef9698eabe42ef22f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/d5acb8ce5b6acb7d11bafe97cecc533f6e4fd751",
-                "reference": "d5acb8ce5b6acb7d11bafe97cecc533f6e4fd751",
+                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/a61c949cccd086808063611ef9698eabe42ef22f",
+                "reference": "a61c949cccd086808063611ef9698eabe42ef22f",
                 "shasum": ""
             },
             "require": {
@@ -799,8 +1037,8 @@
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "~2.0",
-                "matthiasmullie/scrapbook": "~1.0",
-                "phpunit/phpunit": "~4.8"
+                "matthiasmullie/scrapbook": "dev-master",
+                "phpunit/phpunit": ">=4.8"
             },
             "suggest": {
                 "psr/cache-implementation": "Cache implementation to use with Minify::cache"
@@ -822,9 +1060,9 @@
             "authors": [
                 {
                     "name": "Matthias Mullie",
-                    "role": "Developer",
                     "email": "minify@mullie.eu",
-                    "homepage": "http://www.mullie.eu"
+                    "homepage": "http://www.mullie.eu",
+                    "role": "Developer"
                 }
             ],
             "description": "CSS & JavaScript minifier, in PHP. Removes whitespace, strips comments, combines files (incl. @import statements and small assets in CSS files), and optimizes/shortens a few common programming patterns.",
@@ -836,20 +1074,30 @@
                 "minifier",
                 "minify"
             ],
-            "time": "2018-11-26T23:10:39+00:00"
+            "support": {
+                "issues": "https://github.com/matthiasmullie/minify/issues",
+                "source": "https://github.com/matthiasmullie/minify/tree/1.3.69"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/matthiasmullie",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-08-01T09:00:18+00:00"
         },
         {
             "name": "matthiasmullie/path-converter",
-            "version": "1.1.2",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/matthiasmullie/path-converter.git",
-                "reference": "5e4b121c8b9f97c80835c1d878b0812ba1d607c9"
+                "reference": "e7d13b2c7e2f2268e1424aaed02085518afa02d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/5e4b121c8b9f97c80835c1d878b0812ba1d607c9",
-                "reference": "5e4b121c8b9f97c80835c1d878b0812ba1d607c9",
+                "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/e7d13b2c7e2f2268e1424aaed02085518afa02d9",
+                "reference": "e7d13b2c7e2f2268e1424aaed02085518afa02d9",
                 "shasum": ""
             },
             "require": {
@@ -872,9 +1120,9 @@
             "authors": [
                 {
                     "name": "Matthias Mullie",
-                    "role": "Developer",
                     "email": "pathconverter@mullie.eu",
-                    "homepage": "http://www.mullie.eu"
+                    "homepage": "http://www.mullie.eu",
+                    "role": "Developer"
                 }
             ],
             "description": "Relative path converter",
@@ -885,29 +1133,34 @@
                 "paths",
                 "relative"
             ],
-            "time": "2018-10-25T15:19:41+00:00"
+            "support": {
+                "issues": "https://github.com/matthiasmullie/path-converter/issues",
+                "source": "https://github.com/matthiasmullie/path-converter/tree/1.1.3"
+            },
+            "time": "2019-02-05T23:41:09+00:00"
         },
         {
             "name": "maximebf/debugbar",
-            "version": "v1.15.0",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07"
+                "reference": "ba0af68dd4316834701ecb30a00ce9604ced3ee9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
-                "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/ba0af68dd4316834701ecb30a00ce9604ced3ee9",
+                "reference": "ba0af68dd4316834701ecb30a00ce9604ced3ee9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0",
-                "psr/log": "^1.0",
-                "symfony/var-dumper": "^2.6|^3.0|^4.0"
+                "php": "^7.1|^8",
+                "psr/log": "^1|^2|^3",
+                "symfony/var-dumper": "^2.6|^3|^4|^5|^6"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0|^5.0"
+                "phpunit/phpunit": "^7.5.20 || ^9.4.2",
+                "twig/twig": "^1.38|^2.7|^3.0"
             },
             "suggest": {
                 "kriswallsmith/assetic": "The best way to manage assets",
@@ -917,7 +1170,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.14-dev"
+                    "dev-master": "1.18-dev"
                 }
             },
             "autoload": {
@@ -946,7 +1199,11 @@
                 "debug",
                 "debugbar"
             ],
-            "time": "2017-12-15T11:13:46+00:00"
+            "support": {
+                "issues": "https://github.com/maximebf/php-debugbar/issues",
+                "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.1"
+            },
+            "time": "2022-03-31T14:55:54+00:00"
         },
         {
             "name": "miljar/php-exif",
@@ -990,8 +1247,8 @@
             "authors": [
                 {
                     "name": "Tom Van Herreweghe",
-                    "role": "Developer",
-                    "homepage": "http://theanalogguy.be"
+                    "homepage": "http://theanalogguy.be",
+                    "role": "Developer"
                 }
             ],
             "description": "Object-Oriented EXIF parsing",
@@ -1002,20 +1259,24 @@
                 "jpeg",
                 "tiff"
             ],
+            "support": {
+                "issues": "https://github.com/PHPExif/php-exif/issues",
+                "source": "https://github.com/PHPExif/php-exif/tree/v0.6.5"
+            },
             "time": "2019-02-11T13:47:52+00:00"
         },
         {
             "name": "monolog/monolog",
-            "version": "1.24.0",
+            "version": "1.27.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
+                "reference": "904713c5929655dc9b97288b69cfeedad610c9a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
-                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/904713c5929655dc9b97288b69cfeedad610c9a1",
+                "reference": "904713c5929655dc9b97288b69cfeedad610c9a1",
                 "shasum": ""
             },
             "require": {
@@ -1029,11 +1290,10 @@
                 "aws/aws-sdk-php": "^2.4.9 || ^3.0",
                 "doctrine/couchdb": "~1.0@dev",
                 "graylog2/gelf-php": "~1.0",
-                "jakub-onderka/php-parallel-lint": "0.9",
                 "php-amqplib/php-amqplib": "~2.4",
                 "php-console/php-console": "^3.1.3",
+                "phpstan/phpstan": "^0.12.59",
                 "phpunit/phpunit": "~4.5",
-                "phpunit/phpunit-mock-objects": "2.3.0",
                 "ruflin/elastica": ">=0.90 <3.0",
                 "sentry/sentry": "^0.13",
                 "swiftmailer/swiftmailer": "^5.3|^6.0"
@@ -1052,11 +1312,6 @@
                 "sentry/sentry": "Allow sending log messages to a Sentry server"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Monolog\\": "src/Monolog"
@@ -1080,24 +1335,85 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2018-11-05T09:00:11+00:00"
+            "support": {
+                "issues": "https://github.com/Seldaek/monolog/issues",
+                "source": "https://github.com/Seldaek/monolog/tree/1.27.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Seldaek",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-06-09T08:53:42+00:00"
+        },
+        {
+            "name": "multiavatar/multiavatar-php",
+            "version": "v1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/multiavatar/multiavatar-php.git",
+                "reference": "13a62a656b1c2ca1c62dee57b4c1d8a3b04e6574"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/multiavatar/multiavatar-php/zipball/13a62a656b1c2ca1c62dee57b4c1d8a3b04e6574",
+                "reference": "13a62a656b1c2ca1c62dee57b4c1d8a3b04e6574",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "Multiavatar.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "proprietary"
+            ],
+            "authors": [
+                {
+                    "name": "Gie Katon",
+                    "homepage": "https://giekaton.com"
+                }
+            ],
+            "description": "Multicultural Avatar Generator",
+            "homepage": "https://multiavatar.com",
+            "keywords": [
+                "avatar",
+                "creator",
+                "generator",
+                "image",
+                "maker",
+                "picture",
+                "profile"
+            ],
+            "support": {
+                "issues": "https://github.com/multiavatar/multiavatar-php/issues",
+                "source": "https://github.com/multiavatar/multiavatar-php/tree/v1.0.5"
+            },
+            "time": "2021-03-02T07:33:46+00:00"
         },
         {
             "name": "nyholm/psr7",
-            "version": "1.1.0",
+            "version": "1.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Nyholm/psr7.git",
-                "reference": "701fe7ea8c12c07b985b156d589134d328160cf7"
+                "reference": "f734364e38a876a23be4d906a2a089e1315be18a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Nyholm/psr7/zipball/701fe7ea8c12c07b985b156d589134d328160cf7",
-                "reference": "701fe7ea8c12c07b985b156d589134d328160cf7",
+                "url": "https://api.github.com/repos/Nyholm/psr7/zipball/f734364e38a876a23be4d906a2a089e1315be18a",
+                "reference": "f734364e38a876a23be4d906a2a089e1315be18a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
+                "php": ">=7.1",
                 "php-http/message-factory": "^1.0",
                 "psr/http-factory": "^1.0",
                 "psr/http-message": "^1.0"
@@ -1107,14 +1423,15 @@
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "http-interop/http-factory-tests": "dev-master",
-                "php-http/psr7-integration-tests": "dev-master",
-                "phpunit/phpunit": "^7.5"
+                "http-interop/http-factory-tests": "^0.9",
+                "php-http/psr7-integration-tests": "^1.0",
+                "phpunit/phpunit": "^7.5 || 8.5 || 9.4",
+                "symfony/error-handler": "^4.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "1.4-dev"
                 }
             },
             "autoload": {
@@ -1137,34 +1454,55 @@
                 }
             ],
             "description": "A fast PHP7 implementation of PSR-7",
-            "homepage": "http://tnyholm.se",
+            "homepage": "https://tnyholm.se",
             "keywords": [
                 "psr-17",
                 "psr-7"
             ],
-            "time": "2019-02-16T17:20:43+00:00"
+            "support": {
+                "issues": "https://github.com/Nyholm/psr7/issues",
+                "source": "https://github.com/Nyholm/psr7/tree/1.5.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Zegnat",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nyholm",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-06-22T07:13:36+00:00"
         },
         {
-            "name": "phive/twig-extensions-deferred",
-            "version": "v1.0.2",
+            "name": "nyholm/psr7-server",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/rybakit/twig-deferred-extension.git",
-                "reference": "5a2426d622afa74034e754ca5ea1d1ff7887627f"
+                "url": "https://github.com/Nyholm/psr7-server.git",
+                "reference": "b846a689844cef114e8079d8c80f0afd96745ae3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rybakit/twig-deferred-extension/zipball/5a2426d622afa74034e754ca5ea1d1ff7887627f",
-                "reference": "5a2426d622afa74034e754ca5ea1d1ff7887627f",
+                "url": "https://api.github.com/repos/Nyholm/psr7-server/zipball/b846a689844cef114e8079d8c80f0afd96745ae3",
+                "reference": "b846a689844cef114e8079d8c80f0afd96745ae3",
                 "shasum": ""
             },
             "require": {
-                "twig/twig": "~1.18"
+                "php": "^7.1 || ^8.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0"
+            },
+            "require-dev": {
+                "nyholm/nsa": "^1.1",
+                "nyholm/psr7": "^1.3",
+                "phpunit/phpunit": "^7.0 || ^8.5 || ^9.3"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Phive\\Twig\\Extensions\\Deferred\\": "src/"
+                    "Nyholm\\Psr7Server\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1173,19 +1511,35 @@
             ],
             "authors": [
                 {
-                    "name": "Eugene Leonovich",
-                    "email": "gen.work@gmail.com"
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com"
+                },
+                {
+                    "name": "Martijn van der Ven",
+                    "email": "martijn@vanderven.se"
                 }
             ],
-            "description": "An extension for Twig that allows to defer block rendering",
-            "homepage": "https://github.com/rybakit/twig-extensions-deferred",
+            "description": "Helper classes to handle PSR-7 server requests",
+            "homepage": "http://tnyholm.se",
             "keywords": [
-                "defer",
-                "extension",
-                "lazy",
-                "twig"
+                "psr-17",
+                "psr-7"
+            ],
+            "support": {
+                "issues": "https://github.com/Nyholm/psr7-server/issues",
+                "source": "https://github.com/Nyholm/psr7-server/tree/1.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Zegnat",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nyholm",
+                    "type": "github"
+                }
             ],
-            "time": "2017-03-17T21:39:21+00:00"
+            "time": "2021-05-12T11:11:27+00:00"
         },
         {
             "name": "php-http/message-factory",
@@ -1235,33 +1589,37 @@
                 "stream",
                 "uri"
             ],
+            "support": {
+                "issues": "https://github.com/php-http/message-factory/issues",
+                "source": "https://github.com/php-http/message-factory/tree/master"
+            },
             "time": "2015-12-19T14:08:53+00:00"
         },
         {
             "name": "pimple/pimple",
-            "version": "v3.2.3",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silexphp/Pimple.git",
-                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32"
+                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32",
-                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
+                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0",
-                "psr/container": "^1.0"
+                "php": ">=7.2.5",
+                "psr/container": "^1.1 || ^2.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^3.2"
+                "symfony/phpunit-bridge": "^5.4@dev"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2.x-dev"
+                    "dev-master": "3.4.x-dev"
                 }
             },
             "autoload": {
@@ -1280,12 +1638,15 @@
                 }
             ],
             "description": "Pimple, a simple Dependency Injection Container",
-            "homepage": "http://pimple.sensiolabs.org",
+            "homepage": "https://pimple.symfony.com",
             "keywords": [
                 "container",
                 "dependency injection"
             ],
-            "time": "2018-01-21T07:42:36+00:00"
+            "support": {
+                "source": "https://github.com/silexphp/Pimple/tree/v3.5.0"
+            },
+            "time": "2021-10-28T11:13:42+00:00"
         },
         {
             "name": "psr/cache",
@@ -1331,31 +1692,29 @@
                 "psr",
                 "psr-6"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/cache/tree/master"
+            },
             "time": "2016-08-06T20:24:11+00:00"
         },
         {
             "name": "psr/container",
-            "version": "1.0.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.2.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -1368,7 +1727,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -1380,7 +1739,11 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
+            "time": "2021-03-05T17:36:06+00:00"
         },
         {
             "name": "psr/http-factory",
@@ -1432,6 +1795,9 @@
                 "request",
                 "response"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory/tree/master"
+            },
             "time": "2019-04-30T12:38:16+00:00"
         },
         {
@@ -1482,6 +1848,9 @@
                 "request",
                 "response"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/master"
+            },
             "time": "2016-08-06T14:39:51+00:00"
         },
         {
@@ -1535,6 +1904,10 @@
                 "response",
                 "server"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/http-server-handler/issues",
+                "source": "https://github.com/php-fig/http-server-handler/tree/master"
+            },
             "time": "2018-10-30T16:46:14+00:00"
         },
         {
@@ -1588,20 +1961,24 @@
                 "request",
                 "response"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/http-server-middleware/issues",
+                "source": "https://github.com/php-fig/http-server-middleware/tree/master"
+            },
             "time": "2018-10-30T17:12:04+00:00"
         },
         {
             "name": "psr/log",
-            "version": "1.1.0",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
@@ -1610,7 +1987,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -1625,7 +2002,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -1635,7 +2012,10 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2018-11-20T15:27:04+00:00"
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -1683,6 +2063,9 @@
                 "psr-16",
                 "simple-cache"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/simple-cache/tree/master"
+            },
             "time": "2017-10-23T01:57:42+00:00"
         },
         {
@@ -1723,45 +2106,94 @@
                 }
             ],
             "description": "A polyfill for getallheaders.",
+            "support": {
+                "issues": "https://github.com/ralouphie/getallheaders/issues",
+                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+            },
             "time": "2019-03-08T08:55:37+00:00"
         },
+        {
+            "name": "rhukster/dom-sanitizer",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rhukster/dom-sanitizer.git",
+                "reference": "4db3ef1ac3d5505d044c5eb12aa106ba745bf129"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rhukster/dom-sanitizer/zipball/4db3ef1ac3d5505d044c5eb12aa106ba745bf129",
+                "reference": "4db3ef1ac3d5505d044c5eb12aa106ba745bf129",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Rhukster\\DomSanitizer\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andy Miller",
+                    "email": "rhuk@rhuk.net"
+                }
+            ],
+            "description": "A simple but effective DOM/SVG/MathML Sanitizer for PHP 7.4+",
+            "support": {
+                "issues": "https://github.com/rhukster/dom-sanitizer/issues",
+                "source": "https://github.com/rhukster/dom-sanitizer/tree/1.0.6"
+            },
+            "time": "2021-09-30T15:41:33+00:00"
+        },
         {
             "name": "rockettheme/toolbox",
-            "version": "1.4.6",
+            "version": "1.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rockettheme/toolbox.git",
-                "reference": "e7010c2a956aff241dfa100ab8aef5b6cf83892a"
+                "reference": "99448a20a2f78d6480035d72821ecb9e4dc17032"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/e7010c2a956aff241dfa100ab8aef5b6cf83892a",
-                "reference": "e7010c2a956aff241dfa100ab8aef5b6cf83892a",
+                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/99448a20a2f78d6480035d72821ecb9e4dc17032",
+                "reference": "99448a20a2f78d6480035d72821ecb9e4dc17032",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "php": ">=5.4.0",
-                "pimple/pimple": "~3.0",
-                "symfony/event-dispatcher": ">2.5",
-                "symfony/yaml": ">2.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~6"
+                "php": ">=5.6.0",
+                "pimple/pimple": "^3.0",
+                "symfony/event-dispatcher": "^3.4|^4.0",
+                "symfony/yaml": "^3.4|^4.0|^5.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "RocketTheme\\Toolbox\\ArrayTraits\\": "ArrayTraits/src",
-                    "RocketTheme\\Toolbox\\Blueprints\\": "Blueprints/src",
-                    "RocketTheme\\Toolbox\\Compat\\": "Compat/src",
                     "RocketTheme\\Toolbox\\DI\\": "DI/src",
-                    "RocketTheme\\Toolbox\\Event\\": "Event/src",
                     "RocketTheme\\Toolbox\\File\\": "File/src",
-                    "RocketTheme\\Toolbox\\ResourceLocator\\": "ResourceLocator/src",
+                    "RocketTheme\\Toolbox\\Event\\": "Event/src",
+                    "RocketTheme\\Toolbox\\Compat\\": "Compat/src",
                     "RocketTheme\\Toolbox\\Session\\": "Session/src",
-                    "RocketTheme\\Toolbox\\StreamWrapper\\": "StreamWrapper/src"
-                }
+                    "RocketTheme\\Toolbox\\Blueprints\\": "Blueprints/src",
+                    "RocketTheme\\Toolbox\\ArrayTraits\\": "ArrayTraits/src",
+                    "RocketTheme\\Toolbox\\StreamWrapper\\": "StreamWrapper/src",
+                    "RocketTheme\\Toolbox\\ResourceLocator\\": "ResourceLocator/src"
+                },
+                "exclude-from-classmap": [
+                    "**/tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1773,25 +2205,32 @@
                 "php",
                 "rockettheme"
             ],
-            "time": "2019-03-20T19:59:17+00:00"
+            "support": {
+                "issues": "https://github.com/rockettheme/toolbox/issues",
+                "source": "https://github.com/rockettheme/toolbox/tree/1.6.2"
+            },
+            "time": "2022-06-14T16:24:33+00:00"
         },
         {
             "name": "seld/cli-prompt",
-            "version": "1.0.3",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/cli-prompt.git",
-                "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd"
+                "reference": "b8dfcf02094b8c03b40322c229493bb2884423c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd",
-                "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd",
+                "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/b8dfcf02094b8c03b40322c229493bb2884423c5",
+                "reference": "b8dfcf02094b8c03b40322c229493bb2884423c5",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3"
             },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.63"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1821,41 +2260,51 @@
                 "input",
                 "prompt"
             ],
-            "time": "2017-03-18T11:32:45+00:00"
+            "support": {
+                "issues": "https://github.com/Seldaek/cli-prompt/issues",
+                "source": "https://github.com/Seldaek/cli-prompt/tree/1.0.4"
+            },
+            "time": "2020-12-15T21:32:01+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v4.2.11",
+            "version": "v4.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "fc2e274aade6567a750551942094b2145ade9b6c"
+                "reference": "28b77970939500fb04180166a1f716e75a871ef8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/fc2e274aade6567a750551942094b2145ade9b6c",
-                "reference": "fc2e274aade6567a750551942094b2145ade9b6c",
+                "url": "https://api.github.com/repos/symfony/console/zipball/28b77970939500fb04180166a1f716e75a871ef8",
+                "reference": "28b77970939500fb04180166a1f716e75a871ef8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
-                "symfony/contracts": "^1.0",
-                "symfony/polyfill-mbstring": "~1.0"
+                "php": ">=7.1.3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php73": "^1.8",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.1|^2"
             },
             "conflict": {
+                "psr/log": ">=3",
                 "symfony/dependency-injection": "<3.4",
+                "symfony/event-dispatcher": "<4.3|>=5",
+                "symfony/lock": "<4.4",
                 "symfony/process": "<3.3"
             },
             "provide": {
-                "psr/log-implementation": "1.0"
+                "psr/log-implementation": "1.0|2.0"
             },
             "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.4|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~3.4|~4.0",
-                "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.4|~4.0"
+                "psr/log": "^1|^2",
+                "symfony/config": "^3.4|^4.0|^5.0",
+                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+                "symfony/event-dispatcher": "^4.3",
+                "symfony/lock": "^4.4|^5.0",
+                "symfony/process": "^3.4|^4.0|^5.0",
+                "symfony/var-dumper": "^4.3|^5.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -1864,11 +2313,6 @@
                 "symfony/process": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Console\\": ""
@@ -1891,27 +2335,44 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Console Component",
+            "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
-            "time": "2019-07-24T17:13:20+00:00"
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v4.4.45"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-08-17T14:50:19+00:00"
         },
         {
             "name": "symfony/contracts",
-            "version": "v1.1.5",
+            "version": "v1.1.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/contracts.git",
-                "reference": "3f3f796d5f24a098a9da62828b8daa1b11494c1b"
+                "reference": "9e27f5c175ecbd6fff554d839ff4a432da797168"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/contracts/zipball/3f3f796d5f24a098a9da62828b8daa1b11494c1b",
-                "reference": "3f3f796d5f24a098a9da62828b8daa1b11494c1b",
+                "url": "https://api.github.com/repos/symfony/contracts/zipball/9e27f5c175ecbd6fff554d839ff4a432da797168",
+                "reference": "9e27f5c175ecbd6fff554d839ff4a432da797168",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
-                "psr/cache": "^1.0",
+                "php": ">=7.1.3",
+                "psr/cache": "^1.0|^2.0|^3.0",
                 "psr/container": "^1.0"
             },
             "replace": {
@@ -1935,7 +2396,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-main": "1.1-dev"
                 }
             },
             "autoload": {
@@ -1970,46 +2431,66 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-06-20T06:46:26+00:00"
+            "support": {
+                "source": "https://github.com/symfony/contracts/tree/v1.1.13"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-06-27T13:16:42+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.2.11",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "852548c7c704f14d2f6700c8d872a05bd2028732"
+                "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/852548c7c704f14d2f6700c8d872a05bd2028732",
-                "reference": "852548c7c704f14d2f6700c8d872a05bd2028732",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1e866e9e5c1b22168e0ce5f0b467f19bba61266a",
+                "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
-                "symfony/contracts": "^1.0"
+                "php": ">=7.1.3",
+                "symfony/event-dispatcher-contracts": "^1.1",
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "symfony/dependency-injection": "<3.4"
             },
+            "provide": {
+                "psr/event-dispatcher-implementation": "1.0",
+                "symfony/event-dispatcher-implementation": "1.1"
+            },
             "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.4|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/expression-language": "~3.4|~4.0",
-                "symfony/stopwatch": "~3.4|~4.0"
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^3.4|^4.0|^5.0",
+                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+                "symfony/error-handler": "~3.4|~4.4",
+                "symfony/expression-language": "^3.4|^4.0|^5.0",
+                "symfony/http-foundation": "^3.4|^4.0|^5.0",
+                "symfony/service-contracts": "^1.1|^2",
+                "symfony/stopwatch": "^3.4|^4.0|^5.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
                 "symfony/http-kernel": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\EventDispatcher\\": ""
@@ -2032,42 +2513,71 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony EventDispatcher Component",
+            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
-            "time": "2019-06-26T06:46:55+00:00"
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.44"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-07-20T09:59:04+00:00"
         },
         {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.12.0",
+            "name": "symfony/http-client",
+            "version": "v4.4.46",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+                "url": "https://github.com/symfony/http-client.git",
+                "reference": "095274039721d26d23225d7b7ba441423b1b2413"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/095274039721d26d23225d7b7ba441423b1b2413",
+                "reference": "095274039721d26d23225d7b7ba441423b1b2413",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1.3",
+                "psr/log": "^1|^2|^3",
+                "symfony/http-client-contracts": "^1.1.10|^2",
+                "symfony/polyfill-php73": "^1.11",
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.0|^2"
             },
-            "suggest": {
-                "ext-ctype": "For best performance"
+            "provide": {
+                "php-http/async-client-implementation": "*",
+                "php-http/client-implementation": "*",
+                "psr/http-client-implementation": "1.0",
+                "symfony/http-client-implementation": "1.1|2.0"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.12-dev"
-                }
+            "require-dev": {
+                "guzzlehttp/promises": "^1.4",
+                "nyholm/psr7": "^1.0",
+                "php-http/httplug": "^1.0|^2.0",
+                "psr/http-client": "^1.0",
+                "symfony/dependency-injection": "^4.3|^5.0",
+                "symfony/http-kernel": "^4.4.13",
+                "symfony/process": "^4.2|^5.0"
             },
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
+                    "Symfony\\Component\\HttpClient\\": ""
                 },
-                "files": [
-                    "bootstrap.php"
+                "exclude-from-classmap": [
+                    "/Tests/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2076,57 +2586,75 @@
             ],
             "authors": [
                 {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for ctype functions",
+            "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
             "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
+            "support": {
+                "source": "https://github.com/symfony/http-client/tree/v4.4.46"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "time": "2022-09-04T17:31:03+00:00"
         },
         {
-            "name": "symfony/polyfill-iconv",
-            "version": "v1.12.0",
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "685968b11e61a347c18bf25db32effa478be610f"
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/685968b11e61a347c18bf25db32effa478be610f",
-                "reference": "685968b11e61a347c18bf25db32effa478be610f",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-ctype": "*"
             },
             "suggest": {
-                "ext-iconv": "For best performance"
+                "ext-ctype": "For best performance"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.26-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Iconv\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2134,58 +2662,164 @@
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for the Iconv extension",
+            "description": "Symfony polyfill for ctype functions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
-                "iconv",
+                "ctype",
                 "polyfill",
-                "portable",
-                "shim"
+                "portable"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.12.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
             },
-            "dist": {
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-24T11:49:31+00:00"
+        },
+        {
+            "name": "symfony/polyfill-iconv",
+            "version": "v1.26.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-iconv.git",
+                "reference": "143f1881e655bebca1312722af8068de235ae5dc"
+            },
+            "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
-                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc",
+                "reference": "143f1881e655bebca1312722af8068de235ae5dc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-iconv": "*"
             },
             "suggest": {
-                "ext-mbstring": "For best performance"
+                "ext-iconv": "For best performance"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.26-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
+                    "Symfony\\Polyfill\\Iconv\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Iconv extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "iconv",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-24T11:49:31+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.26.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.26-dev"
                 },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2210,37 +2844,141 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.12.0",
+            "name": "symfony/polyfill-php74",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "04ce3335667451138df4307d6a9b61565560199e"
+                "url": "https://github.com/symfony/polyfill-php74.git",
+                "reference": "ad4f7d62a17b1187d9f381f0a662aab19ff3c033"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e",
-                "reference": "04ce3335667451138df4307d6a9b61565560199e",
+                "url": "https://api.github.com/repos/symfony/polyfill-php74/zipball/ad4f7d62a17b1187d9f381f0a662aab19ff3c033",
+                "reference": "ad4f7d62a17b1187d9f381f0a662aab19ff3c033",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.26-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
+                    "Symfony\\Polyfill\\Php74\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.4+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php74/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-24T11:49:31+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.26.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.26-dev"
                 },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
                 "files": [
                     "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2248,6 +2986,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
                 {
                     "name": "Nicolas Grekas",
                     "email": "p@tchwork.com"
@@ -2257,7 +2999,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -2265,38 +3007,59 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-10T07:21:04+00:00"
         },
         {
-            "name": "symfony/polyfill-php73",
-            "version": "v1.12.0",
+            "name": "symfony/polyfill-php81",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188"
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/2ceb49eaccb9352bff54d22570276bb75ba4a188",
-                "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1",
+                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.26-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -2315,7 +3078,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -2323,31 +3086,44 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v4.2.11",
+            "version": "v4.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2"
+                "reference": "5cee9cdc4f7805e2699d9fd66991a0e6df8252a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2",
-                "reference": "808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2",
+                "url": "https://api.github.com/repos/symfony/process/zipball/5cee9cdc4f7805e2699d9fd66991a0e6df8252a2",
+                "reference": "5cee9cdc4f7805e2699d9fd66991a0e6df8252a2",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.1.3",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Process\\": ""
@@ -2370,28 +3146,46 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Process Component",
+            "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
-            "time": "2019-05-30T16:06:08+00:00"
+            "support": {
+                "source": "https://github.com/symfony/process/tree/v4.4.44"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-06-27T13:16:42+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v4.2.11",
+            "version": "v4.4.46",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "4e18e041a477edbb8c54e053f179672f9413816c"
+                "reference": "90425fd98d1ecad98e4b2dca9f54f62069193b15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4e18e041a477edbb8c54e053f179672f9413816c",
-                "reference": "4e18e041a477edbb8c54e053f179672f9413816c",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/90425fd98d1ecad98e4b2dca9f54f62069193b15",
+                "reference": "90425fd98d1ecad98e4b2dca9f54f62069193b15",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": ">=7.1.3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php72": "~1.5"
+                "symfony/polyfill-php72": "~1.5",
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
@@ -2399,9 +3193,9 @@
             },
             "require-dev": {
                 "ext-iconv": "*",
-                "symfony/console": "~3.4|~4.0",
-                "symfony/process": "~3.4|~4.0",
-                "twig/twig": "~1.34|~2.4"
+                "symfony/console": "^3.4|^4.0|^5.0",
+                "symfony/process": "^4.4|^5.0",
+                "twig/twig": "^1.43|^2.13|^3.0.4"
             },
             "suggest": {
                 "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
@@ -2412,11 +3206,6 @@
                 "Resources/bin/var-dump-server"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "Resources/functions/dump.php"
@@ -2442,47 +3231,59 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony mechanism for exploring and dumping PHP variables",
+            "description": "Provides mechanisms for walking through any arbitrary PHP variable",
             "homepage": "https://symfony.com",
             "keywords": [
                 "debug",
                 "dump"
             ],
-            "time": "2019-07-27T06:42:33+00:00"
+            "support": {
+                "source": "https://github.com/symfony/var-dumper/tree/v4.4.46"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-09-03T23:07:25+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.2.11",
+            "version": "v4.4.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "9468fef6f1c740b96935e9578560a9e9189ca154"
+                "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/9468fef6f1c740b96935e9578560a9e9189ca154",
-                "reference": "9468fef6f1c740b96935e9578560a9e9189ca154",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d",
+                "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": ">=7.1.3",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
                 "symfony/console": "<3.4"
             },
             "require-dev": {
-                "symfony/console": "~3.4|~4.0"
+                "symfony/console": "^3.4|^4.0|^5.0"
             },
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Yaml\\": ""
@@ -2505,37 +3306,53 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Yaml Component",
+            "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
-            "time": "2019-07-24T14:47:26+00:00"
+            "support": {
+                "source": "https://github.com/symfony/yaml/tree/v4.4.45"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-08-02T15:47:23+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v1.42.2",
+            "version": "v1.44.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "21707d6ebd05476854805e4f91b836531941bcd4"
+                "reference": "0887422319889e442458e48e2f3d9add1a172ad5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/21707d6ebd05476854805e4f91b836531941bcd4",
-                "reference": "21707d6ebd05476854805e4f91b836531941bcd4",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/0887422319889e442458e48e2f3d9add1a172ad5",
+                "reference": "0887422319889e442458e48e2f3d9add1a172ad5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0",
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "require-dev": {
                 "psr/container": "^1.0",
-                "symfony/debug": "^2.7",
-                "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0"
+                "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.42-dev"
+                    "dev-master": "1.44-dev"
                 }
             },
             "autoload": {
@@ -2553,19 +3370,18 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "role": "Lead Developer",
                     "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org"
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
                 },
                 {
-                    "name": "Armin Ronacher",
-                    "role": "Project Founder",
-                    "email": "armin.ronacher@active-4.com"
+                    "name": "Twig Team",
+                    "role": "Contributors"
                 },
                 {
-                    "name": "Twig Team",
-                    "role": "Contributors",
-                    "homepage": "https://twig.symfony.com/contributors"
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder"
                 }
             ],
             "description": "Twig, the flexible, fast, and secure template language for PHP",
@@ -2573,32 +3389,46 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2019-06-18T15:35:16+00:00"
+            "support": {
+                "issues": "https://github.com/twigphp/Twig/issues",
+                "source": "https://github.com/twigphp/Twig/tree/v1.44.7"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-09-28T08:38:36+00:00"
         },
         {
             "name": "willdurand/negotiation",
-            "version": "v2.3.1",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/willdurand/Negotiation.git",
-                "reference": "03436ededa67c6e83b9b12defac15384cb399dc9"
+                "reference": "68e9ea0553ef6e2ee8db5c1d98829f111e623ec2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/03436ededa67c6e83b9b12defac15384cb399dc9",
-                "reference": "03436ededa67c6e83b9b12defac15384cb399dc9",
+                "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/68e9ea0553ef6e2ee8db5c1d98829f111e623ec2",
+                "reference": "68e9ea0553ef6e2ee8db5c1d98829f111e623ec2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0"
+                "php": ">=7.1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.5"
+                "symfony/phpunit-bridge": "^5.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2625,31 +3455,35 @@
                 "header",
                 "negotiation"
             ],
-            "time": "2017-05-14T17:21:12+00:00"
+            "support": {
+                "issues": "https://github.com/willdurand/Negotiation/issues",
+                "source": "https://github.com/willdurand/Negotiation/tree/3.1.0"
+            },
+            "time": "2022-01-30T20:08:53+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "behat/gherkin",
-            "version": "v4.6.0",
+            "version": "v4.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
+                "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
-                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/0bc8d1e30e96183e4f36db9dc79caead300beff4",
+                "reference": "0bc8d1e30e96183e4f36db9dc79caead300beff4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.1"
+                "php": "~7.2|~8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.5|~5",
-                "symfony/phpunit-bridge": "~2.7|~3|~4",
-                "symfony/yaml": "~2.3|~3|~4"
+                "cucumber/cucumber": "dev-gherkin-22.0.0",
+                "phpunit/phpunit": "~8|~9",
+                "symfony/yaml": "~3|~4|~5"
             },
             "suggest": {
                 "symfony/yaml": "If you want to parse features, represented in YAML files"
@@ -2657,7 +3491,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.4-dev"
+                    "dev-master": "4.x-dev"
                 }
             },
             "autoload": {
@@ -2676,7 +3510,7 @@
                     "homepage": "http://everzet.com"
                 }
             ],
-            "description": "Gherkin DSL parser for PHP 5.3",
+            "description": "Gherkin DSL parser for PHP",
             "homepage": "http://behat.org/",
             "keywords": [
                 "BDD",
@@ -2686,62 +3520,59 @@
                 "gherkin",
                 "parser"
             ],
-            "time": "2019-01-16T14:22:17+00:00"
+            "support": {
+                "issues": "https://github.com/Behat/Gherkin/issues",
+                "source": "https://github.com/Behat/Gherkin/tree/v4.9.0"
+            },
+            "time": "2021-10-12T13:05:09+00:00"
         },
         {
             "name": "codeception/codeception",
-            "version": "2.5.6",
+            "version": "4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "b83a9338296e706fab2ceb49de8a352fbca3dc98"
+                "reference": "b88014f3348c93f3df99dc6d0967b0dbfa804474"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/b83a9338296e706fab2ceb49de8a352fbca3dc98",
-                "reference": "b83a9338296e706fab2ceb49de8a352fbca3dc98",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/b88014f3348c93f3df99dc6d0967b0dbfa804474",
+                "reference": "b88014f3348c93f3df99dc6d0967b0dbfa804474",
                 "shasum": ""
             },
             "require": {
                 "behat/gherkin": "^4.4.0",
-                "codeception/phpunit-wrapper": "^6.0.9|^7.0.6",
-                "codeception/stub": "^2.0",
+                "codeception/lib-asserts": "^1.0 | 2.0.*@dev",
+                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.1.1 | ^9.0",
+                "codeception/stub": "^2.0 | ^3.0 | ^4.0",
                 "ext-curl": "*",
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "facebook/webdriver": ">=1.1.3 <2.0",
-                "guzzlehttp/guzzle": ">=4.1.4 <7.0",
-                "guzzlehttp/psr7": "~1.0",
-                "php": ">=5.6.0 <8.0",
-                "symfony/browser-kit": ">=2.7 <5.0",
-                "symfony/console": ">=2.7 <5.0",
-                "symfony/css-selector": ">=2.7 <5.0",
-                "symfony/dom-crawler": ">=2.7 <5.0",
-                "symfony/event-dispatcher": ">=2.7 <5.0",
-                "symfony/finder": ">=2.7 <5.0",
-                "symfony/yaml": ">=2.7 <5.0"
+                "guzzlehttp/psr7": "^1.4 | ^2.0",
+                "php": ">=5.6.0 <9.0",
+                "symfony/console": ">=2.7 <6.0",
+                "symfony/css-selector": ">=2.7 <6.0",
+                "symfony/event-dispatcher": ">=2.7 <6.0",
+                "symfony/finder": ">=2.7 <6.0",
+                "symfony/yaml": ">=2.7 <6.0"
             },
             "require-dev": {
+                "codeception/module-asserts": "^1.0 | 2.0.*@dev",
+                "codeception/module-cli": "^1.0 | 2.0.*@dev",
+                "codeception/module-db": "^1.0 | 2.0.*@dev",
+                "codeception/module-filesystem": "^1.0 | 2.0.*@dev",
+                "codeception/module-phpbrowser": "^1.0 | 2.0.*@dev",
                 "codeception/specify": "~0.3",
-                "facebook/graph-sdk": "~5.3",
-                "flow/jsonpath": "~0.2",
+                "codeception/util-universalframework": "*@dev",
                 "monolog/monolog": "~1.8",
-                "pda/pheanstalk": "~3.0",
-                "php-amqplib/php-amqplib": "~2.4",
-                "predis/predis": "^1.0",
                 "squizlabs/php_codesniffer": "~2.0",
-                "symfony/process": ">=2.7 <5.0",
-                "vlucas/phpdotenv": "^3.0"
+                "symfony/process": ">=2.7 <6.0",
+                "vlucas/phpdotenv": "^2.0 | ^3.0 | ^4.0 | ^5.0"
             },
             "suggest": {
-                "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
-                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests",
                 "codeception/specify": "BDD-style code blocks",
                 "codeception/verify": "BDD-style assertions",
-                "flow/jsonpath": "For using JSONPath in REST module",
-                "league/factory-muffin": "For DataFactory module",
-                "league/factory-muffin-faker": "For Faker support in DataFactory module",
-                "phpseclib/phpseclib": "for SFTP option in FTP Module",
+                "hoa/console": "For interactive console functionality",
                 "stecman/symfony-console-completion": "For BASH autocompletion",
                 "symfony/phpunit-bridge": "For phpunit-bridge support"
             },
@@ -2753,6 +3584,9 @@
                 "branch-alias": []
             },
             "autoload": {
+                "files": [
+                    "functions.php"
+                ],
                 "psr-4": {
                     "Codeception\\": "src/Codeception",
                     "Codeception\\Extension\\": "ext"
@@ -2766,11 +3600,11 @@
                 {
                     "name": "Michael Bodnarchuk",
                     "email": "davert@mail.ua",
-                    "homepage": "http://codegyre.com"
+                    "homepage": "https://codegyre.com"
                 }
             ],
             "description": "BDD-style testing framework",
-            "homepage": "http://codeception.com/",
+            "homepage": "https://codeception.com/",
             "keywords": [
                 "BDD",
                 "TDD",
@@ -2778,37 +3612,106 @@
                 "functional testing",
                 "unit testing"
             ],
-            "time": "2019-04-24T11:28:19+00:00"
-        },
-        {
-            "name": "codeception/phpunit-wrapper",
-            "version": "7.7.1",
+            "support": {
+                "issues": "https://github.com/Codeception/Codeception/issues",
+                "source": "https://github.com/Codeception/Codeception/tree/4.2.2"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/codeception",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2022-08-13T13:28:25+00:00"
+        },
+        {
+            "name": "codeception/lib-asserts",
+            "version": "1.13.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/phpunit-wrapper.git",
-                "reference": "ab04a956264291505ea84998f43cf91639b4575d"
+                "url": "https://github.com/Codeception/lib-asserts.git",
+                "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/184231d5eab66bc69afd6b9429344d80c67a33b6",
+                "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6",
+                "shasum": ""
+            },
+            "require": {
+                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3 | ^9.0",
+                "ext-dom": "*",
+                "php": ">=5.6.0 <9.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert@mail.ua",
+                    "homepage": "http://codegyre.com"
+                },
+                {
+                    "name": "Gintautas Miselis"
+                },
+                {
+                    "name": "Gustavo Nieves",
+                    "homepage": "https://medium.com/@ganieves"
+                }
+            ],
+            "description": "Assertion methods used by Codeception core and Asserts module",
+            "homepage": "https://codeception.com/",
+            "keywords": [
+                "codeception"
+            ],
+            "support": {
+                "issues": "https://github.com/Codeception/lib-asserts/issues",
+                "source": "https://github.com/Codeception/lib-asserts/tree/1.13.2"
+            },
+            "time": "2020-10-21T16:26:20+00:00"
+        },
+        {
+            "name": "codeception/lib-innerbrowser",
+            "version": "1.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/lib-innerbrowser.git",
+                "reference": "31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/ab04a956264291505ea84998f43cf91639b4575d",
-                "reference": "ab04a956264291505ea84998f43cf91639b4575d",
+                "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2",
+                "reference": "31b4b56ad53c3464fcb2c0a14d55a51a201bd3c2",
                 "shasum": ""
             },
             "require": {
-                "phpunit/php-code-coverage": "^6.0",
-                "phpunit/phpunit": "7.5.*",
-                "sebastian/comparator": "^3.0",
-                "sebastian/diff": "^3.0"
+                "codeception/codeception": "4.*@dev",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "php": ">=5.6.0 <9.0",
+                "symfony/browser-kit": ">=2.7 <6.0",
+                "symfony/dom-crawler": ">=2.7 <6.0"
+            },
+            "conflict": {
+                "codeception/codeception": "<4.0"
             },
             "require-dev": {
-                "codeception/specify": "*",
-                "vlucas/phpdotenv": "^3.0"
+                "codeception/util-universalframework": "dev-master"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Codeception\\PHPUnit\\": "src\\"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2816,69 +3719,116 @@
             ],
             "authors": [
                 {
-                    "name": "Davert",
-                    "email": "davert.php@resend.cc"
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert@mail.ua",
+                    "homepage": "http://codegyre.com"
+                },
+                {
+                    "name": "Gintautas Miselis"
                 }
             ],
-            "description": "PHPUnit classes used by Codeception",
-            "time": "2019-02-26T20:35:32+00:00"
+            "description": "Parent library for all Codeception framework modules and PhpBrowser",
+            "homepage": "https://codeception.com/",
+            "keywords": [
+                "codeception"
+            ],
+            "support": {
+                "issues": "https://github.com/Codeception/lib-innerbrowser/issues",
+                "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.5.1"
+            },
+            "time": "2021-08-30T15:21:42+00:00"
         },
         {
-            "name": "codeception/stub",
-            "version": "2.1.0",
+            "name": "codeception/module-asserts",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/Stub.git",
-                "reference": "853657f988942f7afb69becf3fd0059f192c705a"
+                "url": "https://github.com/Codeception/module-asserts.git",
+                "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a",
-                "reference": "853657f988942f7afb69becf3fd0059f192c705a",
+                "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/59374f2fef0cabb9e8ddb53277e85cdca74328de",
+                "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de",
                 "shasum": ""
             },
             "require": {
-                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3"
+                "codeception/codeception": "*@dev",
+                "codeception/lib-asserts": "^1.13.1",
+                "php": ">=5.6.0 <9.0"
+            },
+            "conflict": {
+                "codeception/codeception": "<4.0"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Codeception\\": "src/"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2019-03-02T15:35:10+00:00"
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk"
+                },
+                {
+                    "name": "Gintautas Miselis"
+                },
+                {
+                    "name": "Gustavo Nieves",
+                    "homepage": "https://medium.com/@ganieves"
+                }
+            ],
+            "description": "Codeception module containing various assertions",
+            "homepage": "https://codeception.com/",
+            "keywords": [
+                "assertions",
+                "asserts",
+                "codeception"
+            ],
+            "support": {
+                "issues": "https://github.com/Codeception/module-asserts/issues",
+                "source": "https://github.com/Codeception/module-asserts/tree/1.3.1"
+            },
+            "time": "2020-10-21T16:48:15+00:00"
         },
         {
-            "name": "composer/xdebug-handler",
-            "version": "1.3.3",
+            "name": "codeception/module-phpbrowser",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
+                "url": "https://github.com/Codeception/module-phpbrowser.git",
+                "reference": "8ba6bede11d0914e74d98691f427fd8f397f192e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
-                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
+                "url": "https://api.github.com/repos/Codeception/module-phpbrowser/zipball/8ba6bede11d0914e74d98691f427fd8f397f192e",
+                "reference": "8ba6bede11d0914e74d98691f427fd8f397f192e",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0",
-                "psr/log": "^1.0"
+                "codeception/codeception": "^4.1",
+                "codeception/lib-innerbrowser": "^1.3",
+                "guzzlehttp/guzzle": "^6.3|^7.0",
+                "php": ">=5.6.0 <9.0"
+            },
+            "conflict": {
+                "codeception/codeception": "<4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+                "codeception/module-rest": "^1.0"
+            },
+            "suggest": {
+                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Composer\\XdebugHandler\\": "src"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2886,52 +3836,52 @@
             ],
             "authors": [
                 {
-                    "name": "John Stevenson",
-                    "email": "john-stevenson@blueyonder.co.uk"
+                    "name": "Michael Bodnarchuk"
+                },
+                {
+                    "name": "Gintautas Miselis"
                 }
             ],
-            "description": "Restarts a process without xdebug.",
+            "description": "Codeception module for testing web application over HTTP",
+            "homepage": "http://codeception.com/",
             "keywords": [
-                "Xdebug",
-                "performance"
+                "codeception",
+                "functional-testing",
+                "http"
             ],
-            "time": "2019-05-27T17:52:04+00:00"
+            "support": {
+                "issues": "https://github.com/Codeception/module-phpbrowser/issues",
+                "source": "https://github.com/Codeception/module-phpbrowser/tree/1.0.3"
+            },
+            "time": "2022-05-21T13:50:41+00:00"
         },
         {
-            "name": "doctrine/instantiator",
-            "version": "1.2.0",
+            "name": "codeception/phpunit-wrapper",
+            "version": "9.0.9",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
+                "url": "https://github.com/Codeception/phpunit-wrapper.git",
+                "reference": "7439a53ae367986e9c22b2ac00f9d7376bb2f8cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
-                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/7439a53ae367986e9c22b2ac00f9d7376bb2f8cf",
+                "reference": "7439a53ae367986e9c22b2ac00f9d7376bb2f8cf",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.2",
+                "phpunit/phpunit": "^9.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^0.13",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-shim": "^0.11",
-                "phpunit/phpunit": "^7.0"
+                "codeception/specify": "*",
+                "consolidation/robo": "^3.0.0-alpha3",
+                "vlucas/phpdotenv": "^3.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                    "Codeception\\PHPUnit\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2940,110 +3890,152 @@
             ],
             "authors": [
                 {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
+                    "name": "Davert",
+                    "email": "davert.php@resend.cc"
+                },
+                {
+                    "name": "Naktibalda"
                 }
             ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-            "keywords": [
-                "constructor",
-                "instantiate"
+            "description": "PHPUnit classes used by Codeception",
+            "support": {
+                "issues": "https://github.com/Codeception/phpunit-wrapper/issues",
+                "source": "https://github.com/Codeception/phpunit-wrapper/tree/9.0.9"
+            },
+            "time": "2022-05-23T06:24:11+00:00"
+        },
+        {
+            "name": "codeception/stub",
+            "version": "3.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Stub.git",
+                "reference": "468dd5fe659f131fc997f5196aad87512f9b1304"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/468dd5fe659f131fc997f5196aad87512f9b1304",
+                "reference": "468dd5fe659f131fc997f5196aad87512f9b1304",
+                "shasum": ""
+            },
+            "require": {
+                "phpunit/phpunit": "^8.4 | ^9.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Codeception\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
             ],
-            "time": "2019-03-17T17:37:11+00:00"
+            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
+            "support": {
+                "issues": "https://github.com/Codeception/Stub/issues",
+                "source": "https://github.com/Codeception/Stub/tree/3.7.0"
+            },
+            "time": "2020-07-03T15:54:43+00:00"
         },
         {
-            "name": "facebook/webdriver",
-            "version": "1.7.1",
+            "name": "doctrine/instantiator",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/facebook/php-webdriver.git",
-                "reference": "e43de70f3c7166169d0f14a374505392734160e5"
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/e43de70f3c7166169d0f14a374505392734160e5",
-                "reference": "e43de70f3c7166169d0f14a374505392734160e5",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
                 "shasum": ""
             },
             "require": {
-                "ext-curl": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "ext-zip": "*",
-                "php": "^5.6 || ~7.0",
-                "symfony/process": "^2.8 || ^3.1 || ^4.0"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.0",
-                "jakub-onderka/php-parallel-lint": "^0.9.2",
-                "php-coveralls/php-coveralls": "^2.0",
-                "php-mock/php-mock-phpunit": "^1.1",
-                "phpunit/phpunit": "^5.7",
-                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
-                "squizlabs/php_codesniffer": "^2.6",
-                "symfony/var-dumper": "^3.3 || ^4.0"
-            },
-            "suggest": {
-                "ext-SimpleXML": "For Firefox profile creation"
+                "doctrine/coding-standard": "^9",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.22"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-community": "1.5-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Facebook\\WebDriver\\": "lib/"
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "Apache-2.0"
+                "MIT"
             ],
-            "description": "A PHP client for Selenium WebDriver",
-            "homepage": "https://github.com/facebook/php-webdriver",
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "https://ocramius.github.io/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
             "keywords": [
-                "facebook",
-                "php",
-                "selenium",
-                "webdriver"
+                "constructor",
+                "instantiate"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
             ],
-            "time": "2019-06-13T08:02:18+00:00"
+            "time": "2022-03-03T08:28:38+00:00"
         },
         {
-            "name": "fzaninotto/faker",
-            "version": "v1.8.0",
+            "name": "getgrav/markdowndocs",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
+                "url": "https://github.com/getgrav/PHP-Markdown-Documentation-Generator.git",
+                "reference": "4a24d1b64a88da17e8f1696dc64969f5ca769064"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
-                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
+                "url": "https://api.github.com/repos/getgrav/PHP-Markdown-Documentation-Generator/zipball/4a24d1b64a88da17e8f1696dc64969f5ca769064",
+                "reference": "4a24d1b64a88da17e8f1696dc64969f5ca769064",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": ">=5.5.0",
+                "symfony/console": ">=2.6"
             },
             "require-dev": {
-                "ext-intl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7",
-                "squizlabs/php_codesniffer": "^1.5"
+                "phpunit/phpunit": "3.7.23"
             },
+            "bin": [
+                "bin/phpdoc-md"
+            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8-dev"
-                }
-            },
             "autoload": {
-                "psr-4": {
-                    "Faker\\": "src/Faker/"
+                "psr-0": {
+                    "PHPDocsMD": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3052,48 +4044,67 @@
             ],
             "authors": [
                 {
-                    "name": "François Zaninotto"
+                    "name": "Victor Jonsson",
+                    "email": "kontakt@victorjonsson.se"
+                },
+                {
+                    "name": "Grav CMS",
+                    "email": "hello@getgrav.org",
+                    "homepage": "https://getgrav.org"
                 }
             ],
-            "description": "Faker is a PHP library that generates fake data for you.",
-            "keywords": [
-                "data",
-                "faker",
-                "fixtures"
-            ],
-            "time": "2018-07-12T10:23:15+00:00"
+            "description": "Command line tool for generating markdown-formatted class documentation",
+            "homepage": "https://github.com/victorjonsson/PHP-Markdown-Documentation-Generator",
+            "support": {
+                "source": "https://github.com/getgrav/PHP-Markdown-Documentation-Generator/tree/2.0.1"
+            },
+            "time": "2021-04-20T06:04:42+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.3.3",
+            "version": "7.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4",
-                "php": ">=5.5"
+                "ext-json": "*",
+                "guzzlehttp/promises": "^1.5",
+                "guzzlehttp/psr7": "^1.9 || ^2.4",
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-client": "^1.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+            },
+            "provide": {
+                "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.1",
                 "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.0"
+                "php-http/client-integration-tests": "^3.0",
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23",
+                "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
+                "ext-curl": "Required for CURL handler support",
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "psr/log": "Required for using the Log middleware"
             },
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                },
                 "branch-alias": {
-                    "dev-master": "6.3-dev"
+                    "dev-master": "7.5-dev"
                 }
             },
             "autoload": {
@@ -3109,160 +4120,192 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Jeremy Lindblom",
+                    "email": "jeremeamia@gmail.com",
+                    "homepage": "https://github.com/jeremeamia"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
                 }
             ],
             "description": "Guzzle is a PHP HTTP client library",
-            "homepage": "http://guzzlephp.org/",
             "keywords": [
                 "client",
                 "curl",
                 "framework",
                 "http",
                 "http client",
+                "psr-18",
+                "psr-7",
                 "rest",
                 "web service"
             ],
-            "time": "2018-04-22T15:46:56+00:00"
+            "support": {
+                "issues": "https://github.com/guzzle/guzzle/issues",
+                "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-08-28T15:39:27+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "v1.3.1",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.0"
+                "php": ">=5.5"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0"
+                "symfony/phpunit-bridge": "^4.4 || ^5.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
                 }
             ],
             "description": "Guzzle promises library",
             "keywords": [
                 "promise"
             ],
-            "time": "2016-12-20T10:07:11+00:00"
-        },
-        {
-            "name": "jean85/pretty-package-versions",
-            "version": "1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Jean85/pretty-package-versions.git",
-                "reference": "75c7effcf3f77501d0e0caa75111aff4daa0dd48"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/75c7effcf3f77501d0e0caa75111aff4daa0dd48",
-                "reference": "75c7effcf3f77501d0e0caa75111aff4daa0dd48",
-                "shasum": ""
-            },
-            "require": {
-                "ocramius/package-versions": "^1.2.0",
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Jean85\\": "src/"
-                }
+            "support": {
+                "issues": "https://github.com/guzzle/promises/issues",
+                "source": "https://github.com/guzzle/promises/tree/1.5.2"
             },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
                 {
-                    "name": "Alessandro Lai",
-                    "email": "alessandro.lai85@gmail.com"
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
+                    "type": "tidelift"
                 }
             ],
-            "description": "A wrapper for ocramius/package-versions to get pretty versions strings",
-            "keywords": [
-                "composer",
-                "package",
-                "release",
-                "versions"
-            ],
-            "time": "2018-06-13T13:22:40+00:00"
+            "time": "2022-08-28T14:55:35+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.9.3",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea"
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea",
-                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
             },
             "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
                 "files": [
                     "src/DeepCopy/deep_copy.php"
-                ]
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -3276,656 +4319,99 @@
                 "object",
                 "object graph"
             ],
-            "time": "2019-08-09T12:45:53+00:00"
-        },
-        {
-            "name": "nette/bootstrap",
-            "version": "v3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/bootstrap.git",
-                "reference": "e1075af05c211915e03e0c86542f3ba5433df4a3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/bootstrap/zipball/e1075af05c211915e03e0c86542f3ba5433df4a3",
-                "reference": "e1075af05c211915e03e0c86542f3ba5433df4a3",
-                "shasum": ""
-            },
-            "require": {
-                "nette/di": "^3.0",
-                "nette/utils": "^3.0",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "latte/latte": "^2.2",
-                "nette/application": "^3.0",
-                "nette/caching": "^3.0",
-                "nette/database": "^3.0",
-                "nette/forms": "^3.0",
-                "nette/http": "^3.0",
-                "nette/mail": "^3.0",
-                "nette/robot-loader": "^3.0",
-                "nette/safe-stream": "^2.2",
-                "nette/security": "^3.0",
-                "nette/tester": "^2.0",
-                "tracy/tracy": "^2.6"
-            },
-            "suggest": {
-                "nette/robot-loader": "to use Configurator::createRobotLoader()",
-                "tracy/tracy": "to use Configurator::enableTracy()"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "🅱 Nette Bootstrap: the simple way to configure and bootstrap your Nette application.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "bootstrapping",
-                "configurator",
-                "nette"
-            ],
-            "time": "2019-03-26T12:59:07+00:00"
-        },
-        {
-            "name": "nette/di",
-            "version": "v3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/di.git",
-                "reference": "4aff517a1c6bb5c36fa09733d4cea089f529de6d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/di/zipball/4aff517a1c6bb5c36fa09733d4cea089f529de6d",
-                "reference": "4aff517a1c6bb5c36fa09733d4cea089f529de6d",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "nette/neon": "^3.0",
-                "nette/php-generator": "^3.2.2",
-                "nette/robot-loader": "^3.2",
-                "nette/schema": "^1.0",
-                "nette/utils": "^3.0",
-                "php": ">=7.1"
-            },
-            "conflict": {
-                "nette/bootstrap": "<3.0"
-            },
-            "require-dev": {
-                "nette/tester": "^2.2",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ],
-                "files": [
-                    "src/compatibility.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "💎 Nette Dependency Injection Container: Flexible, compiled and full-featured DIC with perfectly usable autowiring and support for all new PHP 7.1 features.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "compiled",
-                "di",
-                "dic",
-                "factory",
-                "ioc",
-                "nette",
-                "static"
-            ],
-            "time": "2019-08-07T12:11:33+00:00"
-        },
-        {
-            "name": "nette/finder",
-            "version": "v2.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/finder.git",
-                "reference": "6be1b83ea68ac558aff189d640abe242e0306fe2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/finder/zipball/6be1b83ea68ac558aff189d640abe242e0306fe2",
-                "reference": "6be1b83ea68ac558aff189d640abe242e0306fe2",
-                "shasum": ""
-            },
-            "require": {
-                "nette/utils": "^2.4 || ~3.0.0",
-                "php": ">=7.1"
-            },
-            "conflict": {
-                "nette/nette": "<2.2"
-            },
-            "require-dev": {
-                "nette/tester": "^2.0",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "? Nette Finder: find files and directories with an intuitive API.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "filesystem",
-                "glob",
-                "iterator",
-                "nette"
-            ],
-            "time": "2019-02-28T18:13:25+00:00"
-        },
-        {
-            "name": "nette/neon",
-            "version": "v3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/neon.git",
-                "reference": "cbff32059cbdd8720deccf9e9eace6ee516f02eb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/neon/zipball/cbff32059cbdd8720deccf9e9eace6ee516f02eb",
-                "reference": "cbff32059cbdd8720deccf9e9eace6ee516f02eb",
-                "shasum": ""
-            },
-            "require": {
-                "ext-iconv": "*",
-                "ext-json": "*",
-                "php": ">=7.0"
-            },
-            "require-dev": {
-                "nette/tester": "^2.0",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "? Nette NEON: encodes and decodes NEON file format.",
-            "homepage": "http://ne-on.org",
-            "keywords": [
-                "export",
-                "import",
-                "neon",
-                "nette",
-                "yaml"
-            ],
-            "time": "2019-02-05T21:30:40+00:00"
-        },
-        {
-            "name": "nette/php-generator",
-            "version": "v3.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/php-generator.git",
-                "reference": "aea6e81437bb238e5f0e5b5ce06337433908e63b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/php-generator/zipball/aea6e81437bb238e5f0e5b5ce06337433908e63b",
-                "reference": "aea6e81437bb238e5f0e5b5ce06337433908e63b",
-                "shasum": ""
-            },
-            "require": {
-                "nette/utils": "^2.4.2 || ~3.0.0",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "nette/tester": "^2.0",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 7.3 features.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "code",
-                "nette",
-                "php",
-                "scaffolding"
-            ],
-            "time": "2019-07-05T13:01:56+00:00"
-        },
-        {
-            "name": "nette/robot-loader",
-            "version": "v3.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/robot-loader.git",
-                "reference": "0712a0e39ae7956d6a94c0ab6ad41aa842544b5c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/robot-loader/zipball/0712a0e39ae7956d6a94c0ab6ad41aa842544b5c",
-                "reference": "0712a0e39ae7956d6a94c0ab6ad41aa842544b5c",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "nette/finder": "^2.5",
-                "nette/utils": "^3.0",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "nette/tester": "^2.0",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "? Nette RobotLoader: high performance and comfortable autoloader that will search and autoload classes within your application.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "autoload",
-                "class",
-                "interface",
-                "nette",
-                "trait"
-            ],
-            "time": "2019-03-08T21:57:24+00:00"
-        },
-        {
-            "name": "nette/schema",
-            "version": "v1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/schema.git",
-                "reference": "6241d8d4da39e825dd6cb5bfbe4242912f4d7e4d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/6241d8d4da39e825dd6cb5bfbe4242912f4d7e4d",
-                "reference": "6241d8d4da39e825dd6cb5bfbe4242912f4d7e4d",
-                "shasum": ""
-            },
-            "require": {
-                "nette/utils": "^3.0.1",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "nette/tester": "^2.2",
-                "tracy/tracy": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "📐 Nette Schema: validating data structures against a given Schema.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "config",
-                "nette"
-            ],
-            "time": "2019-04-03T15:53:25+00:00"
-        },
-        {
-            "name": "nette/utils",
-            "version": "v3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/utils.git",
-                "reference": "bd961f49b211997202bda1d0fbc410905be370d4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/bd961f49b211997202bda1d0fbc410905be370d4",
-                "reference": "bd961f49b211997202bda1d0fbc410905be370d4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "nette/tester": "~2.0",
-                "tracy/tracy": "^2.3"
-            },
-            "suggest": {
-                "ext-gd": "to use Image",
-                "ext-iconv": "to use Strings::webalize() and toAscii()",
-                "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
-                "ext-json": "to use Nette\\Utils\\Json",
-                "ext-mbstring": "to use Strings::lower() etc...",
-                "ext-xml": "to use Strings::length() etc. when mbstring is not available"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0",
-                "GPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "array",
-                "core",
-                "datetime",
-                "images",
-                "json",
-                "nette",
-                "paginator",
-                "password",
-                "slugify",
-                "string",
-                "unicode",
-                "utf-8",
-                "utility",
-                "validation"
-            ],
-            "time": "2019-03-22T01:00:30+00:00"
-        },
-        {
-            "name": "nikic/php-parser",
-            "version": "v4.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "e612609022e935f3d0337c1295176505b41188c8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e612609022e935f3d0337c1295176505b41188c8",
-                "reference": "e612609022e935f3d0337c1295176505b41188c8",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
-            },
-            "bin": [
-                "bin/php-parse"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PhpParser\\": "lib/PhpParser"
-                }
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
             },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
+            "funding": [
                 {
-                    "name": "Nikita Popov"
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
                 }
             ],
-            "description": "A PHP parser written in PHP",
-            "keywords": [
-                "parser",
-                "php"
-            ],
-            "time": "2019-08-12T20:17:41+00:00"
+            "time": "2022-03-03T13:19:32+00:00"
         },
         {
-            "name": "ocramius/package-versions",
-            "version": "1.4.0",
+            "name": "nikic/php-parser",
+            "version": "v4.15.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Ocramius/PackageVersions.git",
-                "reference": "a4d4b60d0e60da2487bd21a2c6ac089f85570dbb"
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/a4d4b60d0e60da2487bd21a2c6ac089f85570dbb",
-                "reference": "a4d4b60d0e60da2487bd21a2c6ac089f85570dbb",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.0.0",
-                "php": "^7.1.0"
+                "ext-tokenizer": "*",
+                "php": ">=7.0"
             },
             "require-dev": {
-                "composer/composer": "^1.6.3",
-                "doctrine/coding-standard": "^5.0.1",
-                "ext-zip": "*",
-                "infection/infection": "^0.7.1",
-                "phpunit/phpunit": "^7.0.0"
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
-            "type": "composer-plugin",
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
             "extra": {
-                "class": "PackageVersions\\Installer",
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "4.9-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "PackageVersions\\": "src/PackageVersions"
+                    "PhpParser\\": "lib/PhpParser"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com"
+                    "name": "Nikita Popov"
                 }
             ],
-            "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
-            "time": "2019-02-21T12:16:21+00:00"
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
+            },
+            "time": "2022-09-04T07:30:47+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "1.0.3",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-phar": "*",
-                "phar-io/version": "^2.0",
-                "php": "^5.6 || ^7.0"
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -3940,39 +4426,43 @@
             "authors": [
                 {
                     "name": "Arne Blankerts",
-                    "role": "Developer",
-                    "email": "arne@blankerts.de"
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
                 },
                 {
                     "name": "Sebastian Heuer",
-                    "role": "Developer",
-                    "email": "sebastian@phpeople.de"
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
                 },
                 {
                     "name": "Sebastian Bergmann",
-                    "role": "Developer",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2018-07-08T19:23:20+00:00"
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+            },
+            "time": "2021-07-20T11:28:43+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "2.0.1",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -3987,447 +4477,360 @@
             "authors": [
                 {
                     "name": "Arne Blankerts",
-                    "role": "Developer",
-                    "email": "arne@blankerts.de"
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
                 },
                 {
                     "name": "Sebastian Heuer",
-                    "role": "Developer",
-                    "email": "sebastian@phpeople.de"
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
                 },
                 {
                     "name": "Sebastian Bergmann",
-                    "role": "Developer",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "time": "2018-07-08T19:19:57+00:00"
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
+            },
+            "time": "2022-02-21T01:04:05+00:00"
         },
         {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
+            "name": "phpstan/phpstan",
+            "version": "1.8.7",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "536ff0ed719b5679e9f09c17aeaee9b31969cb8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/536ff0ed719b5679e9f09c17aeaee9b31969cb8e",
+                "reference": "536ff0ed719b5679e9f09c17aeaee9b31969cb8e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": "^7.2|^8.0"
             },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
             },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
+                "files": [
+                    "bootstrap.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
+            "description": "PHPStan - PHP Static Analysis Tool",
             "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
+                "dev",
                 "static analysis"
             ],
-            "time": "2017-09-11T18:02:19+00:00"
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.7"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-10-04T14:09:33+00:00"
         },
         {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.1",
+            "name": "phpstan/phpstan-deprecation-rules",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
+                "url": "https://github.com/phpstan/phpstan-deprecation-rules.git",
+                "reference": "e5ccafb0dd8d835dd65d8d7a1a0d2b1b75414682"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
-                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
+                "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/e5ccafb0dd8d835dd65d8d7a1a0d2b1b75414682",
+                "reference": "e5ccafb0dd8d835dd65d8d7a1a0d2b1b75414682",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
-                "webmozart/assert": "^1.0"
+                "php": "^7.1 || ^8.0",
+                "phpstan/phpstan": "^1.0"
             },
             "require-dev": {
-                "doctrine/instantiator": "~1.0.5",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^9.5"
             },
-            "type": "library",
+            "type": "phpstan-extension",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.x-dev"
+                    "dev-master": "1.0-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "rules.neon"
+                    ]
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
+                    "PHPStan\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2019-04-30T17:48:53+00:00"
+            "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues",
+                "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/1.0.0"
+            },
+            "time": "2021-09-23T11:02:21+00:00"
         },
         {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
+            "name": "phpunit/php-code-coverage",
+            "version": "9.2.17",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "ext-xmlwriter": "*",
+                "nikic/php-parser": "^4.14",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
+                "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcov": "*",
+                "ext-xdebug": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "9.2-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
                 }
             ],
-            "time": "2017-07-14T14:27:02+00:00"
+            "time": "2022-08-30T12:24:04+00:00"
         },
         {
-            "name": "phpspec/prophecy",
-            "version": "1.8.1",
+            "name": "phpunit/php-file-iterator",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
-                "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
             "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2019-06-13T12:50:23+00:00"
-        },
-        {
-            "name": "phpstan/phpdoc-parser",
-            "version": "0.3.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "8c4ef2aefd9788238897b678a985e1d5c8df6db4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/8c4ef2aefd9788238897b678a985e1d5c8df6db4",
-                "reference": "8c4ef2aefd9788238897b678a985e1d5c8df6db4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "~7.1"
-            },
-            "require-dev": {
-                "consistence/coding-standard": "^3.5",
-                "jakub-onderka/php-parallel-lint": "^0.9.2",
-                "phing/phing": "^2.16.0",
-                "phpstan/phpstan": "^0.10",
-                "phpunit/phpunit": "^6.3",
-                "slevomat/coding-standard": "^4.7.2",
-                "squizlabs/php_codesniffer": "^3.3.2",
-                "symfony/process": "^3.4 || ^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.3-dev"
-                }
+                "filesystem",
+                "iterator"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
-            "autoload": {
-                "psr-4": {
-                    "PHPStan\\PhpDocParser\\": [
-                        "src/"
-                    ]
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
                 }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
             ],
-            "description": "PHPDoc parser with support for nullable, intersection and generic types",
-            "time": "2019-06-07T19:13:52+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
-            "name": "phpstan/phpstan",
-            "version": "0.11.15",
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "1be5b3a706db16ac472a4c40ec03cf4c810b118d"
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1be5b3a706db16ac472a4c40ec03cf4c810b118d",
-                "reference": "1be5b3a706db16ac472a4c40ec03cf4c810b118d",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
                 "shasum": ""
             },
             "require": {
-                "composer/xdebug-handler": "^1.3.0",
-                "jean85/pretty-package-versions": "^1.0.3",
-                "nette/bootstrap": "^2.4 || ^3.0",
-                "nette/di": "^2.4.7 || ^3.0",
-                "nette/robot-loader": "^3.0.1",
-                "nette/schema": "^1.0",
-                "nette/utils": "^2.4.5 || ^3.0",
-                "nikic/php-parser": "^4.2.3",
-                "php": "~7.1",
-                "phpstan/phpdoc-parser": "^0.3.5",
-                "symfony/console": "~3.2 || ~4.0",
-                "symfony/finder": "~3.2 || ~4.0"
-            },
-            "conflict": {
-                "symfony/console": "3.4.16 || 4.1.5"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "brianium/paratest": "^2.0 || ^3.0",
-                "consistence/coding-standard": "^3.5",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
-                "ext-intl": "*",
-                "ext-mysqli": "*",
-                "ext-simplexml": "*",
-                "ext-soap": "*",
-                "ext-zip": "*",
-                "jakub-onderka/php-parallel-lint": "^1.0",
-                "localheinz/composer-normalize": "^1.1.0",
-                "phing/phing": "^2.16.0",
-                "phpstan/phpstan-deprecation-rules": "^0.11",
-                "phpstan/phpstan-php-parser": "^0.11",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-strict-rules": "^0.11",
-                "phpunit/phpunit": "^7.5.14 || ^8.0",
-                "slevomat/coding-standard": "^4.7.2",
-                "squizlabs/php_codesniffer": "^3.3.2"
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
             },
-            "bin": [
-                "bin/phpstan"
-            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "0.11-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "PHPStan\\": [
-                        "src/",
-                        "build/PHPStan"
-                    ]
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
-            "description": "PHPStan - PHP Static Analysis Tool",
-            "time": "2019-08-18T20:51:53+00:00"
-        },
-        {
-            "name": "phpstan/phpstan-deprecation-rules",
-            "version": "0.11.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpstan-deprecation-rules.git",
-                "reference": "5685fe48873efc5af1f2cc95d9c1b8ae82c728fe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/5685fe48873efc5af1f2cc95d9c1b8ae82c728fe",
-                "reference": "5685fe48873efc5af1f2cc95d9c1b8ae82c728fe",
-                "shasum": ""
-            },
-            "require": {
-                "nikic/php-parser": "^4.0",
-                "php": "~7.1",
-                "phpstan/phpstan": "^0.11.8"
-            },
-            "require-dev": {
-                "consistence/coding-standard": "^3.0.1",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
-                "jakub-onderka/php-parallel-lint": "^1.0",
-                "phing/phing": "^2.16.0",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpunit/phpunit": "^7.0",
-                "slevomat/coding-standard": "^4.5.2"
-            },
-            "type": "phpstan-extension",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.11-dev"
-                },
-                "phpstan": {
-                    "includes": [
-                        "rules.neon"
-                    ]
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
+            ],
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
             },
-            "autoload": {
-                "psr-4": {
-                    "PHPStan\\": "src/"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
                 }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
             ],
-            "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.",
-            "time": "2019-05-28T19:54:04+00:00"
+            "time": "2020-09-28T05:58:55+00:00"
         },
         {
-            "name": "phpunit/php-code-coverage",
-            "version": "6.1.4",
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d"
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
-                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
                 "shasum": ""
             },
             "require": {
-                "ext-dom": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.1",
-                "phpunit/php-file-iterator": "^2.0",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.1 || ^4.0",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "suggest": {
-                "ext-xdebug": "^2.6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -4442,43 +4845,51 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "role": "lead",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
             "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
+                "template"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
             ],
-            "time": "2018-10-31T16:06:48+00:00"
+            "time": "2020-10-26T05:33:50+00:00"
         },
         {
-            "name": "phpunit/php-file-iterator",
-            "version": "2.0.2",
+            "name": "phpunit/php-timer",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946"
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.1"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -4493,37 +4904,87 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "role": "lead",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
             "keywords": [
-                "filesystem",
-                "iterator"
+                "timer"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
             ],
-            "time": "2018-09-13T20:33:42+00:00"
+            "time": "2020-10-26T13:16:10+00:00"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
+            "name": "phpunit/phpunit",
+            "version": "9.5.25",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
+                "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "doctrine/instantiator": "^1.3.1",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.10.1",
+                "phar-io/manifest": "^2.0.3",
+                "phar-io/version": "^3.0.2",
+                "php": ">=7.3",
+                "phpunit/php-code-coverage": "^9.2.13",
+                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
+                "sebastian/comparator": "^4.0.8",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.5",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^3.2",
+                "sebastian/version": "^3.0.2"
+            },
+            "suggest": {
+                "ext-soap": "*",
+                "ext-xdebug": "*"
             },
+            "bin": [
+                "phpunit"
+            ],
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.5-dev"
+                }
+            },
             "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
                 "classmap": [
                     "src/"
                 ]
@@ -4535,91 +4996,113 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "role": "lead",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
             "keywords": [
-                "template"
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25"
+            },
+            "funding": [
+                {
+                    "url": "https://phpunit.de/sponsors.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
+                }
             ],
-            "time": "2015-06-21T13:50:34+00:00"
+            "time": "2022-09-25T03:44:45+00:00"
         },
         {
-            "name": "phpunit/php-timer",
-            "version": "2.1.2",
+            "name": "psr/http-client",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
-                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "php": "^7.0 || ^8.0",
+                "psr/http-message": "^1.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "role": "lead",
-                    "email": "sebastian@phpunit.de"
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
                 }
             ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
             "keywords": [
-                "timer"
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
             ],
-            "time": "2019-06-07T04:22:29+00:00"
+            "support": {
+                "source": "https://github.com/php-fig/http-client/tree/master"
+            },
+            "time": "2020-06-29T06:28:15+00:00"
         },
         {
-            "name": "phpunit/php-token-stream",
-            "version": "3.1.0",
+            "name": "sebastian/cli-parser",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a"
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e899757bb3df5ff6e95089132f32cd59aac2220a",
-                "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
                 "shasum": ""
             },
             "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -4634,73 +5117,48 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
             ],
-            "time": "2019-07-25T05:29:42+00:00"
+            "time": "2020-09-28T06:08:49+00:00"
         },
         {
-            "name": "phpunit/phpunit",
-            "version": "7.5.14",
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2834789aeb9ac182ad69bfdf9ae91856a59945ff"
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2834789aeb9ac182ad69bfdf9ae91856a59945ff",
-                "reference": "2834789aeb9ac182ad69bfdf9ae91856a59945ff",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.1",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "myclabs/deep-copy": "^1.7",
-                "phar-io/manifest": "^1.0.2",
-                "phar-io/version": "^2.0",
-                "php": "^7.1",
-                "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^6.0.7",
-                "phpunit/php-file-iterator": "^2.0.1",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.1",
-                "sebastian/comparator": "^3.0",
-                "sebastian/diff": "^3.0",
-                "sebastian/environment": "^4.0",
-                "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^2.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^2.0",
-                "sebastian/version": "^2.0.1"
-            },
-            "conflict": {
-                "phpunit/phpunit-mock-objects": "*"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "ext-pdo": "*"
-            },
-            "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^2.0"
+                "phpunit/phpunit": "^9.3"
             },
-            "bin": [
-                "phpunit"
-            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.5-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -4715,43 +5173,48 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "role": "lead",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
             ],
-            "time": "2019-07-15T06:24:08+00:00"
+            "time": "2020-10-26T13:08:54+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -4771,34 +5234,44 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T06:30:41+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:30:19+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.2",
+            "version": "4.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
-                "sebastian/diff": "^3.0",
-                "sebastian/exporter": "^3.1"
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.1"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4811,6 +5284,10 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -4822,10 +5299,6 @@
                 {
                     "name": "Bernhard Schussek",
                     "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
@@ -4835,33 +5308,100 @@
                 "compare",
                 "equality"
             ],
-            "time": "2018-07-12T15:12:46+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-09-14T12:41:17+00:00"
+        },
+        {
+            "name": "sebastian/complexity",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.7",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:52:27+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "3.0.2",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
-                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -4874,13 +5414,13 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
                 }
             ],
             "description": "Diff implementation",
@@ -4891,27 +5431,37 @@
                 "unidiff",
                 "unified diff"
             ],
-            "time": "2019-02-04T06:01:07+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:10:38+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "4.2.2",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404"
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
-                "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.5"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -4919,7 +5469,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4944,34 +5494,44 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2019-05-05T09:05:15+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-04-03T09:37:03+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.1",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "06a9a5947f47b3029d76118eb5c22802e5869687"
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/06a9a5947f47b3029d76118eb5c22802e5869687",
-                "reference": "06a9a5947f47b3029d76118eb5c22802e5869687",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -5006,32 +5566,45 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
             ],
-            "time": "2019-08-11T12:43:14+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-09-14T06:03:37+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "2.0.0",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "ext-dom": "*",
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-uopz": "*"
@@ -5039,7 +5612,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -5062,34 +5635,101 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2017-04-27T15:39:26+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-14T08:28:10+00:00"
+        },
+        {
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.6",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-28T06:42:11+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "3.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -5109,32 +5749,42 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-08-03T12:35:26+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:12:34+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "1.1.1",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be"
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -5154,32 +5804,42 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2017-03-29T09:07:27+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:14:26+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.0",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0.x-dev"
+                    "dev-master": "4.0-dev"
                 }
             },
             "autoload": {
@@ -5192,14 +5852,14 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
                 },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
                 {
                     "name": "Adam Harvey",
                     "email": "aharvey@php.net"
@@ -5207,29 +5867,42 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-03T06:23:57+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:17:30+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "2.0.1",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -5249,29 +5922,95 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2018-10-04T04:07:39+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:45:17+00:00"
+        },
+        {
+            "name": "sebastian/type",
+            "version": "3.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-09-12T14:47:03+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "2.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": ">=7.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -5286,47 +6025,53 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "role": "lead",
-                    "email": "sebastian@phpunit.de"
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
                 }
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:39:44+00:00"
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.3.3",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "a29dd02a1f3f81b9a15c7730cc3226718ddb55ca"
+                "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/a29dd02a1f3f81b9a15c7730cc3226718ddb55ca",
-                "reference": "a29dd02a1f3f81b9a15c7730cc3226718ddb55ca",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/081fe28a26b6bd671dea85ef3a4b5003f3c88027",
+                "reference": "081fe28a26b6bd671dea85ef3a4b5003f3c88027",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
-                "symfony/dom-crawler": "~3.4|~4.0"
+                "php": ">=7.2.5",
+                "symfony/dom-crawler": "^4.4|^5.0|^6.0",
+                "symfony/polyfill-php80": "^1.16"
             },
             "require-dev": {
-                "symfony/css-selector": "~3.4|~4.0",
-                "symfony/http-client": "^4.3",
-                "symfony/mime": "^4.3",
-                "symfony/process": "~3.4|~4.0"
+                "symfony/css-selector": "^4.4|^5.0|^6.0",
+                "symfony/http-client": "^4.4|^5.0|^6.0",
+                "symfony/mime": "^4.4|^5.0|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "symfony/process": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\BrowserKit\\": ""
@@ -5349,33 +6094,46 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony BrowserKit Component",
+            "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
-            "time": "2019-06-11T15:41:59+00:00"
+            "support": {
+                "source": "https://github.com/symfony/browser-kit/tree/v5.4.11"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-07-27T15:50:05+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.3.3",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d"
+                "reference": "c1681789f059ab756001052164726ae88512ae3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/105c98bb0c5d8635bea056135304bd8edcc42b4d",
-                "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/c1681789f059ab756001052164726ae88512ae3d",
+                "reference": "c1681789f059ab756001052164726ae88512ae3d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.2.5",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\CssSelector\\": ""
@@ -5402,45 +6160,126 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony CssSelector Component",
+            "description": "Converts CSS selectors to XPath expressions",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/css-selector/tree/v5.4.11"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-06-27T16:58:25+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.5-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
-            "time": "2019-01-16T21:53:39+00:00"
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.3.3",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "291397232a2eefb3347eaab9170409981eaad0e2"
+                "reference": "291c1e92281a09152dda089f782e23dedd34bd4f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/291397232a2eefb3347eaab9170409981eaad0e2",
-                "reference": "291397232a2eefb3347eaab9170409981eaad0e2",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/291c1e92281a09152dda089f782e23dedd34bd4f",
+                "reference": "291c1e92281a09152dda089f782e23dedd34bd4f",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.0"
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "masterminds/html5": "<2.6"
             },
             "require-dev": {
                 "masterminds/html5": "^2.6",
-                "symfony/css-selector": "~3.4|~4.0"
+                "symfony/css-selector": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "symfony/css-selector": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\DomCrawler\\": ""
@@ -5463,33 +6302,47 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony DomCrawler Component",
+            "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
-            "time": "2019-06-13T11:03:18+00:00"
+            "support": {
+                "source": "https://github.com/symfony/dom-crawler/tree/v5.4.12"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-08-03T13:09:21+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.3.3",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "9638d41e3729459860bb96f6247ccb61faaa45f2"
+                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/9638d41e3729459860bb96f6247ccb61faaa45f2",
-                "reference": "9638d41e3729459860bb96f6247ccb61faaa45f2",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c",
+                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Finder\\": ""
@@ -5512,29 +6365,46 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Finder Component",
+            "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
-            "time": "2019-06-28T13:16:30+00:00"
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v5.4.11"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-07-29T07:37:50+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.3",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -5549,129 +6419,42 @@
             "authors": [
                 {
                     "name": "Arne Blankerts",
-                    "role": "Developer",
-                    "email": "arne@blankerts.de"
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2019-06-13T22:48:21+00:00"
-        },
-        {
-            "name": "victorjonsson/markdowndocs",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator.git",
-                "reference": "c9fa153b28a79f5da89ec32aa501be92db212aed"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/trilbymedia/PHP-Markdown-Documentation-Generator/zipball/c9fa153b28a79f5da89ec32aa501be92db212aed",
-                "reference": "c9fa153b28a79f5da89ec32aa501be92db212aed",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0",
-                "symfony/console": ">=2.6"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "3.7.23"
-            },
-            "bin": [
-                "bin/phpdoc-md"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "PHPDocsMD": "src/"
-                }
-            },
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Victor Jonsson",
-                    "email": "kontakt@victorjonsson.se"
-                }
-            ],
-            "description": "Command line tool for generating markdown-formatted class documentation",
-            "homepage": "https://github.com/victorjonsson/PHP-Markdown-Documentation-Generator",
             "support": {
-                "source": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator/tree/master"
-            },
-            "time": "2017-09-20T13:29:22+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
             },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
+            "funding": [
                 {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
+                    "url": "https://github.com/theseer",
+                    "type": "github"
                 }
             ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2018-12-25T11:19:39+00:00"
+            "time": "2021-07-28T10:34:58+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "victorjonsson/markdowndocs": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.1.3",
+        "php": "^7.3.6 || ^8.0",
         "ext-json": "*",
-        "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-curl": "*",
         "ext-zip": "*",
-        "ext-dom": "*"
+        "ext-dom": "*",
+        "ext-libxml": "*",
+        "ext-gd": "*"
     },
     "platform-dev": [],
     "platform-overrides": {
-        "php": "7.1.3"
-    }
+        "php": "7.3.6"
+    },
+    "plugin-api-version": "2.3.0"
 }
diff --git a/images/.gitkeep b/images/.gitkeep
index e69de29bb2..8efbf1f12e 100644
--- a/images/.gitkeep
+++ b/images/.gitkeep
@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
diff --git a/index.php b/index.php
index 64154df896..b6b86e1c08 100644
--- a/index.php
+++ b/index.php
@@ -3,21 +3,21 @@
 /**
  * @package    Grav.Core
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav;
 
 \define('GRAV_REQUEST_TIME', microtime(true));
-\define('GRAV_PHP_MIN', '7.1.3');
+\define('GRAV_PHP_MIN', '7.3.6');
 
-if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
-    die(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
-}
+if (PHP_SAPI === 'cli-server') {
+    $symfony_server = stripos(getenv('_'), 'symfony') !== false || stripos($_SERVER['SERVER_SOFTWARE'] ?? '', 'symfony') !== false || stripos($_ENV['SERVER_SOFTWARE'] ?? '', 'symfony') !== false;
 
-if (PHP_SAPI === 'cli-server' && !isset($_SERVER['PHP_CLI_ROUTER'])) {
-    die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
+    if (!isset($_SERVER['PHP_CLI_ROUTER']) && !$symfony_server) {
+        die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
+    }
 }
 
 // Ensure vendor libraries exist
@@ -29,32 +29,23 @@
 // Register the auto-loader.
 $loader = require $autoload;
 
-use Grav\Common\Grav;
-use RocketTheme\Toolbox\Event\Event;
-
 // Set timezone to default, falls back to system if php.ini not set
 date_default_timezone_set(@date_default_timezone_get());
 
-// Set internal encoding if mbstring loaded
-if (!\extension_loaded('mbstring')) {
-    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
-}
+// Set internal encoding.
+@ini_set('default_charset', 'UTF-8');
 mb_internal_encoding('UTF-8');
 
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\Event\Event;
+
 // Get the Grav instance
-$grav = Grav::instance(
-    array(
-        'loader' => $loader
-    )
-);
+$grav = Grav::instance(array('loader' => $loader));
 
 // Process the page
 try {
     $grav->process();
-} catch (\Error $e) {
-    $grav->fireEvent('onFatalException', new Event(array('exception' => $e)));
-    throw $e;
-} catch (\Exception $e) {
+} catch (\Error|\Exception $e) {
     $grav->fireEvent('onFatalException', new Event(array('exception' => $e)));
     throw $e;
 }
diff --git a/logs/.gitkeep b/logs/.gitkeep
index e69de29bb2..8efbf1f12e 100644
--- a/logs/.gitkeep
+++ b/logs/.gitkeep
@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
diff --git a/now.json b/now.json
index fe7b94b37a..d2e629cf16 100644
--- a/now.json
+++ b/now.json
@@ -1,4 +1,4 @@
-    {
+{
   "version": 2,
   "builds": [{ "src": "*.php", "use": "@now/php" }]
 }
diff --git a/robots.txt b/robots.txt
index 96406e45e2..1d41d40ad5 100644
--- a/robots.txt
+++ b/robots.txt
@@ -11,3 +11,6 @@ Allow: /user/pages/
 Allow: /user/themes/
 Allow: /user/images/
 Allow: /
+Allow: *.css$
+Allow: *.js$
+Allow: /system/*.js$
\ No newline at end of file
diff --git a/system/assets/debugger.css b/system/assets/debugger.css
deleted file mode 100644
index 475dca9b89..0000000000
--- a/system/assets/debugger.css
+++ /dev/null
@@ -1,70 +0,0 @@
-div.phpdebugbar {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-.phpdebugbar pre {
-    padding: 1rem;
-}
-
-.phpdebugbar div.phpdebugbar-header > div > * {
-    padding: 5px 15px;
-}
-
-.phpdebugbar div.phpdebugbar-header > div.phpdebugbar-header-right > * {
-    padding: 5px 8px;
-}
-
-.phpdebugbar div.phpdebugbar-header, .phpdebugbar a.phpdebugbar-restore-btn {
-    background-image: url(grav.png);
-}
-
-.phpdebugbar a.phpdebugbar-restore-btn {
-    width: 13px;
-}
-
-.phpdebugbar a.phpdebugbar-tab.phpdebugbar-active {
-    background: #3DB9EC;
-    color: #fff;
-    margin-top: -1px;
-    padding-top: 6px;
-}
-
-.phpdebugbar .phpdebugbar-widgets-toolbar {
-    border-top: 1px solid #ddd;
-    padding-left: 5px;
-    padding-right: 2px;
-    padding-top: 2px;
-    background-color: #fafafa !important;
-    width: auto !important;
-    left: 0;
-    right: 0;
-}
-
-.phpdebugbar .phpdebugbar-widgets-toolbar input {
-    background: transparent !important;
-}
-
-.phpdebugbar .phpdebugbar-widgets-toolbar .phpdebugbar-widgets-filter {
-
-}
-
-
-.phpdebugbar input[type=text] {
-    padding: 0;
-    display: inline;
-}
-
-.phpdebugbar dl.phpdebugbar-widgets-varlist, ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label {
-    font-family: "DejaVu Sans Mono", Menlo, Monaco, Consolas, Courier, monospace;
-    font-size: 12px;
-}
-
-ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label {
-    text-shadow: -1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff, 1px 1px 0 #fff;
-    top: 0;
-}
-
-.phpdebugbar pre, .phpdebugbar code {
-    margin: 0;
-    font-size: 14px;
-}
diff --git a/system/assets/debugger/clockwork.css b/system/assets/debugger/clockwork.css
new file mode 100644
index 0000000000..e26dab1c37
--- /dev/null
+++ b/system/assets/debugger/clockwork.css
@@ -0,0 +1,2 @@
+/** Clockwork Debugger CSS **/
+.clockwork-badge{position:fixed;z-index:10;bottom:0;left:0;padding:2px 4px;background-color:#eee;border:1px solid #ccc;border-bottom:0;border-left:0;display:flex;align-items:center}.clockwork-badge:hover{width:auto}.clockwork-badge:hover:after{content:'Grav Clockwork debugger enabled. Install Clockwork Browser extension (Chrome or Firefox), open your Developer tools and then select the Clockwork tab.'}.clockwork-badge:after{margin-left:10px;font-family:Monaco,Consolas,"Lucida Console",monospace;font-size:12px;line-height:1.5;color:#666}.clockwork-badge i{display:block;float:left;height:22px;width:22px;min-width:22px;background-size:contain;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAA/1BMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4AAAD///8EBAT7+/sLCwv29vYVFRUvLy/t7e3m5ubCwsKxsbE/Pz+mpqZMTEwcHBzy8vLp6emfn5+AgIA2Njbi4uLf39+rq6tzc3NWVlYhISHa2trW1tbS0tLMzMy7u7uZmZmUlJSMjIxvb29kZGRHR0c7Ozt5eXkqKiq1tbWQkJBqampbW1tSUlLHx8eHh4ckJCRDQ0M3wD42AAAAI3RSTlMA/PibTbQ0x76TVAlw4LhZLOuEYCAN9Hjx0a2ppGZEGYw97djhXHwAAATZSURBVFjDlVcHW+MwDO1eFCjj2McNOzvdpXTTXVbL/P+/5SQ7QSSX5Di1X1onfi/Sk+Q4sTDbKqWK+YuznZ2zi3wxVdqK/Zf92M1nT9gnO8rmd398GX6Z3xaoOFoiAQcx3E5efgmeSuN8F6Xg1x3G06l/wjNpMR1B0uif4EhnIuFb+0diIoFXk3IVfokisR+h52GO4JKgyjmfaMhAFNlSaPR7DpwI+lzn/E4QKIqmKIJirxCMP4izBPPZPXhgXwMBYgULw0nfg/BF5scDbslb7QeJ08yqqTEmGYoB95d4H8ETL8+n9wBqrLu6ao3bBsMwAnxISf/9BHcqxNB8Y7cWl3Zz7TAUfPrvAT6AoNEFFXvsjutL01yOuMrtBxnFXsmT/1wQHmdWAFNnI3uI48Yj0FUcHbKf62GfUfr8eeQt7Uk3mQZpZNoVRPEui5vtEz5zFEpgWnyqVBZMc6oaGNriH2hGVZ0OxEvInPeMaZWJBA7vmPbCr5jjws5HBnAUxvDMH40aCIf4G5BjRQSs8E8HFFYf8bGxgDvD55bzGhwWkoBcuIyHR/AMdaCagxXDhtL6tSqoWpd4BMnlIR+Or+rYTK/a3EAGcc6e4AWHISnWv20iCCojsHoVlQdjrMexFF2C7UMg2A2WEGWbQhXN6l3eXC6XGp4b9qxbuEB2EBGBwtocrK90cVG5mbRXm6vmx/0phq1sIAGKDgLOBiN1MrO5a9aDl+D0W6x0Ar9BCTRuIIANa90Y7LrLVRXzwVtDInCqMRWcf2bUOEAsa4wJqFowQALL9EiAtVRk8QC4OW+1pOM9jIaVASwYagyNXDj+W0NcfuZNzjtXOiL0Zzg30Llj+ptfxQs4+vBPNiL5PawFCBkgXpUaVtqGl+A8dgZHL34BcBUQrwPptToW+o37Ku+UH9eYByJIx3YkAeFnMFuGO7S5gEp7YhXxa5OOAM39RXDPXb0qmpROsswZe+twXdU55oUIZAiEv3bD1UFwIYKkmGqytPCDCwKFQCKK0yL7qtSAPX54UAbtsLuBHkb9zyLmPQSNjsSgmQwKUOIfEY8F8t4B34DvndJY9BA8tNBJq1Nev9axmaStFcQLhgYoCTo0salkIaW8OUDdWjMTR2sHPhrAFZqx6cqcKE4pl2BJJ4K6hfwvqNgAnXfKX/HU6X3Zrhnu0k7tLNZtTBRv1hkwTDBY1NzFU6doDYjJbWdQkQhWwuU7/LvhTh3SDoco4ECL4i5dwURbc8NdDZz2IwKicE8d0KIqWetLE3+lL4hvUuGSeRfVWNLfj/gpOw4smBJBkKQHCzlHGwvAj4woB1gq5NGGLSXtORBPnUQPV5/MPVkDMxbpwG7w4x0xL6Ltxka0A/4NBvV09UVk4DoSn/jl2+JQS9q9KYawisAD4CfhsZ4TH3htylsdEHARIQBusqCKyUpymycgbbkkXEXjT3z7/oKQFTFVuZD2FMJHZIDsO5x2d4aAr2jR+GLwZhtAb028/0yJ9J8dE87jQyKObcjtTXT8dH+fDuKF4/eiPwzH44wTf/yUi6wrpRIOZ9lM1EtXAifFI+CJn9+iX/t2xMQwOMth/UZbASi8btAwR9FHWSpJr75g9Oqbin3VDg+SpwlP6k6TB4ex/7JvmcJx8jydy6XPk8eFTKhyfwCgX71MSvaBHgAAAABJRU5ErkJggg==)}
diff --git a/system/assets/debugger/clockwork.js b/system/assets/debugger/clockwork.js
new file mode 100644
index 0000000000..bb1b69dac4
--- /dev/null
+++ b/system/assets/debugger/clockwork.js
@@ -0,0 +1,3 @@
+/** Clockwork Debugger JS **/
+document.addEventListener("DOMContentLoaded",function () {
+    var e=document.createElement("div");e.appendChild(document.createElement("i")),e.className="clockwork-badge",document.body.appendChild(e)});
diff --git a/system/assets/debugger/phpdebugbar.css b/system/assets/debugger/phpdebugbar.css
new file mode 100644
index 0000000000..93e2d2c3eb
--- /dev/null
+++ b/system/assets/debugger/phpdebugbar.css
@@ -0,0 +1,70 @@
+div.phpdebugbar {
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+.phpdebugbar pre {
+    padding: 1rem;
+}
+
+.phpdebugbar div.phpdebugbar-header > div > * {
+    padding: 5px 15px;
+}
+
+.phpdebugbar div.phpdebugbar-header > div.phpdebugbar-header-right > * {
+    padding: 5px 8px;
+}
+
+.phpdebugbar div.phpdebugbar-header, .phpdebugbar a.phpdebugbar-restore-btn {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAA/1BMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4AAAD///8EBAT7+/sLCwv29vYVFRUvLy/t7e3m5ubCwsKxsbE/Pz+mpqZMTEwcHBzy8vLp6emfn5+AgIA2Njbi4uLf39+rq6tzc3NWVlYhISHa2trW1tbS0tLMzMy7u7uZmZmUlJSMjIxvb29kZGRHR0c7Ozt5eXkqKiq1tbWQkJBqampbW1tSUlLHx8eHh4ckJCRDQ0M3wD42AAAAI3RSTlMA/PibTbQ0x76TVAlw4LhZLOuEYCAN9Hjx0a2ppGZEGYw97djhXHwAAATZSURBVFjDlVcHW+MwDO1eFCjj2McNOzvdpXTTXVbL/P+/5SQ7QSSX5Di1X1onfi/Sk+Q4sTDbKqWK+YuznZ2zi3wxVdqK/Zf92M1nT9gnO8rmd398GX6Z3xaoOFoiAQcx3E5efgmeSuN8F6Xg1x3G06l/wjNpMR1B0uif4EhnIuFb+0diIoFXk3IVfokisR+h52GO4JKgyjmfaMhAFNlSaPR7DpwI+lzn/E4QKIqmKIJirxCMP4izBPPZPXhgXwMBYgULw0nfg/BF5scDbslb7QeJ08yqqTEmGYoB95d4H8ETL8+n9wBqrLu6ao3bBsMwAnxISf/9BHcqxNB8Y7cWl3Zz7TAUfPrvAT6AoNEFFXvsjutL01yOuMrtBxnFXsmT/1wQHmdWAFNnI3uI48Yj0FUcHbKf62GfUfr8eeQt7Uk3mQZpZNoVRPEui5vtEz5zFEpgWnyqVBZMc6oaGNriH2hGVZ0OxEvInPeMaZWJBA7vmPbCr5jjws5HBnAUxvDMH40aCIf4G5BjRQSs8E8HFFYf8bGxgDvD55bzGhwWkoBcuIyHR/AMdaCagxXDhtL6tSqoWpd4BMnlIR+Or+rYTK/a3EAGcc6e4AWHISnWv20iCCojsHoVlQdjrMexFF2C7UMg2A2WEGWbQhXN6l3eXC6XGp4b9qxbuEB2EBGBwtocrK90cVG5mbRXm6vmx/0phq1sIAGKDgLOBiN1MrO5a9aDl+D0W6x0Ar9BCTRuIIANa90Y7LrLVRXzwVtDInCqMRWcf2bUOEAsa4wJqFowQALL9EiAtVRk8QC4OW+1pOM9jIaVASwYagyNXDj+W0NcfuZNzjtXOiL0Zzg30Llj+ptfxQs4+vBPNiL5PawFCBkgXpUaVtqGl+A8dgZHL34BcBUQrwPptToW+o37Ku+UH9eYByJIx3YkAeFnMFuGO7S5gEp7YhXxa5OOAM39RXDPXb0qmpROsswZe+twXdU55oUIZAiEv3bD1UFwIYKkmGqytPCDCwKFQCKK0yL7qtSAPX54UAbtsLuBHkb9zyLmPQSNjsSgmQwKUOIfEY8F8t4B34DvndJY9BA8tNBJq1Nev9axmaStFcQLhgYoCTo0salkIaW8OUDdWjMTR2sHPhrAFZqx6cqcKE4pl2BJJ4K6hfwvqNgAnXfKX/HU6X3Zrhnu0k7tLNZtTBRv1hkwTDBY1NzFU6doDYjJbWdQkQhWwuU7/LvhTh3SDoco4ECL4i5dwURbc8NdDZz2IwKicE8d0KIqWetLE3+lL4hvUuGSeRfVWNLfj/gpOw4smBJBkKQHCzlHGwvAj4woB1gq5NGGLSXtORBPnUQPV5/MPVkDMxbpwG7w4x0xL6Ltxka0A/4NBvV09UVk4DoSn/jl2+JQS9q9KYawisAD4CfhsZ4TH3htylsdEHARIQBusqCKyUpymycgbbkkXEXjT3z7/oKQFTFVuZD2FMJHZIDsO5x2d4aAr2jR+GLwZhtAb028/0yJ9J8dE87jQyKObcjtTXT8dH+fDuKF4/eiPwzH44wTf/yUi6wrpRIOZ9lM1EtXAifFI+CJn9+iX/t2xMQwOMth/UZbASi8btAwR9FHWSpJr75g9Oqbin3VDg+SpwlP6k6TB4ex/7JvmcJx8jydy6XPk8eFTKhyfwCgX71MSvaBHgAAAABJRU5ErkJggg==);
+}
+
+.phpdebugbar a.phpdebugbar-restore-btn {
+    width: 13px;
+}
+
+.phpdebugbar a.phpdebugbar-tab.phpdebugbar-active {
+    background: #3DB9EC;
+    color: #fff;
+    margin-top: -1px;
+    padding-top: 6px;
+}
+
+.phpdebugbar .phpdebugbar-widgets-toolbar {
+    border-top: 1px solid #ddd;
+    padding-left: 5px;
+    padding-right: 2px;
+    padding-top: 2px;
+    background-color: #fafafa !important;
+    width: auto !important;
+    left: 0;
+    right: 0;
+}
+
+.phpdebugbar .phpdebugbar-widgets-toolbar input {
+    background: transparent !important;
+}
+
+.phpdebugbar .phpdebugbar-widgets-toolbar .phpdebugbar-widgets-filter {
+
+}
+
+
+.phpdebugbar input[type=text] {
+    padding: 0;
+    display: inline;
+}
+
+.phpdebugbar dl.phpdebugbar-widgets-varlist, ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label {
+    font-family: "DejaVu Sans Mono", Menlo, Monaco, Consolas, Courier, monospace;
+    font-size: 12px;
+}
+
+ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label {
+    text-shadow: -1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff, 1px 1px 0 #fff;
+    top: 0;
+}
+
+.phpdebugbar pre, .phpdebugbar code {
+    margin: 0;
+    font-size: 14px;
+}
diff --git a/system/assets/grav.png b/system/assets/grav.png
index 9ae6d97db2..67a98b9df1 100644
Binary files a/system/assets/grav.png and b/system/assets/grav.png differ
diff --git a/system/assets/jquery/jquery-3.x.min.js b/system/assets/jquery/jquery-3.x.min.js
index 4d9b3a2587..b0614034ad 100644
--- a/system/assets/jquery/jquery-3.x.min.js
+++ b/system/assets/jquery/jquery-3.x.min.js
@@ -1,2 +1,2 @@
-/*! jQuery v3.3.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use strict";var n=[],r=e.document,i=Object.getPrototypeOf,o=n.slice,a=n.concat,s=n.push,u=n.indexOf,l={},c=l.toString,f=l.hasOwnProperty,p=f.toString,d=p.call(Object),h={},g=function e(t){return"function"==typeof t&&"number"!=typeof t.nodeType},y=function e(t){return null!=t&&t===t.window},v={type:!0,src:!0,noModule:!0};function m(e,t,n){var i,o=(t=t||r).createElement("script");if(o.text=e,n)for(i in v)n[i]&&(o[i]=n[i]);t.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[c.call(e)]||"object":typeof e}var b="3.3.1",w=function(e,t){return new w.fn.init(e,t)},T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;w.fn=w.prototype={jquery:"3.3.1",constructor:w,length:0,toArray:function(){return o.call(this)},get:function(e){return null==e?o.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return w.each(this,e)},map:function(e){return this.pushStack(w.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(o.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:s,sort:n.sort,splice:n.splice},w.extend=w.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||g(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)n=a[t],a!==(r=e[t])&&(l&&r&&(w.isPlainObject(r)||(i=Array.isArray(r)))?(i?(i=!1,o=n&&Array.isArray(n)?n:[]):o=n&&w.isPlainObject(n)?n:{},a[t]=w.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},w.extend({expando:"jQuery"+("3.3.1"+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==c.call(e))&&(!(t=i(e))||"function"==typeof(n=f.call(t,"constructor")&&t.constructor)&&p.call(n)===d)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e){m(e)},each:function(e,t){var n,r=0;if(C(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(C(Object(e))?w.merge(n,"string"==typeof e?[e]:e):s.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:u.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)(r=!t(e[o],o))!==s&&i.push(e[o]);return i},map:function(e,t,n){var r,i,o=0,s=[];if(C(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&s.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&s.push(i);return a.apply([],s)},guid:1,support:h}),"function"==typeof Symbol&&(w.fn[Symbol.iterator]=n[Symbol.iterator]),w.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function C(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!g(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,s,u,l,c,f,p,d,h,g,y,v,m,x,b="sizzle"+1*new Date,w=e.document,T=0,C=0,E=ae(),k=ae(),S=ae(),D=function(e,t){return e===t&&(f=!0),0},N={}.hasOwnProperty,A=[],j=A.pop,q=A.push,L=A.push,H=A.slice,O=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},P="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",I="\\["+M+"*("+R+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+R+"))|)"+M+"*\\]",W=":("+R+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+I+")*)|.*)\\)|)",$=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),F=new RegExp("^"+M+"*,"+M+"*"),_=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),z=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),X=new RegExp(W),U=new RegExp("^"+R+"$"),V={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},G=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,K=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){p()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{L.apply(A=H.call(w.childNodes),w.childNodes),A[w.childNodes.length].nodeType}catch(e){L={apply:A.length?function(e,t){q.apply(e,H.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,s,l,c,f,h,v,m=t&&t.ownerDocument,T=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return r;if(!i&&((t?t.ownerDocument||t:w)!==d&&p(t),t=t||d,g)){if(11!==T&&(f=J.exec(e)))if(o=f[1]){if(9===T){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&x(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!S[e+" "]&&(!y||!y.test(e))){if(1!==T)m=t,v=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=b),s=(h=a(e)).length;while(s--)h[s]="#"+c+" "+ve(h[s]);v=h.join(","),m=K.test(e)&&ge(t.parentNode)||t}if(v)try{return L.apply(r,m.querySelectorAll(v)),r}catch(e){}finally{c===b&&t.removeAttribute("id")}}}return u(e.replace(B,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function se(e){return e[b]=!0,e}function ue(e){var t=d.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function de(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return se(function(t){return t=+t,se(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},p=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==d&&9===a.nodeType&&a.documentElement?(d=a,h=d.documentElement,g=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(d.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(d.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},v=[],y=[],(n.qsa=Q.test(d.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="<a id='"+b+"'></a><select id='"+b+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+b+"-]").length||y.push("~="),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||y.push(".#.+[+~]")}),ue(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=d.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(n.matchesSelector=Q.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),v.push("!=",W)}),y=y.length&&new RegExp(y.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),x=t||Q.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===d||e.ownerDocument===w&&x(w,e)?-1:t===d||t.ownerDocument===w&&x(w,t)?1:c?O(c,e)-O(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===d?-1:t===d?1:i?-1:o?1:c?O(c,e)-O(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?ce(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==d&&p(e),t=t.replace(z,"='$1']"),n.matchesSelector&&g&&!S[t+" "]&&(!v||!v.test(t))&&(!y||!y.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,d,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==d&&p(e),x(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==d&&p(e);var i=r.attrHandle[t.toLowerCase()],o=i&&N.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(D),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:se,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return V.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace($," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",y=t.parentNode,v=s&&t.nodeName.toLowerCase(),m=!u&&!s,x=!1;if(y){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===v:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?y.firstChild:y.lastChild],a&&m){x=(d=(l=(c=(f=(p=y)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1])&&l[2],p=d&&y.childNodes[d];while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if(1===p.nodeType&&++x&&p===t){c[e]=[T,d,x];break}}else if(m&&(x=d=(l=(c=(f=(p=t)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1]),!1===x)while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===v:1===p.nodeType)&&++x&&(m&&((c=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]=[T,x]),p===t))break;return(x-=i)===r||x%r==0&&x/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[b]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?se(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=O(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:se(function(e){var t=[],n=[],r=s(e.replace(B,"$1"));return r[b]?se(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:se(function(e){return function(t){return oe(e,t).length>0}}),contains:se(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:se(function(e){return U.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:de(!1),disabled:de(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:he(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:he(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=r.pseudos.eq;for(t in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})r.pseudos[t]=fe(t);for(t in{submit:!0,reset:!0})r.pseudos[t]=pe(t);function ye(){}ye.prototype=r.filters=r.pseudos,r.setFilters=new ye,a=oe.tokenize=function(e,t){var n,i,o,a,s,u,l,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=r.preFilter;while(s){n&&!(i=F.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),n=!1,(i=_.exec(s))&&(n=i.shift(),o.push({value:n,type:i[0].replace(B," ")}),s=s.slice(n.length));for(a in r.filter)!(i=V[a].exec(s))||l[a]&&!(i=l[a](i))||(n=i.shift(),o.push({value:n,type:a,matches:i}),s=s.slice(n.length));if(!n)break}return t?s.length:s?oe.error(e):k(e,u).slice(0)};function ve(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function me(e,t,n){var r=t.dir,i=t.next,o=i||r,a=n&&"parentNode"===o,s=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||a)return e(t,n,i);return!1}:function(t,n,u){var l,c,f,p=[T,s];if(u){while(t=t[r])if((1===t.nodeType||a)&&e(t,n,u))return!0}else while(t=t[r])if(1===t.nodeType||a)if(f=t[b]||(t[b]={}),c=f[t.uniqueID]||(f[t.uniqueID]={}),i&&i===t.nodeName.toLowerCase())t=t[r]||t;else{if((l=c[o])&&l[0]===T&&l[1]===s)return p[2]=l[2];if(c[o]=p,p[2]=e(t,n,u))return!0}return!1}}function xe(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function be(e,t,n){for(var r=0,i=t.length;r<i;r++)oe(e,t[r],n);return n}function we(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Te(e,t,n,r,i,o){return r&&!r[b]&&(r=Te(r)),i&&!i[b]&&(i=Te(i,o)),se(function(o,a,s,u){var l,c,f,p=[],d=[],h=a.length,g=o||be(t||"*",s.nodeType?[s]:s,[]),y=!e||!o&&t?g:we(g,p,e,s,u),v=n?i||(o?e:h||r)?[]:a:y;if(n&&n(y,v,s,u),r){l=we(v,d),r(l,[],s,u),c=l.length;while(c--)(f=l[c])&&(v[d[c]]=!(y[d[c]]=f))}if(o){if(i||e){if(i){l=[],c=v.length;while(c--)(f=v[c])&&l.push(y[c]=f);i(null,v=[],l,u)}c=v.length;while(c--)(f=v[c])&&(l=i?O(o,f):p[c])>-1&&(o[l]=!(a[l]=f))}}else v=we(v===a?v.splice(h,v.length):v),i?i(null,a,v,u):L.apply(a,v)})}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=me(function(e){return e===t},s,!0),f=me(function(e){return O(t,e)>-1},s,!0),p=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];u<o;u++)if(n=r.relative[e[u].type])p=[me(xe(p),n)];else{if((n=r.filter[e[u].type].apply(null,e[u].matches))[b]){for(i=++u;i<o;i++)if(r.relative[e[i].type])break;return Te(u>1&&xe(p),u>1&&ve(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(B,"$1"),n,u<i&&Ce(e.slice(u,i)),i<o&&Ce(e=e.slice(i)),i<o&&ve(e))}p.push(n)}return xe(p)}function Ee(e,t){var n=t.length>0,i=e.length>0,o=function(o,a,s,u,c){var f,h,y,v=0,m="0",x=o&&[],b=[],w=l,C=o||i&&r.find.TAG("*",c),E=T+=null==w?1:Math.random()||.1,k=C.length;for(c&&(l=a===d||a||c);m!==k&&null!=(f=C[m]);m++){if(i&&f){h=0,a||f.ownerDocument===d||(p(f),s=!g);while(y=e[h++])if(y(f,a||d,s)){u.push(f);break}c&&(T=E)}n&&((f=!y&&f)&&v--,o&&x.push(f))}if(v+=m,n&&m!==v){h=0;while(y=t[h++])y(x,b,a,s);if(o){if(v>0)while(m--)x[m]||b[m]||(b[m]=j.call(u));b=we(b)}L.apply(u,b),c&&!o&&b.length>0&&v+t.length>1&&oe.uniqueSort(u)}return c&&(T=E,l=w),x};return n?se(o):o}return s=oe.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Ce(t[n]))[b]?r.push(o):i.push(o);(o=S(e,Ee(i,r))).selector=e}return o},u=oe.select=function(e,t,n,i){var o,u,l,c,f,p="function"==typeof e&&e,d=!i&&a(e=p.selector||e);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&g&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;p&&(t=t.parentNode),e=e.slice(u.shift().value.length)}o=V.needsContext.test(e)?0:u.length;while(o--){if(l=u[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),K.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&ve(u)))return L.apply(n,i),n;break}}}return(p||s(e,d))(i,t,!g,n,!t||K.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(D).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ue(function(e){return 1&e.compareDocumentPosition(d.createElement("fieldset"))}),ue(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ue(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ue(function(e){return null==e.getAttribute("disabled")})||le(P,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var k=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},D=w.expr.match.needsContext;function N(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var A=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return u.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t<r;t++)if(w.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)w.find(e,i[t],n);return r>1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&D.test(e)?w(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,q=w(r);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(w.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&w(e);if(!D.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?u.call(w(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return k(e,"parentNode")},parentsUntil:function(e,t,n){return k(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return k(e,"nextSibling")},prevAll:function(e){return k(e,"previousSibling")},nextUntil:function(e,t,n){return k(e,"nextSibling",n)},prevUntil:function(e,t,n){return k(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return N(e,"iframe")?e.contentDocument:(N(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(O[e]||w.uniqueSort(i),H.test(e)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(M)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1){n=a.shift();while(++s<o.length)!1===o[s].apply(n[0],n[1])&&e.stopOnFalse&&(s=o.length,n=!1)}e.memory||(n=!1),t=!1,i&&(o=n?[]:"")},l={add:function(){return o&&(n&&!t&&(s=o.length-1,a.push(n)),function t(n){w.each(n,function(n,r){g(r)?e.unique&&l.has(r)||o.push(r):r&&r.length&&"string"!==x(r)&&t(r)})}(arguments),n&&!t&&u()),this},remove:function(){return w.each(arguments,function(e,t){var n;while((n=w.inArray(t,o,n))>-1)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function I(e){return e}function W(e){throw e}function $(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var s=this,u=arguments,l=function(){var e,l;if(!(t<o)){if((e=r.apply(s,u))===n.promise())throw new TypeError("Thenable self-resolution");l=e&&("object"==typeof e||"function"==typeof e)&&e.then,g(l)?i?l.call(e,a(o,n,I,i),a(o,n,W,i)):(o++,l.call(e,a(o,n,I,i),a(o,n,W,i),a(o,n,I,n.notifyWith))):(r!==I&&(s=void 0,u=[e]),(i||n.resolveWith)(s,u))}},c=i?l:function(){try{l()}catch(e){w.Deferred.exceptionHook&&w.Deferred.exceptionHook(e,c.stackTrace),t+1>=o&&(r!==W&&(s=void 0,u=[e]),n.rejectWith(s,u))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:I,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:I)),n[2][3].add(a(0,e,g(r)?r:W))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],s=t[5];i[t[1]]=a.add,s&&a.add(function(){r=s},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),s=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&($(e,a.done(s(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)$(i[n],s(n),a.reject);return a.promise()}});var B=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&B.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function _(){r.removeEventListener("DOMContentLoaded",_),e.removeEventListener("load",_),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",_),e.addEventListener("load",_));var z=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n)){i=!0;for(s in n)z(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},X=/^-ms-/,U=/-([a-z])/g;function V(e,t){return t.toUpperCase()}function G(e){return e.replace(X,"ms-").replace(U,V)}var Y=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Q(){this.expando=w.expando+Q.uid++}Q.uid=1,Q.prototype={cache:function(e){var t=e[this.expando];return t||(t={},Y(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[G(t)]=n;else for(r in t)i[G(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][G(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(G):(t=G(t))in r?[t]:t.match(M)||[]).length;while(n--)delete r[t[n]]}(void 0===t||w.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!w.isEmptyObject(t)}};var J=new Q,K=new Q,Z=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,ee=/[A-Z]/g;function te(e){return"true"===e||"false"!==e&&("null"===e?null:e===+e+""?+e:Z.test(e)?JSON.parse(e):e)}function ne(e,t,n){var r;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(ee,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n=te(n)}catch(e){}K.set(e,t,n)}else n=void 0;return n}w.extend({hasData:function(e){return K.hasData(e)||J.hasData(e)},data:function(e,t,n){return K.access(e,t,n)},removeData:function(e,t){K.remove(e,t)},_data:function(e,t,n){return J.access(e,t,n)},_removeData:function(e,t){J.remove(e,t)}}),w.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=K.get(o),1===o.nodeType&&!J.get(o,"hasDataAttrs"))){n=a.length;while(n--)a[n]&&0===(r=a[n].name).indexOf("data-")&&(r=G(r.slice(5)),ne(o,r,i[r]));J.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof e?this.each(function(){K.set(this,e)}):z(this,function(t){var n;if(o&&void 0===t){if(void 0!==(n=K.get(o,e)))return n;if(void 0!==(n=ne(o,e)))return n}else this.each(function(){K.set(this,e,t)})},null,t,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){K.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=J.get(e,t),n&&(!r||Array.isArray(n)?r=J.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:w.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?w.queue(this[0],e):void 0===t?this:this.each(function(){var n=w.queue(this,e,t);w._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&w.dequeue(this,e)})},dequeue:function(e){return this.each(function(){w.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=w.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=J.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var re=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ie=new RegExp("^(?:([+-])=|)("+re+")([a-z%]*)$","i"),oe=["Top","Right","Bottom","Left"],ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&w.contains(e.ownerDocument,e)&&"none"===w.css(e,"display")},se=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i};function ue(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return w.css(e,t,"")},u=s(),l=n&&n[3]||(w.cssNumber[t]?"":"px"),c=(w.cssNumber[t]||"px"!==l&&+u)&&ie.exec(w.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)w.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,w.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var le={};function ce(e){var t,n=e.ownerDocument,r=e.nodeName,i=le[r];return i||(t=n.body.appendChild(n.createElement(r)),i=w.css(t,"display"),t.parentNode.removeChild(t),"none"===i&&(i="block"),le[r]=i,i)}function fe(e,t){for(var n,r,i=[],o=0,a=e.length;o<a;o++)(r=e[o]).style&&(n=r.style.display,t?("none"===n&&(i[o]=J.get(r,"display")||null,i[o]||(r.style.display="")),""===r.style.display&&ae(r)&&(i[o]=ce(r))):"none"!==n&&(i[o]="none",J.set(r,"display",n)));for(o=0;o<a;o++)null!=i[o]&&(e[o].style.display=i[o]);return e}w.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?w(this).show():w(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?w.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n<r;n++)J.set(e[n],"globalEval",!t||J.get(t[n],"globalEval"))}var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===x(o))w.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+w.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;w.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&w.inArray(o,r)>-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="<textarea>x</textarea>",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var be=r.documentElement,we=/^key/,Te=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ce=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function ke(){return!1}function Se(){try{return r.activeElement}catch(e){}}function De(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)De(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=ke;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.get(e);if(y){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(be,i),n.guid||(n.guid=w.guid++),(u=y.events)||(u=y.events={}),(a=y.handle)||(a=y.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(M)||[""]).length;while(l--)d=g=(s=Ce.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=w.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=w.event.special[d]||{},c=w.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(d,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),w.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.hasData(e)&&J.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(M)||[""]).length;while(l--)if(s=Ce.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){f=w.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||w.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)w.event.remove(e,d+t[l],n,r,!0);w.isEmptyObject(u)&&J.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,s,u=new Array(arguments.length),l=(J.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(u[0]=t,n=1;n<arguments.length;n++)u[n]=arguments[n];if(t.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,t)){s=w.event.handlers.call(this,t,l),n=0;while((o=s[n++])&&!t.isPropagationStopped()){t.currentTarget=o.elem,r=0;while((a=o.handlers[r++])&&!t.isImmediatePropagationStopped())t.rnamespace&&!t.rnamespace.test(a.namespace)||(t.handleObj=a,t.data=a.data,void 0!==(i=((w.event.special[a.origType]||{}).handle||a.handler).apply(o.elem,u))&&!1===(t.result=i)&&(t.preventDefault(),t.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,t),t.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&e.button>=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?w(i,this).index(l)>-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(e,t){Object.defineProperty(w.Event.prototype,e,{enumerable:!0,configurable:!0,get:g(t)?function(){if(this.originalEvent)return t(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[e]},set:function(t){Object.defineProperty(this,e,{enumerable:!0,configurable:!0,writable:!0,value:t})}})},fix:function(e){return e[w.expando]?e:new w.Event(e)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==Se()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===Se()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&N(this,"input"))return this.click(),!1},_default:function(e){return N(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},w.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},w.Event=function(e,t){if(!(this instanceof w.Event))return new w.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ee:ke,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&w.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[w.expando]=!0},w.Event.prototype={constructor:w.Event,isDefaultPrevented:ke,isPropagationStopped:ke,isImmediatePropagationStopped:ke,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ee,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ee,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ee,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},w.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&we.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Te.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},w.event.addProp),w.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){w.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||w.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),w.fn.extend({on:function(e,t,n,r){return De(this,e,t,n,r)},one:function(e,t,n,r){return De(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,w(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=ke),this.each(function(){w.event.remove(this,e,n,t)})}});var Ne=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,Ae=/<script|<style|<link/i,je=/checked\s*(?:[^=]|=\s*.checked.)/i,qe=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Le(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Oe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Pe(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),a=J.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n<r;n++)w.event.add(t,i,l[i][n])}K.hasData(e)&&(s=K.access(e),u=w.extend({},s),K.set(t,u))}}function Me(e,t){var n=t.nodeName.toLowerCase();"input"===n&&pe.test(e.type)?t.checked=e.checked:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}function Re(e,t,n,r){t=a.apply([],t);var i,o,s,u,l,c,f=0,p=e.length,d=p-1,y=t[0],v=g(y);if(v||p>1&&"string"==typeof y&&!h.checkClone&&je.test(y))return e.each(function(i){var o=e.eq(i);v&&(t[0]=y.call(this,i,o.html())),Re(o,t,n,r)});if(p&&(i=xe(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(u=(s=w.map(ye(i,"script"),He)).length;f<p;f++)l=i,f!==d&&(l=w.clone(l,!0,!0),u&&w.merge(s,ye(l,"script"))),n.call(e[f],l,f);if(u)for(c=s[s.length-1].ownerDocument,w.map(s,Oe),f=0;f<u;f++)l=s[f],he.test(l.type||"")&&!J.access(l,"globalEval")&&w.contains(c,l)&&(l.src&&"module"!==(l.type||"").toLowerCase()?w._evalUrl&&w._evalUrl(l.src):m(l.textContent.replace(qe,""),c,l))}return e}function Ie(e,t,n){for(var r,i=t?w.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||w.cleanData(ye(r)),r.parentNode&&(n&&w.contains(r.ownerDocument,r)&&ve(ye(r,"script")),r.parentNode.removeChild(r));return e}w.extend({htmlPrefilter:function(e){return e.replace(Ne,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s=e.cloneNode(!0),u=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ye(s),r=0,i=(o=ye(e)).length;r<i;r++)Me(o[r],a[r]);if(t)if(n)for(o=o||ye(e),a=a||ye(s),r=0,i=o.length;r<i;r++)Pe(o[r],a[r]);else Pe(e,s);return(a=ye(s,"script")).length>0&&ve(a,!u&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[J.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Ie(this,e,!0)},remove:function(e){return Ie(this,e)},text:function(e){return z(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Le(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Le(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return z(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ae.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(w.cleanData(ye(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return Re(this,arguments,function(t){var n=this.parentNode;w.inArray(this,e)<0&&(w.cleanData(ye(this)),n&&n.replaceChild(t,this))},e)}}),w.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){w.fn[e]=function(e){for(var n,r=[],i=w(e),o=i.length-1,a=0;a<=o;a++)n=a===o?this:this.clone(!0),w(i[a])[t](n),s.apply(r,n.get());return this.pushStack(r)}});var We=new RegExp("^("+re+")(?!px)[a-z%]+$","i"),$e=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},Be=new RegExp(oe.join("|"),"i");!function(){function t(){if(c){l.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",c.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",be.appendChild(l).appendChild(c);var t=e.getComputedStyle(c);i="1%"!==t.top,u=12===n(t.marginLeft),c.style.right="60%",s=36===n(t.right),o=36===n(t.width),c.style.position="absolute",a=36===c.offsetWidth||"absolute",be.removeChild(l),c=null}}function n(e){return Math.round(parseFloat(e))}var i,o,a,s,u,l=r.createElement("div"),c=r.createElement("div");c.style&&(c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",h.clearCloneStyle="content-box"===c.style.backgroundClip,w.extend(h,{boxSizingReliable:function(){return t(),o},pixelBoxStyles:function(){return t(),s},pixelPosition:function(){return t(),i},reliableMarginLeft:function(){return t(),u},scrollboxSize:function(){return t(),a}}))}();function Fe(e,t,n){var r,i,o,a,s=e.style;return(n=n||$e(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||w.contains(e.ownerDocument,e)||(a=w.style(e,t)),!h.pixelBoxStyles()&&We.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function _e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}var ze=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ue={position:"absolute",visibility:"hidden",display:"block"},Ve={letterSpacing:"0",fontWeight:"400"},Ge=["Webkit","Moz","ms"],Ye=r.createElement("div").style;function Qe(e){if(e in Ye)return e;var t=e[0].toUpperCase()+e.slice(1),n=Ge.length;while(n--)if((e=Ge[n]+t)in Ye)return e}function Je(e){var t=w.cssProps[e];return t||(t=w.cssProps[e]=Qe(e)||e),t}function Ke(e,t,n){var r=ie.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ze(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=w.css(e,n+oe[a],!0,i)),r?("content"===n&&(u-=w.css(e,"padding"+oe[a],!0,i)),"margin"!==n&&(u-=w.css(e,"border"+oe[a]+"Width",!0,i))):(u+=w.css(e,"padding"+oe[a],!0,i),"padding"!==n?u+=w.css(e,"border"+oe[a]+"Width",!0,i):s+=w.css(e,"border"+oe[a]+"Width",!0,i));return!r&&o>=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))),u}function et(e,t,n){var r=$e(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(We.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=G(t),u=Xe.test(t),l=e.style;if(u||(t=Je(s)),a=w.cssHooks[t]||w.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ue(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[s]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=G(t);return Xe.test(t)||(t=Je(s)),(a=w.cssHooks[t]||w.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Ve&&(i=Ve[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!ze.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):se(e,Ue,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=$e(e),a="border-box"===w.css(e,"boxSizing",!1,o),s=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(s-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),s&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Ke(e,n,s)}}}),w.cssHooks.marginLeft=_e(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-se(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Ke)}),w.fn.extend({css:function(e,t){return z(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=$e(e),i=t.length;a<i;a++)o[t[a]]=w.css(e,t[a],!1,r);return o}return void 0!==n?w.style(e,t,n):w.css(e,t)},e,t,arguments.length>1)}});function tt(e,t,n,r,i){return new tt.prototype.init(e,t,n,r,i)}w.Tween=tt,tt.prototype={constructor:tt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||w.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(w.cssNumber[n]?"":"px")},cur:function(){var e=tt.propHooks[this.prop];return e&&e.get?e.get(this):tt.propHooks._default.get(this)},run:function(e){var t,n=tt.propHooks[this.prop];return this.options.duration?this.pos=t=w.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):tt.propHooks._default.set(this),this}},tt.prototype.init.prototype=tt.prototype,tt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=w.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){w.fx.step[e.prop]?w.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[w.cssProps[e.prop]]&&!w.cssHooks[e.prop]?e.elem[e.prop]=e.now:w.style(e.elem,e.prop,e.now+e.unit)}}},tt.propHooks.scrollTop=tt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},w.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},w.fx=tt.prototype.init,w.fx.step={};var nt,rt,it=/^(?:toggle|show|hide)$/,ot=/queueHooks$/;function at(){rt&&(!1===r.hidden&&e.requestAnimationFrame?e.requestAnimationFrame(at):e.setTimeout(at,w.fx.interval),w.fx.tick())}function st(){return e.setTimeout(function(){nt=void 0}),nt=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function lt(e,t,n){for(var r,i=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ct(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),y=J.get(e,"fxshow");n.queue||(null==(a=w._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,w.queue(e,"fx").length||a.empty.fire()})}));for(r in t)if(i=t[r],it.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!y||void 0===y[r])continue;g=!0}d[r]=y&&y[r]||w.style(e,r)}if((u=!w.isEmptyObject(t))||!w.isEmptyObject(d)){f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=y&&y.display)&&(l=J.get(e,"display")),"none"===(c=w.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=w.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===w.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1;for(r in d)u||(y?"hidden"in y&&(g=y.hidden):y=J.access(e,"fxshow",{display:l}),o&&(y.hidden=!g),g&&fe([e],!0),p.done(function(){g||fe([e]),J.remove(e,"fxshow");for(r in d)w.style(e,r,d[r])})),u=lt(g?y[r]:0,r,p),r in y||(y[r]=u.start,g&&(u.end=u.start,u.start=0))}}function ft(e,t){var n,r,i,o,a;for(n in e)if(r=G(n),i=t[r],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=w.cssHooks[r])&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function pt(e,t,n){var r,i,o=0,a=pt.prefilters.length,s=w.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=nt||st(),n=Math.max(0,l.startTime+l.duration-t),r=1-(n/l.duration||0),o=0,a=l.tweens.length;o<a;o++)l.tweens[o].run(r);return s.notifyWith(e,[l,r,n]),r<1&&a?n:(a||s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:w.extend({},t),opts:w.extend(!0,{specialEasing:{},easing:w.easing._default},n),originalProperties:t,originalOptions:n,startTime:nt||st(),duration:n.duration,tweens:[],createTween:function(t,n){var r=w.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(ft(c,l.opts.specialEasing);o<a;o++)if(r=pt.prefilters[o].call(l,e,c,l.opts))return g(r.stop)&&(w._queueHooks(l.elem,l.opts.queue).stop=r.stop.bind(r)),r;return w.map(c,lt,l),g(l.opts.start)&&l.opts.start.call(e,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),w.fx.timer(w.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l}w.Animation=w.extend(pt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return ue(n.elem,e,ie.exec(t),n),n}]},tweener:function(e,t){g(e)?(t=e,e=["*"]):e=e.match(M);for(var n,r=0,i=e.length;r<i;r++)n=e[r],pt.tweeners[n]=pt.tweeners[n]||[],pt.tweeners[n].unshift(t)},prefilters:[ct],prefilter:function(e,t){t?pt.prefilters.unshift(e):pt.prefilters.push(e)}}),w.speed=function(e,t,n){var r=e&&"object"==typeof e?w.extend({},e):{complete:n||!n&&t||g(e)&&e,duration:e,easing:n&&t||t&&!g(t)&&t};return w.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in w.fx.speeds?r.duration=w.fx.speeds[r.duration]:r.duration=w.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){g(r.old)&&r.old.call(this),r.queue&&w.dequeue(this,r.queue)},r},w.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=w.isEmptyObject(e),o=w.speed(t,n,r),a=function(){var t=pt(this,w.extend({},e),o);(i||J.get(this,"finish"))&&t.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&!1!==e&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=w.timers,a=J.get(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&ot.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||w.dequeue(this,e)})},finish:function(e){return!1!==e&&(e=e||"fx"),this.each(function(){var t,n=J.get(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=w.timers,a=r?r.length:0;for(n.finish=!0,w.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),w.each(["toggle","show","hide"],function(e,t){var n=w.fn[t];w.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ut(t,!0),e,r,i)}}),w.each({slideDown:ut("show"),slideUp:ut("hide"),slideToggle:ut("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){w.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),w.timers=[],w.fx.tick=function(){var e,t=0,n=w.timers;for(nt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||w.fx.stop(),nt=void 0},w.fx.timer=function(e){w.timers.push(e),w.fx.start()},w.fx.interval=13,w.fx.start=function(){rt||(rt=!0,at())},w.fx.stop=function(){rt=null},w.fx.speeds={slow:600,fast:200,_default:400},w.fn.delay=function(t,n){return t=w.fx?w.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e=r.createElement("input"),t=r.createElement("select").appendChild(r.createElement("option"));e.type="checkbox",h.checkOn=""!==e.value,h.optSelected=t.selected,(e=r.createElement("input")).value="t",e.type="radio",h.radioValue="t"===e.value}();var dt,ht=w.expr.attrHandle;w.fn.extend({attr:function(e,t){return z(this,w.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&N(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(M);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=ht[t]||w.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return z(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function vt(e){return(e.match(M)||[]).join(" ")}function mt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e?e.match(M)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,mt(this)))});if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,mt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,mt(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=xt(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=mt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+vt(mt(n))+" ").indexOf(t)>-1)return!0;return!1}});var bt=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:vt(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!N(n.parentNode,"optgroup"))){if(t=w(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=w.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=w.inArray(w.valHooks.option.get(r),o)>-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var wt=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,s,u,l,c,p,d,h,v=[i||r],m=f.call(t,"type")?t.type:t,x=f.call(t,"namespace")?t.namespace.split("."):[];if(s=h=u=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!wt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(x=m.split(".")).shift(),x.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=x.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+x.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),d=w.event.special[m]||{},o||!d.trigger||!1!==d.trigger.apply(i,n))){if(!o&&!d.noBubble&&!y(i)){for(l=d.delegateType||m,wt.test(l+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(i.ownerDocument||r)&&v.push(u.defaultView||u.parentWindow||e)}a=0;while((s=v[a++])&&!t.isPropagationStopped())h=s,t.type=a>1?l:d.bindType||m,(p=(J.get(s,"events")||{})[t.type]&&J.get(s,"handle"))&&p.apply(s,n),(p=c&&s[c])&&p.apply&&Y(s)&&(t.result=p.apply(s,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||d._default&&!1!==d._default.apply(v.pop(),n)||!Y(i)||c&&g(i[m])&&!y(i)&&((u=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,Tt),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,Tt),w.event.triggered=void 0,u&&(i[c]=u)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=J.access(r,t);i||r.addEventListener(e,n,!0),J.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=J.access(r,t)-1;i?J.access(r,t,i):(r.removeEventListener(e,n,!0),J.remove(r,t))}}});var Ct=e.location,Et=Date.now(),kt=/\?/;w.parseXML=function(t){var n;if(!t||"string"!=typeof t)return null;try{n=(new e.DOMParser).parseFromString(t,"text/xml")}catch(e){n=void 0}return n&&!n.getElementsByTagName("parsererror").length||w.error("Invalid XML: "+t),n};var St=/\[\]$/,Dt=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,At=/^(?:input|select|textarea|keygen)/i;function jt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||St.test(e)?r(e,i):jt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==x(t))r(e,t);else for(i in t)jt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&At.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}});var qt=/%20/g,Lt=/#.*$/,Ht=/([?&])_=[^&]*/,Ot=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mt=/^(?:GET|HEAD)$/,Rt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Bt=r.createElement("a");Bt.href=Ct.href;function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(M)||[];if(g(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function _t(e,t,n,r){var i={},o=e===Wt;function a(s){var u;return i[s]=!0,w.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)}),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function zt(e,t){var n,r,i=w.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&w.extend(!0,e,r),e}function Xt(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}function Ut(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:Pt.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":w.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,w.ajaxSettings),t):zt(w.ajaxSettings,e)},ajaxPrefilter:Ft(It),ajaxTransport:Ft(Wt),ajax:function(t,n){"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,p,d,h=w.ajaxSetup({},n),g=h.context||h,y=h.context&&(g.nodeType||g.jquery)?w(g):w.event,v=w.Deferred(),m=w.Callbacks("once memory"),x=h.statusCode||{},b={},T={},C="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(c){if(!s){s={};while(t=Ot.exec(a))s[t[1].toLowerCase()]=t[2]}t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return c?a:null},setRequestHeader:function(e,t){return null==c&&(e=T[e.toLowerCase()]=T[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)E.always(e[E.status]);else for(t in e)x[t]=[x[t],e[t]];return this},abort:function(e){var t=e||C;return i&&i.abort(t),k(0,t),this}};if(v.promise(E),h.url=((t||h.url||Ct.href)+"").replace(Rt,Ct.protocol+"//"),h.type=n.method||n.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){l=r.createElement("a");try{l.href=h.url,l.href=l.href,h.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=w.param(h.data,h.traditional)),_t(It,h,n,E),c)return E;(f=w.event&&h.global)&&0==w.active++&&w.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Mt.test(h.type),o=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(qt,"+")):(d=h.url.slice(o.length),h.data&&(h.processData||"string"==typeof h.data)&&(o+=(kt.test(o)?"&":"?")+h.data,delete h.data),!1===h.cache&&(o=o.replace(Ht,"$1"),d=(kt.test(o)?"&":"?")+"_="+Et+++d),h.url=o+d),h.ifModified&&(w.lastModified[o]&&E.setRequestHeader("If-Modified-Since",w.lastModified[o]),w.etag[o]&&E.setRequestHeader("If-None-Match",w.etag[o])),(h.data&&h.hasContent&&!1!==h.contentType||n.contentType)&&E.setRequestHeader("Content-Type",h.contentType),E.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+$t+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)E.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(g,E,h)||c))return E.abort();if(C="abort",m.add(h.complete),E.done(h.success),E.fail(h.error),i=_t(Wt,h,n,E)){if(E.readyState=1,f&&y.trigger("ajaxSend",[E,h]),c)return E;h.async&&h.timeout>0&&(u=e.setTimeout(function(){E.abort("timeout")},h.timeout));try{c=!1,i.send(b,k)}catch(e){if(c)throw e;k(-1,e)}}else k(-1,"No Transport");function k(t,n,r,s){var l,p,d,b,T,C=n;c||(c=!0,u&&e.clearTimeout(u),i=void 0,a=s||"",E.readyState=t>0?4:0,l=t>=200&&t<300||304===t,r&&(b=Xt(h,E,r)),b=Ut(h,b,E,l),l?(h.ifModified&&((T=E.getResponseHeader("Last-Modified"))&&(w.lastModified[o]=T),(T=E.getResponseHeader("etag"))&&(w.etag[o]=T)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=b.state,p=b.data,l=!(d=b.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),E.status=t,E.statusText=(n||C)+"",l?v.resolveWith(g,[p,C,E]):v.rejectWith(g,[E,C,d]),E.statusCode(x),x=void 0,f&&y.trigger(l?"ajaxSuccess":"ajaxError",[E,h,l?p:d]),m.fireWith(g,[E,C]),f&&(y.trigger("ajaxComplete",[E,h]),--w.active||w.event.trigger("ajaxStop")))}return E},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,t){return w.get(e,void 0,t,"script")}}),w.each(["get","post"],function(e,t){w[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),w.ajax(w.extend({url:e,type:t,dataType:i,data:n,success:r},w.isPlainObject(e)&&e))}}),w._evalUrl=function(e){return w.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},w.ajaxSettings.xhr=function(){try{return new e.XMLHttpRequest}catch(e){}};var Vt={0:200,1223:204},Gt=w.ajaxSettings.xhr();h.cors=!!Gt&&"withCredentials"in Gt,h.ajax=Gt=!!Gt,w.ajaxTransport(function(t){var n,r;if(h.cors||Gt&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);n=function(e){return function(){n&&(n=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Vt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=n(),r=s.onerror=s.ontimeout=n("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&e.setTimeout(function(){n&&r()})},n=n("abort");try{s.send(t.hasContent&&t.data||null)}catch(e){if(n)throw e}},abort:function(){n&&n()}}}),w.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return w.globalEval(e),e}}}),w.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),w.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(i,o){t=w("<script>").prop({charset:e.scriptCharset,src:e.url}).on("load error",n=function(e){t.remove(),n=null,e&&o("error"===e.type?404:200,e.type)}),r.head.appendChild(t[0])},abort:function(){n&&n()}}}});var Yt=[],Qt=/(=)\?(?=&|$)|\?\?/;w.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Yt.pop()||w.expando+"_"+Et++;return this[e]=!0,e}}),w.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=!1!==t.jsonp&&(Qt.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&Qt.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=g(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(Qt,"$1"+i):!1!==t.jsonp&&(t.url+=(kt.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||w.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?w(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,Yt.push(i)),a&&g(o)&&o(a[0]),a=o=void 0}),"script"}),h.createHTMLDocument=function(){var e=r.implementation.createHTMLDocument("").body;return e.innerHTML="<form></form><form></form>",2===e.childNodes.length}(),w.parseHTML=function(e,t,n){if("string"!=typeof e)return[];"boolean"==typeof t&&(n=t,t=!1);var i,o,a;return t||(h.createHTMLDocument?((i=(t=r.implementation.createHTMLDocument("")).createElement("base")).href=r.location.href,t.head.appendChild(i)):t=r),o=A.exec(e),a=!n&&[],o?[t.createElement(o[1])]:(o=xe([e],t,a),a&&a.length&&w(a).remove(),w.merge([],o.childNodes))},w.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=vt(e.slice(s)),e=e.slice(0,s)),g(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&w.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?w("<div>").append(w.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},w.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){w.fn[t]=function(e){return this.on(t,e)}}),w.expr.pseudos.animated=function(e){return w.grep(w.timers,function(t){return e===t.elem}).length},w.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=w.css(e,"position"),f=w(e),p={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=w.css(e,"top"),u=w.css(e,"left"),(l=("absolute"===c||"fixed"===c)&&(o+u).indexOf("auto")>-1)?(a=(r=f.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),g(t)&&(t=t.call(e,n,w.extend({},s))),null!=t.top&&(p.top=t.top-s.top+a),null!=t.left&&(p.left=t.left-s.left+i),"using"in t?t.using.call(e,p):f.css(p)}},w.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){w.offset.setOffset(this,e,t)});var t,n,r=this[0];if(r)return r.getClientRects().length?(t=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:t.top+n.pageYOffset,left:t.left+n.pageXOffset}):{top:0,left:0}},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===w.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===w.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=w(e).offset()).top+=w.css(e,"borderTopWidth",!0),i.left+=w.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-w.css(r,"marginTop",!0),left:t.left-i.left-w.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===w.css(e,"position"))e=e.offsetParent;return e||be})}}),w.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n="pageYOffset"===t;w.fn[e]=function(r){return z(this,function(e,r,i){var o;if(y(e)?o=e:9===e.nodeType&&(o=e.defaultView),void 0===i)return o?o[t]:e[r];o?o.scrollTo(n?o.pageXOffset:i,n?i:o.pageYOffset):e[r]=i},e,r,arguments.length)}}),w.each(["top","left"],function(e,t){w.cssHooks[t]=_e(h.pixelPosition,function(e,n){if(n)return n=Fe(e,t),We.test(n)?w(e).position()[t]+"px":n})}),w.each({Height:"height",Width:"width"},function(e,t){w.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){w.fn[r]=function(i,o){var a=arguments.length&&(n||"boolean"!=typeof i),s=n||(!0===i||!0===o?"margin":"border");return z(this,function(t,n,i){var o;return y(t)?0===r.indexOf("outer")?t["inner"+e]:t.document.documentElement["client"+e]:9===t.nodeType?(o=t.documentElement,Math.max(t.body["scroll"+e],o["scroll"+e],t.body["offset"+e],o["offset"+e],o["client"+e])):void 0===i?w.css(t,n,s):w.style(t,n,i,s)},t,a?i:void 0,a)}})}),w.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,t){w.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),w.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),w.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),w.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),g(e))return r=o.call(arguments,2),i=function(){return e.apply(t||this,r.concat(o.call(arguments)))},i.guid=e.guid=e.guid||w.guid++,i},w.holdReady=function(e){e?w.readyWait++:w.ready(!0)},w.isArray=Array.isArray,w.parseJSON=JSON.parse,w.nodeName=N,w.isFunction=g,w.isWindow=y,w.camelCase=G,w.type=x,w.now=Date.now,w.isNumeric=function(e){var t=w.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return w});var Jt=e.jQuery,Kt=e.$;return w.noConflict=function(t){return e.$===w&&(e.$=Kt),t&&e.jQuery===w&&(e.jQuery=Jt),w},t||(e.jQuery=e.$=w),w});
+/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(D).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(D(this,e||[],!1))},not:function(e){return this.pushStack(D(this,e||[],!0))},is:function(e){return!!D(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^key/,we=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ce(){return!0}function Ee(){return!1}function Se(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ee;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Ae(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,Ce)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click",Ce),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ce:Ee,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Ee,isPropagationStopped:Ee,isImmediatePropagationStopped:Ee,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ce,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ce,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ce,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&be.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&we.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Ae(this,e,Se),!1},trigger:function(){return Ae(this,e),!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return ke(this,e,t,n,r)},one:function(e,t,n,r){return ke(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Ee),this.each(function(){S.event.remove(this,e,n,t)})}});var Ne=/<script|<style|<link/i,De=/checked\s*(?:[^=]|=\s*.checked.)/i,je=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function Pe(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&De.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Pe(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),Le)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,He),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(je,""),u,l))}return n}function Re(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Oe(o[r],a[r]);else Oe(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Re(this,e,!0)},remove:function(e){return Re(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Pe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Pe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ne.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Pe(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Me=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Ie=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},We=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Fe=new RegExp(ne.join("|"),"i");function Be(e,t,n){var r,i,o,a,s=e.style;return(n=n||Ie(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Me.test(a)&&Fe.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function $e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px",t.style.height="1px",n.style.height="9px",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=3<parseInt(r.height),re.removeChild(e)),a}}))}();var _e=["Webkit","Moz","ms"],ze=E.createElement("div").style,Ue={};function Xe(e){var t=S.cssProps[e]||Ue[e];return t||(e in ze?e:Ue[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=_e.length;while(n--)if((e=_e[n]+t)in ze)return e}(e)||e)}var Ve=/^(none|table(?!-c[ea]).+)/,Ge=/^--/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Ie(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Me.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Ge.test(t),l=e.style;if(u||(t=Xe(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Ge.test(t)||(t=Xe(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ve.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):We(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Ie(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=$e(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-We(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ie(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Xe(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",y.checkOn=""!==rt.value,y.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",y.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function vt(e){return(e.match(P)||[]).join(" ")}function yt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,yt(this)))});if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,yt(this)))});if(!arguments.length)return this.attr("class","");if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,yt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=mt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=yt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+vt(yt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:vt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||S.error("Invalid XML: "+e),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function Dt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):Dt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)Dt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)Dt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var jt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Bt(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function $t(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?$t($t(e,S.ajaxSettings),t):$t(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Bt(Rt,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ot.test(v.type),f=v.url.replace(qt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(jt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Et.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+It+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Bt(Mt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();y.cors=!!zt&&"withCredentials"in zt,y.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(y.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=vt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/system/blueprints/config/scheduler.yaml b/system/blueprints/config/scheduler.yaml
index c145045c7f..a8dce314bd 100644
--- a/system/blueprints/config/scheduler.yaml
+++ b/system/blueprints/config/scheduler.yaml
@@ -39,14 +39,16 @@ form:
             .command:
               type: text
               label: PLUGIN_ADMIN.COMMAND
-              placeholder: 'cd ~;ls -lah;'
+              placeholder: 'ls'
               validate:
                   required: true
             .args:
               type: text
               label: PLUGIN_ADMIN.EXTRA_ARGUMENTS
+              placeholder: '-lah'
             .at:
-              type: cron
+              type: text
+              wrapper_classes: cron-selector
               label: PLUGIN_ADMIN.SCHEDULER_RUNAT
               help: PLUGIN_ADMIN.SCHEDULER_RUNAT_HELP
               placeholder: '* * * * *'
diff --git a/system/blueprints/config/security.yaml b/system/blueprints/config/security.yaml
index e0296be28c..4e93e9b210 100644
--- a/system/blueprints/config/security.yaml
+++ b/system/blueprints/config/security.yaml
@@ -105,3 +105,15 @@ form:
             validate:
                 type: commalist
 
+
+        sanitize_svg:
+            type: toggle
+            label: PLUGIN_ADMIN.SANITIZE_SVG
+            help: PLUGIN_ADMIN.SANITIZE_SVG_HELP
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool
diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index f67b92c842..09e80837d7 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -1,1410 +1,1860 @@
 title: PLUGIN_ADMIN.SYSTEM
 
 form:
-    validation: loose
-    fields:
-
-        system_tabs:
-            type: tabs
-            classes: side-tabs
-
-            fields:
-                content:
-                    type: tab
-                    title: PLUGIN_ADMIN.CONTENT
-
-                    fields:
-                        content_section:
-                            type: section
-                            title: PLUGIN_ADMIN.CONTENT
-                            underline: true
-
-                        home.alias:
-                            type: pages
-                            size: large
-                            classes: fancy
-                            label: PLUGIN_ADMIN.HOME_PAGE
-                            show_all: false
-                            show_modular: false
-                            show_root: false
-                            show_slug: true
-                            help: PLUGIN_ADMIN.HOME_PAGE_HELP
-
-                        home.hide_in_urls:
-                            type: toggle
-                            label: PLUGIN_ADMIN.HIDE_HOME_IN_URLS
-                            help: PLUGIN_ADMIN.HIDE_HOME_IN_URLS_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.theme:
-                            type: themeselect
-                            classes: fancy
-                            selectize: true
-                            size: medium
-                            label: PLUGIN_ADMIN.DEFAULT_THEME
-                            help: PLUGIN_ADMIN.DEFAULT_THEME_HELP
-
-                        pages.process:
-                            type: checkboxes
-                            label: PLUGIN_ADMIN.PROCESS
-                            help: PLUGIN_ADMIN.PROCESS_HELP
-                            default: [markdown: true, twig: true]
-                            options:
-                                markdown: Markdown
-                                twig: Twig
-                            use: keys
-
-                        pages.types:
-                            type: array
-                            label: PLUGIN_ADMIN.PAGE_TYPES
-                            help: PLUGIN_ADMIN.PAGE_TYPES_HELP
-                            size: small
-                            default: ['html','htm','json','xml','txt','rss','atom']
-                            value_only: true
-
-                        timezone:
-                            type: select
-                            label: PLUGIN_ADMIN.TIMEZONE
-                            size: medium
-                            classes: fancy
-                            help: PLUGIN_ADMIN.TIMEZONE_HELP
-                            data-options@: '\Grav\Common\Utils::timezones'
-                            default: ''
-                            options:
-                                '': 'Default (Server Timezone)'
-
-                        pages.dateformat.default:
-                            type: select
-                            size: medium
-                            selectize:
-                                create: true
-                            label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT
-                            help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP
-                            placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER
-                            data-options@: '\Grav\Common\Utils::dateFormats'
-                            validate:
-                                type: string
-
-                        pages.dateformat.short:
-                            type: dateformat
-                            size: medium
-                            classes: fancy
-                            label: PLUGIN_ADMIN.SHORT_DATE_FORMAT
-                            help: PLUGIN_ADMIN.SHORT_DATE_FORMAT_HELP
-                            default: "jS M Y"
-                            options:
-                                "F jS \\a\\t g:ia": Date1
-                                "l jS \\of F g:i A": Date2
-                                "D, d M Y G:i:s": Date3
-                                "d-m-y G:i": Date4
-                                "jS M Y": Date5
-
-                        pages.dateformat.long:
-                            type: dateformat
-                            size: medium
-                            classes: fancy
-                            label: PLUGIN_ADMIN.LONG_DATE_FORMAT
-                            help: PLUGIN_ADMIN.LONG_DATE_FORMAT_HELP
-                            options:
-                                "F jS \\a\\t g:ia": Date1
-                                "l jS \\of F g:i A": Date2
-                                "D, d M Y G:i:s": Date3
-                                "d-m-y G:i": Date4
-                                "jS M Y": Date5
-
-                        pages.order.by:
-                            type: select
-                            size: large
-                            classes: fancy
-                            label: PLUGIN_ADMIN.DEFAULT_ORDERING
-                            help: PLUGIN_ADMIN.DEFAULT_ORDERING_HELP
-                            options:
-                                default: PLUGIN_ADMIN.DEFAULT_ORDERING_DEFAULT
-                                folder: PLUGIN_ADMIN.DEFAULT_ORDERING_FOLDER
-                                title: PLUGIN_ADMIN.DEFAULT_ORDERING_TITLE
-                                date: PLUGIN_ADMIN.DEFAULT_ORDERING_DATE
-
-                        pages.order.dir:
-                            type: toggle
-                            label: PLUGIN_ADMIN.DEFAULT_ORDER_DIRECTION
-                            highlight: asc
-                            default: desc
-                            help: PLUGIN_ADMIN.DEFAULT_ORDER_DIRECTION_HELP
-                            options:
-                                asc: PLUGIN_ADMIN.ASCENDING
-                                desc: PLUGIN_ADMIN.DESCENDING
-
-                        pages.list.count:
-                            type: text
-                            size: x-small
-                            append: PLUGIN_ADMIN.PAGES
-                            label: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT
-                            help: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT_HELP
-                            validate:
-                                type: number
-                                min: 1
-
-                        pages.publish_dates:
-                            type: toggle
-                            label: PLUGIN_ADMIN.DATE_BASED_PUBLISHING
-                            help: PLUGIN_ADMIN.DATE_BASED_PUBLISHING_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.events:
-                             type: checkboxes
-                             label: PLUGIN_ADMIN.EVENTS
-                             help: PLUGIN_ADMIN.EVENTS_HELP
-                             default: [page: true, twig: true]
-                             options:
-                                 page: Page Events
-                                 twig: Twig Events
-                             use: keys
-
-                        pages.append_url_extension:
-                            type: text
-                            size: x-small
-                            placeholder: "e.g. .html"
-                            label: PLUGIN_ADMIN.APPEND_URL_EXT
-                            help: PLUGIN_ADMIN.APPEND_URL_EXT_HELP
-
-                        pages.redirect_default_route:
-                            type: toggle
-                            label: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE
-                            help: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.redirect_default_code:
-                            type: select
-                            size: medium
-                            classes: fancy
-                            label: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE
-                            help: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE_HELP
-                            options:
-                                301: 301 - Permanent
-                                302: 302 - Found
-                                303: 303 - Other
-                                304: 304 - Not Modified
-
-                        pages.redirect_trailing_slash:
-                            type: toggle
-                            label: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH
-                            help: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.ignore_hidden:
-                            type: toggle
-                            label: PLUGIN_ADMIN.IGNORE_HIDDEN
-                            help: PLUGIN_ADMIN.IGNORE_HIDDEN_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.ignore_files:
-                            type: selectize
-                            size: large
-                            label: PLUGIN_ADMIN.IGNORE_FILES
-                            help: PLUGIN_ADMIN.IGNORE_FILES_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                        pages.ignore_folders:
-                            type: selectize
-                            size: large
-                            label: PLUGIN_ADMIN.IGNORE_FOLDERS
-                            help: PLUGIN_ADMIN.IGNORE_FOLDERS_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                        pages.hide_empty_folders:
-                            type: selectize
-                            size: large
-                            label: PLUGIN_ADMIN.HIDE_EMPTY_FOLDERS
-                            help: PLUGIN_ADMIN.HIDE_EMPTY_FOLDERS_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                        pages.url_taxonomy_filters:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ALLOW_URL_TAXONOMY_FILTERS
-                            help: PLUGIN_ADMIN.ALLOW_URL_TAXONOMY_FILTERS_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.twig_first:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TWIG_FIRST
-                            help: PLUGIN_ADMIN.TWIG_FIRST_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.never_cache_twig:
-                            type: toggle
-                            label: PLUGIN_ADMIN.NEVER_CACHE_TWIG
-                            help: PLUGIN_ADMIN.NEVER_CACHE_TWIG_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.frontmatter.process_twig:
-                            type: toggle
-                            label: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG
-                            help: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        pages.frontmatter.ignore_fields:
-                            type: selectize
-                            size: large
-                            placeholder: "e.g. forms"
-                            label: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS
-                            help: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                languages:
-                    type: tab
-                    title: PLUGIN_ADMIN.LANGUAGES
-
-                    fields:
-                        languages-section:
-                            type: section
-                            title: PLUGIN_ADMIN.LANGUAGES
-                            underline: true
-
-                        languages.supported:
-                            type: selectize
-                            size: large
-                            placeholder: "e.g. en, fr"
-                            label: PLUGIN_ADMIN.SUPPORTED
-                            help: PLUGIN_ADMIN.SUPPORTED_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                        languages.default_lang:
-                            type: text
-                            size: x-small
-                            label: PLUGIN_ADMIN.DEFAULT_LANG
-                            help: PLUGIN_ADMIN.DEFAULT_LANG_HELP
-
-                        languages.include_default_lang:
-                            type: toggle
-                            label: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG
-                            help: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.pages_fallback_only:
-                            type: toggle
-                            label: PLUGIN_ADMIN.PAGES_FALLBACK_ONLY
-                            help: PLUGIN_ADMIN.PAGES_FALLBACK_ONLY_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.translations:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TRANSLATIONS_ENABLED
-                            help: PLUGIN_ADMIN.TRANSLATIONS_ENABLED_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.translations_fallback:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TRANSLATIONS_FALLBACK
-                            help: PLUGIN_ADMIN.TRANSLATIONS_FALLBACK_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.session_store_active:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ACTIVE_LANGUAGE_IN_SESSION
-                            help: PLUGIN_ADMIN.ACTIVE_LANGUAGE_IN_SESSION_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.http_accept_language:
-                            type: toggle
-                            label: PLUGIN_ADMIN.HTTP_ACCEPT_LANGUAGE
-                            help: PLUGIN_ADMIN.HTTP_ACCEPT_LANGUAGE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        languages.override_locale:
-                            type: toggle
-                            label: PLUGIN_ADMIN.OVERRIDE_LOCALE
-                            help: PLUGIN_ADMIN.OVERRIDE_LOCALE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                http_headers:
-                    type: tab
-                    title: PLUGIN_ADMIN.HTTP_HEADERS
-
-                    fields:
-                        http_headers_section:
-                            type: section
-                            title: PLUGIN_ADMIN.HTTP_HEADERS
-                            underline: true
-
-                        pages.expires:
-                            type: text
-                            size: small
-                            append: GRAV.NICETIME.SECOND_PLURAL
-                            label: PLUGIN_ADMIN.EXPIRES
-                            help: PLUGIN_ADMIN.EXPIRES_HELP
-                            validate:
-                                type: number
-                                min: 1
-                        pages.cache_control:
-                            type: text
-                            size: medium
-                            label: PLUGIN_ADMIN.CACHE_CONTROL
-                            help: PLUGIN_ADMIN.CACHE_CONTROL_HELP
-                            placeholder: 'e.g. public, max-age=31536000'
-                        pages.last_modified:
-                            type: toggle
-                            label: PLUGIN_ADMIN.LAST_MODIFIED
-                            help: PLUGIN_ADMIN.LAST_MODIFIED_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-                        pages.etag:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ETAG
-                            help: PLUGIN_ADMIN.ETAG_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-                        pages.vary_accept_encoding:
-                            type: toggle
-                            label: PLUGIN_ADMIN.VARY_ACCEPT_ENCODING
-                            help: PLUGIN_ADMIN.VARY_ACCEPT_ENCODING_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                markdown:
-                    type: tab
-                    title: PLUGIN_ADMIN.MARKDOWN
-
-                    fields:
-                        markdow_section:
-                            type: section
-                            title: PLUGIN_ADMIN.MARKDOWN
-                            underline: true
-
-                        pages.markdown.extra:
-                            type: toggle
-                            label: Markdown extra
-                            help: PLUGIN_ADMIN.MARKDOWN_EXTRA_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-                        pages.markdown.auto_line_breaks:
-                            type: toggle
-                            label: PLUGIN_ADMIN.AUTO_LINE_BREAKS
-                            help: PLUGIN_ADMIN.AUTO_LINE_BREAKS_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-                        pages.markdown.auto_url_links:
-                            type: toggle
-                            label: PLUGIN_ADMIN.AUTO_URL_LINKS
-                            help: PLUGIN_ADMIN.AUTO_URL_LINKS_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-                        pages.markdown.escape_markup:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ESCAPE_MARKUP
-                            help: PLUGIN_ADMIN.ESCAPE_MARKUP_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                caching:
-                    type: tab
-                    title: PLUGIN_ADMIN.CACHING
-
-                    fields:
-                        caching_section:
-                            type: section
-                            title: PLUGIN_ADMIN.CACHING
-                            underline: true
-
-                        cache.enabled:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CACHING
-                            help: PLUGIN_ADMIN.CACHING_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        cache.check.method:
-                            type: select
-                            size: medium
-                            classes: fancy
-                            label: PLUGIN_ADMIN.CACHE_CHECK_METHOD
-                            help: PLUGIN_ADMIN.CACHE_CHECK_METHOD_HELP
-                            options:
-                                file: Markdown + Yaml file timestamps
-                                folder: Folder timestamps
-                                hash: All files timestamps
-                                none: No timestamp checking
-
-                        cache.driver:
-                            type: select
-                            size: small
-                            classes: fancy
-                            label: PLUGIN_ADMIN.CACHE_DRIVER
-                            help: PLUGIN_ADMIN.CACHE_DRIVER_HELP
-                            options:
-                                auto: Auto detect
-                                file: File
-                                apc: APC
-                                apcu: APCu
-                                xcache: Xcache
-                                memcache: Memcache
-                                memcached: Memcached
-                                wincache: WinCache
-                                redis: Redis
-
-                        cache.prefix:
-                            type: text
-                            size: x-small
-                            label: PLUGIN_ADMIN.CACHE_PREFIX
-                            help: PLUGIN_ADMIN.CACHE_PREFIX_HELP
-                            placeholder: PLUGIN_ADMIN.CACHE_PREFIX_PLACEHOLDER
-
-                        cache.purge_at:
-                            type: cron
-                            label: PLUGIN_ADMIN.CACHE_PURGE_JOB
-                            help: PLUGIN_ADMIN.CACHE_PURGE_JOB_HELP
-                            default: '* 4 * * *'
-
-                        cache.clear_at:
-                            type: cron
-                            label: PLUGIN_ADMIN.CACHE_CLEAR_JOB
-                            help: PLUGIN_ADMIN.CACHE_CLEAR_JOB_HELP
-                            default: '* 3 * * *'
-
-                        cache.clear_job_type:
-                            type: select
-                            size: medium
-                            label: PLUGIN_ADMIN.CACHE_JOB_TYPE
-                            help: PLUGIN_ADMIN.CACHE_JOB_TYPE_HELP
-                            options:
-                                standard: Standard Cache Folders
-                                all: All Cache Folders
-
-                        cache.clear_images_by_default:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CLEAR_IMAGES_BY_DEFAULT
-                            help: PLUGIN_ADMIN.CLEAR_IMAGES_BY_DEFAULT_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        cache.cli_compatibility:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CLI_COMPATIBILITY
-                            help: PLUGIN_ADMIN.CLI_COMPATIBILITY_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        cache.lifetime:
-                            type: text
-                            size: small
-                            append: GRAV.NICETIME.SECOND_PLURAL
-                            label: PLUGIN_ADMIN.LIFETIME
-                            help: PLUGIN_ADMIN.LIFETIME_HELP
-                            validate:
-                                type: number
-
-                        cache.gzip:
-                            type: toggle
-                            label: PLUGIN_ADMIN.GZIP_COMPRESSION
-                            help: PLUGIN_ADMIN.GZIP_COMPRESSION_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        cache.allow_webserver_gzip:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ALLOW_WEBSERVER_GZIP
-                            help: PLUGIN_ADMIN.ALLOW_WEBSERVER_GZIP_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        cache.memcache.server:
-                            type: text
-                            size: medium
-                            label: PLUGIN_ADMIN.MEMCACHE_SERVER
-                            help: PLUGIN_ADMIN.MEMCACHE_SERVER_HELP
-                            placeholder: "localhost"
-
-                        cache.memcache.port:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.MEMCACHE_PORT
-                            help: PLUGIN_ADMIN.MEMCACHE_PORT_HELP
-                            placeholder: "11211"
-
-                        cache.memcached.server:
-                            type: text
-                            size: medium
-                            label: PLUGIN_ADMIN.MEMCACHED_SERVER
-                            help: PLUGIN_ADMIN.MEMCACHED_SERVER_HELP
-                            placeholder: "localhost"
-
-                        cache.memcached.port:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.MEMCACHED_PORT
-                            help: PLUGIN_ADMIN.MEMCACHED_PORT_HELP
-                            placeholder: "11211"
-
-                        cache.redis.socket:
-                            type: text
-                            size: medium
-                            label: PLUGIN_ADMIN.REDIS_SOCKET
-                            help: PLUGIN_ADMIN.REDIS_SOCKET_HELP
-                            placeholder: "/var/run/redis/redis.sock"
-
-                        cache.redis.server:
-                            type: text
-                            size: medium
-                            label: PLUGIN_ADMIN.REDIS_SERVER
-                            help: PLUGIN_ADMIN.REDIS_SERVER_HELP
-                            placeholder: "localhost"
-
-                        cache.redis.port:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.REDIS_PORT
-                            help: PLUGIN_ADMIN.REDIS_PORT_HELP
-                            placeholder: "6379"
-
-                        cache.redis.password:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.REDIS_PASSWORD
-
-                twig:
-                    type: tab
-                    title: PLUGIN_ADMIN.TWIG_TEMPLATING
-
-                    fields:
-                        twig_section:
-                            type: section
-                            title: PLUGIN_ADMIN.TWIG_TEMPLATING
-                            underline: true
-
-                        twig.cache:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TWIG_CACHING
-                            help: PLUGIN_ADMIN.TWIG_CACHING_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        twig.debug:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TWIG_DEBUG
-                            help: PLUGIN_ADMIN.TWIG_DEBUG_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        twig.auto_reload:
-                            type: toggle
-                            label: PLUGIN_ADMIN.DETECT_CHANGES
-                            help: PLUGIN_ADMIN.DETECT_CHANGES_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        twig.autoescape:
-                            type: toggle
-                            label: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES
-                            help: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        twig.umask_fix:
-                            type: toggle
-                            label: PLUGIN_ADMIN.TWIG_UMASK_FIX
-                            help: PLUGIN_ADMIN.TWIG_UMASK_FIX_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                assets:
-                    type: tab
-                    title: PLUGIN_ADMIN.ASSETS
-
-                    fields:
-                        assets_section:
-                            type: section
-                            title: PLUGIN_ADMIN.ASSETS
-                            underline: true
-
-                        assets.css_pipeline:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_PIPELINE
-                            help: PLUGIN_ADMIN.CSS_PIPELINE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.css_pipeline_include_externals:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS
-                            help: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.css_pipeline_before_excludes:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES
-                            help: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.css_minify:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_MINIFY
-                            help: PLUGIN_ADMIN.CSS_MINIFY_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.css_minify_windows:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_MINIFY_WINDOWS_OVERRIDE
-                            help: PLUGIN_ADMIN.CSS_MINIFY_WINDOWS_OVERRIDE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        assets.css_rewrite:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CSS_REWRITE
-                            help: PLUGIN_ADMIN.CSS_REWRITE_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        assets.js_pipeline:
-                            type: toggle
-                            label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE
-                            help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        assets.js_pipeline_include_externals:
-                            type: toggle
-                            label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS
-                            help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.js_pipeline_before_excludes:
-                            type: toggle
-                            label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES
-                            help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                               type: bool
-
-                        assets.js_minify:
-                            type: toggle
-                            label: PLUGIN_ADMIN.JAVASCRIPT_MINIFY
-                            help: PLUGIN_ADMIN.JAVASCRIPT_MINIFY_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        assets.enable_asset_timestamp:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ENABLED_TIMESTAMPS_ON_ASSETS
-                            help: PLUGIN_ADMIN.ENABLED_TIMESTAMPS_ON_ASSETS_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        assets.collections:
-                            type: multilevel
-                            label: PLUGIN_ADMIN.COLLECTIONS
-                            placeholder_key: collection_name
-                            placeholder_value: collection_path
-                            validate:
-                                type: array
-
-                errors:
-                    type: tab
-                    title: PLUGIN_ADMIN.ERROR_HANDLER
-
-                    fields:
-                        errors_section:
-                            type: section
-                            title: PLUGIN_ADMIN.ERROR_HANDLER
-                            underline: true
-
-                        errors.display:
-                            type: select
-                            label: PLUGIN_ADMIN.DISPLAY_ERRORS
-                            help: PLUGIN_ADMIN.DISPLAY_ERRORS_HELP
-                            size: medium
-                            highlight: 1
-                            options:
-                                -1: PLUGIN_ADMIN.ERROR_SYSTEM
-                                0: PLUGIN_ADMIN.ERROR_SIMPLE
-                                1: PLUGIN_ADMIN.ERROR_FULL_BACKTRACE
-                            validate:
-                                type: int
-
-
-                        errors.log:
-                            type: toggle
-                            label: PLUGIN_ADMIN.LOG_ERRORS
-                            help: PLUGIN_ADMIN.LOG_ERRORS_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        log.handler:
-                            type: select
-                            size: small
-                            label: PLUGIN_ADMIN.LOG_HANDLER
-                            help: PLUGIN_ADMIN.LOG_HANDLER_HELP
-                            default: 'file'
-                            options:
-                                'file': 'File'
-                                'syslog': 'Syslog'
-
-                        log.syslog.facility:
-                            type: select
-                            size: small
-                            label: PLUGIN_ADMIN.SYSLOG_FACILITY
-                            help: PLUGIN_ADMIN.SYSLOG_FACILITY_HELP
-                            default: local6
-                            options:
-                              auth: auth
-                              authpriv: authpriv
-                              cron: cron
-                              daemon: daemon
-                              kern: kern
-                              lpr: lpr
-                              mail: mail
-                              news: news
-                              syslog: syslog
-                              user: user
-                              uucp: uucp
-                              local0: local0
-                              local1: local1
-                              local2: local2
-                              local3: local3
-                              local4: local4
-                              local5: local5
-                              local6: local6
-                              local7: local7
-
-                debugger:
-                    type: tab
-                    title: PLUGIN_ADMIN.DEBUGGER
-
-                    fields:
-                        debugger_section:
-                            type: section
-                            title: PLUGIN_ADMIN.DEBUGGER
-                            underline: true
-
-                        debugger.enabled:
-                            type: toggle
-                            label: PLUGIN_ADMIN.DEBUGGER
-                            help: PLUGIN_ADMIN.DEBUGGER_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        debugger.shutdown.close_connection:
-                            type: toggle
-                            label: PLUGIN_ADMIN.SHUTDOWN_CLOSE_CONNECTION
-                            help: PLUGIN_ADMIN.SHUTDOWN_CLOSE_CONNECTION_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                media:
-                    type: tab
-                    title: PLUGIN_ADMIN.MEDIA
-
-                    fields:
-                        media_section:
-                            type: section
-                            title: PLUGIN_ADMIN.MEDIA
-                            underline: true
-
-                        images.default_image_quality:
-                            type: range
-                            append: '%'
-                            label: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY
-                            help: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY_HELP
-                            validate:
-                                min: 1
-                                max: 100
-
-                        images.cache_all:
-                            type: toggle
-                            label: PLUGIN_ADMIN.CACHE_ALL
-                            help: PLUGIN_ADMIN.CACHE_ALL_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        images.cache_perms:
-                            type: select
-                            size: small
-                            label: PLUGIN_ADMIN.CACHE_PERMS
-                            help: PLUGIN_ADMIN.CACHE_PERMS_HELP
-                            highlight: '0755'
-                            options:
-                                '0755': '0755'
-                                '0775': '0775'
-
-                        images.debug:
-                            type: toggle
-                            label: PLUGIN_ADMIN.IMAGES_DEBUG
-                            help: PLUGIN_ADMIN.IMAGES_DEBUG_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        images.auto_fix_orientation:
-                            type: toggle
-                            label: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION
-                            help: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        images.seofriendly:
-                            type: toggle
-                            label: PLUGIN_ADMIN.IMAGES_SEOFRIENDLY
-                            help: PLUGIN_ADMIN.IMAGES_SEOFRIENDLY_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        media.enable_media_timestamp:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ENABLE_MEDIA_TIMESTAMP
-                            help: PLUGIN_ADMIN.ENABLE_MEDIA_TIMESTAMP_HELP
-                            highlight: 0
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        media.auto_metadata_exif:
-                              type: toggle
-                              label: PLUGIN_ADMIN.ENABLE_AUTO_METADATA
-                              help: PLUGIN_ADMIN.ENABLE_AUTO_METADATA_HELP
-                              highlight: 0
-                              options:
-                                  1: PLUGIN_ADMIN.YES
-                                  0: PLUGIN_ADMIN.NO
-                              validate:
-                                  type: bool
-
-
-                        media.allowed_fallback_types:
-                            type: selectize
-                            size: large
-                            label: PLUGIN_ADMIN.FALLBACK_TYPES
-                            help: PLUGIN_ADMIN.FALLBACK_TYPES_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                        media.unsupported_inline_types:
-                            type: selectize
-                            size: large
-                            label: PLUGIN_ADMIN.INLINE_TYPES
-                            help: PLUGIN_ADMIN.INLINE_TYPES_HELP
-                            classes: fancy
-                            validate:
-                                type: commalist
-
-                session:
-                    type: tab
-                    title: PLUGIN_ADMIN.SESSION
-
-                    fields:
-                        session_section:
-                            type: section
-                            title: PLUGIN_ADMIN.SESSION
-                            underline: true
-
-                        session.enabled:
-                            type: hidden
-                            label: PLUGIN_ADMIN.ENABLED
-                            help: PLUGIN_ADMIN.SESSION_ENABLED_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: true
-                            validate:
-                                type: bool
-
-                        session.initialize:
-                            type: toggle
-                            label: PLUGIN_ADMIN.SESSION_INITIALIZE
-                            help: PLUGIN_ADMIN.SESSION_INITIALIZE_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: true
-                            validate:
-                                type: bool
-
-                        session.timeout:
-                            type: text
-                            size: small
-                            append: GRAV.NICETIME.SECOND_PLURAL
-                            label: PLUGIN_ADMIN.TIMEOUT
-                            help: PLUGIN_ADMIN.TIMEOUT_HELP
-                            validate:
-                                type: number
-                                min: 0
-
-                        session.name:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.NAME
-                            help: PLUGIN_ADMIN.SESSION_NAME_HELP
-
-                        session.uniqueness:
-                            type: select
-                            size: medium
-                            label: PLUGIN_ADMIN.SESSION_UNIQUENESS
-                            help: PLUGIN_ADMIN.SESSION_UNIQUENESS_HELP
-                            highlight: path
-                            default: path
-                            options:
-                                path: Grav's root file path
-                                salt: Grav's random security salt
-
-                        session.secure:
-                            type: toggle
-                            label: PLUGIN_ADMIN.SESSION_SECURE
-                            help: PLUGIN_ADMIN.SESSION_SECURE_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: false
-                            validate:
-                                type: bool
-
-                        session.httponly:
-                            type: toggle
-                            label: PLUGIN_ADMIN.SESSION_HTTPONLY
-                            help: PLUGIN_ADMIN.SESSION_HTTPONLY_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: true
-                            validate:
-                                type: bool
-
-                        session.path:
-                            type: text
-                            size: small
-                            label: PLUGIN_ADMIN.SESSION_PATH
-                            help: PLUGIN_ADMIN.SESSION_PATH_HELP
-
-                        session.split:
-                            type: toggle
-                            label: PLUGIN_ADMIN.SESSION_SPLIT
-                            help: PLUGIN_ADMIN.SESSION_SPLIT_HELP
-                            highlight: 1
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: true
-                            validate:
-                                type: bool
-
-                advanced:
-                    type: tab
-                    title: PLUGIN_ADMIN.ADVANCED
-
-                    fields:
-                        advanced_section:
-                            type: section
-                            title: PLUGIN_ADMIN.ADVANCED
-                            underline: true
-
-                        gpm.releases:
-                            type: toggle
-                            label: PLUGIN_ADMIN.GPM_RELEASES
-                            highlight: stable
-                            help: PLUGIN_ADMIN.GPM_RELEASES_HELP
-                            options:
-                                stable: PLUGIN_ADMIN.STABLE
-                                testing: PLUGIN_ADMIN.TESTING
-
-                        gpm.proxy_url:
-                            type: text
-                            size: medium
-                            placeholder: "e.g. 127.0.0.1:3128"
-                            label: PLUGIN_ADMIN.PROXY_URL
-                            help: PLUGIN_ADMIN.PROXY_URL_HELP
-
-                        gpm.method:
-                            type: toggle
-                            label: PLUGIN_ADMIN.GPM_METHOD
-                            highlight: auto
-                            help: PLUGIN_ADMIN.GPM_METHOD_HELP
-                            options:
-                                auto: PLUGIN_ADMIN.AUTO
-                                fopen: PLUGIN_ADMIN.FOPEN
-                                curl: PLUGIN_ADMIN.CURL
-
-                        gpm.official_gpm_only:
-                            type: toggle
-                            label: PLUGIN_ADMIN.GPM_OFFICIAL_ONLY
-                            highlight: 1
-                            help: PLUGIN_ADMIN.GPM_OFFICIAL_ONLY_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            default: true
-                            validate:
-                                type: bool
-
-                        gpm.verify_peer:
-                            type: toggle
-                            label: PLUGIN_ADMIN.GPM_VERIFY_PEER
-                            highlight: 1
-                            help: PLUGIN_ADMIN.GPM_VERIFY_PEER_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        reverse_proxy_setup:
-                            type: toggle
-                            label: PLUGIN_ADMIN.REVERSE_PROXY
-                            highlight: 0
-                            help: PLUGIN_ADMIN.REVERSE_PROXY_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        username_regex:
-                            type: text
-                            size: large
-                            label: PLUGIN_ADMIN.USERNAME_REGEX
-                            help: PLUGIN_ADMIN.USERNAME_REGEX_HELP
-
-                        pwd_regex:
-                            type: text
-                            size: large
-                            label: PLUGIN_ADMIN.PWD_REGEX
-                            help: PLUGIN_ADMIN.PWD_REGEX_HELP
-
-                        intl_enabled:
-                            type: toggle
-                            label: PLUGIN_ADMIN.INTL_ENABLED
-                            highlight: 1
-                            help: PLUGIN_ADMIN.INTL_ENABLED_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        wrapped_site:
-                            type: toggle
-                            label: PLUGIN_ADMIN.WRAPPED_SITE
-                            highlight: 0
-                            help: PLUGIN_ADMIN.WRAPPED_SITE_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        absolute_urls:
-                            type: toggle
-                            label: PLUGIN_ADMIN.ABSOLUTE_URLS
-                            highlight: 0
-                            help: PLUGIN_ADMIN.ABSOLUTE_URLS_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        param_sep:
-                            type: select
-                            size: medium
-                            label: PLUGIN_ADMIN.PARAMETER_SEPARATOR
-                            classes: fancy
-                            help: PLUGIN_ADMIN.PARAMETER_SEPARATOR_HELP
-                            default: ''
-                            options:
-                                ':': ': (default)'
-                                ';': '; (for Apache running on Windows)'
-
-                        force_ssl:
-                            type: toggle
-                            label: PLUGIN_ADMIN.FORCE_SSL
-                            highlight: 0
-                            help: PLUGIN_ADMIN.FORCE_SSL_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        force_lowercase_urls:
-                            type: toggle
-                            label: PLUGIN_ADMIN.FORCE_LOWERCASE_URLS
-                            highlight: 1
-                            default: 1
-                            help: PLUGIN_ADMIN.FORCE_LOWERCASE_URLS_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        custom_base_url:
-                            type: text
-                            size: medium
-                            placeholder: "e.g. http://yoursite.com/yourpath"
-                            label: PLUGIN_ADMIN.CUSTOM_BASE_URL
-                            help: PLUGIN_ADMIN.CUSTOM_BASE_URL_HELP
-
-                        accounts.type:
-                            type: hidden
-
-                        accounts.storage:
-                            type: hidden
-
-                        strict_mode.yaml_compat:
-                            type: toggle
-                            label: PLUGIN_ADMIN.STRICT_YAML_COMPAT
-                            highlight: 1
-                            default: 1
-                            help: PLUGIN_ADMIN.STRICT_YAML_COMPAT_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
-
-                        strict_mode.twig_compat:
-                            type: toggle
-                            label: PLUGIN_ADMIN.STRICT_TWIG_COMPAT
-                            highlight: 1
-                            default: 1
-                            help: PLUGIN_ADMIN.STRICT_TWIG_COMPAT_HELP
-                            options:
-                                1: PLUGIN_ADMIN.YES
-                                0: PLUGIN_ADMIN.NO
-                            validate:
-                                type: bool
+  validation: loose
+  fields:
+
+    system_tabs:
+      type: tabs
+      classes: side-tabs
+
+      fields:
+        content:
+          type: tab
+          title: PLUGIN_ADMIN.CONTENT
+
+          fields:
+            content_section:
+              type: section
+              title: PLUGIN_ADMIN.CONTENT
+              underline: true
+
+            home.alias:
+              type: pages
+              size: large
+              classes: fancy
+              label: PLUGIN_ADMIN.HOME_PAGE
+              show_all: false
+              show_modular: false
+              show_root: false
+              show_slug: true
+              help: PLUGIN_ADMIN.HOME_PAGE_HELP
+
+            home.hide_in_urls:
+              type: toggle
+              label: PLUGIN_ADMIN.HIDE_HOME_IN_URLS
+              help: PLUGIN_ADMIN.HIDE_HOME_IN_URLS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.theme:
+              type: themeselect
+              classes: fancy
+              selectize: true
+              size: medium
+              label: PLUGIN_ADMIN.DEFAULT_THEME
+              help: PLUGIN_ADMIN.DEFAULT_THEME_HELP
+
+            pages.process:
+              type: checkboxes
+              label: PLUGIN_ADMIN.PROCESS
+              help: PLUGIN_ADMIN.PROCESS_HELP
+              default: [markdown: true, twig: true]
+              options:
+                markdown: Markdown
+                twig: Twig
+              use: keys
+
+            pages.types:
+              type: array
+              label: PLUGIN_ADMIN.PAGE_TYPES
+              help: PLUGIN_ADMIN.PAGE_TYPES_HELP
+              size: small
+              default: ['html','htm','json','xml','txt','rss','atom']
+              value_only: true
+
+            timezone:
+              type: select
+              label: PLUGIN_ADMIN.TIMEZONE
+              size: medium
+              classes: fancy
+              help: PLUGIN_ADMIN.TIMEZONE_HELP
+              data-options@: '\Grav\Common\Utils::timezones'
+              default: ''
+              options:
+                '': 'Default (Server Timezone)'
+
+            pages.dateformat.default:
+              type: select
+              size: medium
+              selectize:
+                create: true
+              label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT
+              help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP
+              placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER
+              data-options@: '\Grav\Common\Utils::dateFormats'
+              validate:
+                type: string
+
+            pages.dateformat.short:
+              type: dateformat
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.SHORT_DATE_FORMAT
+              help: PLUGIN_ADMIN.SHORT_DATE_FORMAT_HELP
+              default: "jS M Y"
+              options:
+                "F jS \\a\\t g:ia": Date1
+                "l jS \\of F g:i A": Date2
+                "D, d M Y G:i:s": Date3
+                "d-m-y G:i": Date4
+                "jS M Y": Date5
+
+            pages.dateformat.long:
+              type: dateformat
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.LONG_DATE_FORMAT
+              help: PLUGIN_ADMIN.LONG_DATE_FORMAT_HELP
+              options:
+                "F jS \\a\\t g:ia": Date1
+                "l jS \\of F g:i A": Date2
+                "D, d M Y G:i:s": Date3
+                "d-m-y G:i": Date4
+                "jS M Y": Date5
+
+            pages.order.by:
+              type: select
+              size: large
+              classes: fancy
+              label: PLUGIN_ADMIN.DEFAULT_ORDERING
+              help: PLUGIN_ADMIN.DEFAULT_ORDERING_HELP
+              options:
+                default: PLUGIN_ADMIN.DEFAULT_ORDERING_DEFAULT
+                folder: PLUGIN_ADMIN.DEFAULT_ORDERING_FOLDER
+                title: PLUGIN_ADMIN.DEFAULT_ORDERING_TITLE
+                date: PLUGIN_ADMIN.DEFAULT_ORDERING_DATE
+
+            pages.order.dir:
+              type: toggle
+              label: PLUGIN_ADMIN.DEFAULT_ORDER_DIRECTION
+              highlight: asc
+              default: desc
+              help: PLUGIN_ADMIN.DEFAULT_ORDER_DIRECTION_HELP
+              options:
+                asc: PLUGIN_ADMIN.ASCENDING
+                desc: PLUGIN_ADMIN.DESCENDING
+
+            pages.list.count:
+              type: text
+              size: x-small
+              append: PLUGIN_ADMIN.PAGES
+              label: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT
+              help: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT_HELP
+              validate:
+                type: number
+                min: 1
+
+            pages.publish_dates:
+              type: toggle
+              label: PLUGIN_ADMIN.DATE_BASED_PUBLISHING
+              help: PLUGIN_ADMIN.DATE_BASED_PUBLISHING_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.events:
+              type: checkboxes
+              label: PLUGIN_ADMIN.EVENTS
+              help: PLUGIN_ADMIN.EVENTS_HELP
+              default: [page: true, twig: true]
+              options:
+                page: Page Events
+                twig: Twig Events
+              use: keys
+
+            pages.append_url_extension:
+              type: text
+              size: x-small
+              placeholder: "e.g. .html"
+              label: PLUGIN_ADMIN.APPEND_URL_EXT
+              help: PLUGIN_ADMIN.APPEND_URL_EXT_HELP
+
+            pages.redirect_default_code:
+              type: select
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE
+              help: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE_HELP
+              default: 302
+              options:
+                301: PLUGIN_ADMIN.REDIRECT_OPTION_301
+                302: PLUGIN_ADMIN.REDIRECT_OPTION_302
+                303: PLUGIN_ADMIN.REDIRECT_OPTION_303
+
+            pages.redirect_default_route:
+              type: select
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE
+              help: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE_HELP
+              default: 0
+              options:
+                0: PLUGIN_ADMIN.REDIRECT_OPTION_NO_REDIRECT
+                1: PLUGIN_ADMIN.REDIRECT_OPTION_DEFAULT_REDIRECT
+                301: PLUGIN_ADMIN.REDIRECT_OPTION_301
+                302: PLUGIN_ADMIN.REDIRECT_OPTION_302
+              validate:
+                type: int
+
+            pages.redirect_trailing_slash:
+              type: select
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH
+              help: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH_HELP
+              default: 1
+              options:
+                0: PLUGIN_ADMIN.REDIRECT_OPTION_NO_REDIRECT
+                1: PLUGIN_ADMIN.REDIRECT_OPTION_DEFAULT_REDIRECT
+                301: PLUGIN_ADMIN.REDIRECT_OPTION_301
+                302: PLUGIN_ADMIN.REDIRECT_OPTION_302
+              validate:
+                type: int
+
+            pages.ignore_hidden:
+              type: toggle
+              label: PLUGIN_ADMIN.IGNORE_HIDDEN
+              help: PLUGIN_ADMIN.IGNORE_HIDDEN_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.ignore_files:
+              type: selectize
+              size: large
+              label: PLUGIN_ADMIN.IGNORE_FILES
+              help: PLUGIN_ADMIN.IGNORE_FILES_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+            pages.ignore_folders:
+              type: selectize
+              size: large
+              label: PLUGIN_ADMIN.IGNORE_FOLDERS
+              help: PLUGIN_ADMIN.IGNORE_FOLDERS_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+            pages.hide_empty_folders:
+              type: toggle
+              label: PLUGIN_ADMIN.HIDE_EMPTY_FOLDERS
+              help: PLUGIN_ADMIN.HIDE_EMPTY_FOLDERS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.url_taxonomy_filters:
+              type: toggle
+              label: PLUGIN_ADMIN.ALLOW_URL_TAXONOMY_FILTERS
+              help: PLUGIN_ADMIN.ALLOW_URL_TAXONOMY_FILTERS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.twig_first:
+              type: toggle
+              label: PLUGIN_ADMIN.TWIG_FIRST
+              help: PLUGIN_ADMIN.TWIG_FIRST_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.never_cache_twig:
+              type: toggle
+              label: PLUGIN_ADMIN.NEVER_CACHE_TWIG
+              help: PLUGIN_ADMIN.NEVER_CACHE_TWIG_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.frontmatter.process_twig:
+              type: toggle
+              label: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG
+              help: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            pages.frontmatter.ignore_fields:
+              type: selectize
+              size: large
+              placeholder: "e.g. forms"
+              label: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS
+              help: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+        languages:
+          type: tab
+          title: PLUGIN_ADMIN.LANGUAGES
+
+          fields:
+            languages-section:
+              type: section
+              title: PLUGIN_ADMIN.LANGUAGES
+              underline: true
+
+            languages.supported:
+              type: selectize
+              size: large
+              placeholder: "e.g. en, fr"
+              label: PLUGIN_ADMIN.SUPPORTED
+              help: PLUGIN_ADMIN.SUPPORTED_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+            languages.default_lang:
+              type: text
+              size: x-small
+              label: PLUGIN_ADMIN.DEFAULT_LANG
+              help: PLUGIN_ADMIN.DEFAULT_LANG_HELP
+
+            languages.include_default_lang:
+              type: toggle
+              label: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG
+              help: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.include_default_lang_file_extension:
+              type: toggle
+              label: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG_FILE_EXTENSION
+              help: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG_HELP_FILE_EXTENSION
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.content_fallback:
+              type: list
+              label: PLUGIN_ADMIN.CONTENT_LANGUAGE_FALLBACKS
+              help: PLUGIN_ADMIN.CONTENT_LANGUAGE_FALLBACKS_HELP
+              fields:
+                key:
+                  type: key
+                  label: PLUGIN_ADMIN.LANGUAGE
+                  help: PLUGIN_ADMIN.CONTENT_FALLBACK_LANGUAGE_HELP
+                  placeholder: fr-ca
+                value:
+                  type: selectize
+                  size: large
+                  placeholder: "fr, en"
+                  label: PLUGIN_ADMIN.CONTENT_LANGUAGE_FALLBACK
+                  help: PLUGIN_ADMIN.CONTENT_LANGUAGE_FALLBACK_HELP
+                  classes: fancy
+# TODO: does not work.
+#                  validate:
+#                    type: commalist
+
+            languages.pages_fallback_only:
+              type: toggle
+              label: PLUGIN_ADMIN.PAGES_FALLBACK_ONLY
+              help: PLUGIN_ADMIN.PAGES_FALLBACK_ONLY_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.translations:
+              type: toggle
+              label: PLUGIN_ADMIN.LANGUAGE_TRANSLATIONS
+              help: PLUGIN_ADMIN.LANGUAGE_TRANSLATIONS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.translations_fallback:
+              type: toggle
+              label: PLUGIN_ADMIN.TRANSLATIONS_FALLBACK
+              help: PLUGIN_ADMIN.TRANSLATIONS_FALLBACK_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.session_store_active:
+              type: toggle
+              label: PLUGIN_ADMIN.ACTIVE_LANGUAGE_IN_SESSION
+              help: PLUGIN_ADMIN.ACTIVE_LANGUAGE_IN_SESSION_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.http_accept_language:
+              type: toggle
+              label: PLUGIN_ADMIN.HTTP_ACCEPT_LANGUAGE
+              help: PLUGIN_ADMIN.HTTP_ACCEPT_LANGUAGE_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            languages.override_locale:
+              type: toggle
+              label: PLUGIN_ADMIN.OVERRIDE_LOCALE
+              help: PLUGIN_ADMIN.OVERRIDE_LOCALE_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+        http_headers:
+          type: tab
+          title: PLUGIN_ADMIN.HTTP_HEADERS
+
+          fields:
+            http_headers_section:
+              type: section
+              title: PLUGIN_ADMIN.HTTP_HEADERS
+              underline: true
+
+            pages.expires:
+              type: text
+              size: x-small
+              append: GRAV.NICETIME.SECOND_PLURAL
+              label: PLUGIN_ADMIN.EXPIRES
+              help: PLUGIN_ADMIN.EXPIRES_HELP
+              validate:
+                type: number
+                min: 1
+            pages.cache_control:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.CACHE_CONTROL
+              help: PLUGIN_ADMIN.CACHE_CONTROL_HELP
+              placeholder: 'e.g. public, max-age=31536000'
+            pages.last_modified:
+              type: toggle
+              label: PLUGIN_ADMIN.LAST_MODIFIED
+              help: PLUGIN_ADMIN.LAST_MODIFIED_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.etag:
+              type: toggle
+              label: PLUGIN_ADMIN.ETAG
+              help: PLUGIN_ADMIN.ETAG_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.vary_accept_encoding:
+              type: toggle
+              label: PLUGIN_ADMIN.VARY_ACCEPT_ENCODING
+              help: PLUGIN_ADMIN.VARY_ACCEPT_ENCODING_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+        markdown:
+          type: tab
+          title: PLUGIN_ADMIN.MARKDOWN
+
+          fields:
+            markdow_section:
+              type: section
+              title: PLUGIN_ADMIN.MARKDOWN
+              underline: true
+
+            pages.markdown.extra:
+              type: toggle
+              label: Markdown extra
+              help: PLUGIN_ADMIN.MARKDOWN_EXTRA_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.markdown.auto_line_breaks:
+              type: toggle
+              label: PLUGIN_ADMIN.AUTO_LINE_BREAKS
+              help: PLUGIN_ADMIN.AUTO_LINE_BREAKS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.markdown.auto_url_links:
+              type: toggle
+              label: PLUGIN_ADMIN.AUTO_URL_LINKS
+              help: PLUGIN_ADMIN.AUTO_URL_LINKS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.markdown.escape_markup:
+              type: toggle
+              label: PLUGIN_ADMIN.ESCAPE_MARKUP
+              help: PLUGIN_ADMIN.ESCAPE_MARKUP_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+            pages.markdown.valid_link_attributes:
+              type: selectize
+              size: large
+              label: PLUGIN_ADMIN.VALID_LINK_ATTRIBUTES
+              help: PLUGIN_ADMIN.VALID_LINK_ATTRIBUTES_HELP
+              placeholder: "rel, target, id, class, classes"
+              classes: fancy
+              validate:
+                type: commalist
+
+        caching:
+          type: tab
+          title: PLUGIN_ADMIN.CACHING
+
+          fields:
+            caching_section:
+              type: section
+              title: PLUGIN_ADMIN.CACHING
+              underline: true
+
+            cache.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.CACHING
+              help: PLUGIN_ADMIN.CACHING_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            cache.check.method:
+              type: select
+              size: medium
+              classes: fancy
+              label: PLUGIN_ADMIN.CACHE_CHECK_METHOD
+              help: PLUGIN_ADMIN.CACHE_CHECK_METHOD_HELP
+              options:
+                file: Markdown + Yaml file timestamps
+                folder: Folder timestamps
+                hash: All files timestamps
+                none: No timestamp checking
+
+            cache.driver:
+              type: select
+              size: small
+              classes: fancy
+              label: PLUGIN_ADMIN.CACHE_DRIVER
+              help: PLUGIN_ADMIN.CACHE_DRIVER_HELP
+              options:
+                auto: Auto detect
+                file: File
+                apc: APC
+                apcu: APCu
+                xcache: Xcache
+                memcache: Memcache
+                memcached: Memcached
+                wincache: WinCache
+                redis: Redis
+
+            cache.prefix:
+              type: text
+              size: x-small
+              label: PLUGIN_ADMIN.CACHE_PREFIX
+              help: PLUGIN_ADMIN.CACHE_PREFIX_HELP
+              placeholder: PLUGIN_ADMIN.CACHE_PREFIX_PLACEHOLDER
+
+            cache.purge_at:
+              type: cron
+              label: PLUGIN_ADMIN.CACHE_PURGE_JOB
+              help: PLUGIN_ADMIN.CACHE_PURGE_JOB_HELP
+              default: '* 4 * * *'
+
+            cache.clear_at:
+              type: cron
+              label: PLUGIN_ADMIN.CACHE_CLEAR_JOB
+              help: PLUGIN_ADMIN.CACHE_CLEAR_JOB_HELP
+              default: '* 3 * * *'
+
+            cache.clear_job_type:
+              type: select
+              size: medium
+              label: PLUGIN_ADMIN.CACHE_JOB_TYPE
+              help: PLUGIN_ADMIN.CACHE_JOB_TYPE_HELP
+              options:
+                standard: Standard Cache Folders
+                all: All Cache Folders
+
+            cache.clear_images_by_default:
+              type: toggle
+              label: PLUGIN_ADMIN.CLEAR_IMAGES_BY_DEFAULT
+              help: PLUGIN_ADMIN.CLEAR_IMAGES_BY_DEFAULT_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            cache.cli_compatibility:
+              type: toggle
+              label: PLUGIN_ADMIN.CLI_COMPATIBILITY
+              help: PLUGIN_ADMIN.CLI_COMPATIBILITY_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            cache.lifetime:
+              type: text
+              size: small
+              append: GRAV.NICETIME.SECOND_PLURAL
+              label: PLUGIN_ADMIN.LIFETIME
+              help: PLUGIN_ADMIN.LIFETIME_HELP
+              validate:
+                type: number
+
+            cache.gzip:
+              type: toggle
+              label: PLUGIN_ADMIN.GZIP_COMPRESSION
+              help: PLUGIN_ADMIN.GZIP_COMPRESSION_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            cache.allow_webserver_gzip:
+              type: toggle
+              label: PLUGIN_ADMIN.ALLOW_WEBSERVER_GZIP
+              help: PLUGIN_ADMIN.ALLOW_WEBSERVER_GZIP_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            cache.memcache.server:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.MEMCACHE_SERVER
+              help: PLUGIN_ADMIN.MEMCACHE_SERVER_HELP
+              placeholder: "localhost"
+
+            cache.memcache.port:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.MEMCACHE_PORT
+              help: PLUGIN_ADMIN.MEMCACHE_PORT_HELP
+              placeholder: "11211"
+
+            cache.memcached.server:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.MEMCACHED_SERVER
+              help: PLUGIN_ADMIN.MEMCACHED_SERVER_HELP
+              placeholder: "localhost"
+
+            cache.memcached.port:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.MEMCACHED_PORT
+              help: PLUGIN_ADMIN.MEMCACHED_PORT_HELP
+              placeholder: "11211"
+
+            cache.redis.socket:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.REDIS_SOCKET
+              help: PLUGIN_ADMIN.REDIS_SOCKET_HELP
+              placeholder: "/var/run/redis/redis.sock"
+
+            cache.redis.server:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.REDIS_SERVER
+              help: PLUGIN_ADMIN.REDIS_SERVER_HELP
+              placeholder: "localhost"
+
+            cache.redis.port:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.REDIS_PORT
+              help: PLUGIN_ADMIN.REDIS_PORT_HELP
+              placeholder: "6379"
+
+            cache.redis.password:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.REDIS_PASSWORD
+
+            cache.redis.database:
+              type: text
+              size: medium
+              label: PLUGIN_ADMIN.REDIS_DATABASE
+              help: PLUGIN_ADMIN.REDIS_DATABASE_HELP
+              placeholder: "0"
+              validate:
+                type: number
+                min: 0
+
+            flex_caching:
+              type: section
+              title: PLUGIN_ADMIN.FLEX_CACHING
+
+            flex.cache.index.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_ENABLED
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            flex.cache.index.lifetime:
+              type: text
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_LIFETIME
+              default: 60
+              validate:
+                type: int
+
+            flex.cache.object.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_ENABLED
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            flex.cache.object.lifetime:
+              type: text
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_LIFETIME
+              default: 600
+              validate:
+                type: int
+
+            flex.cache.render.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_ENABLED
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            flex.cache.render.lifetime:
+              type: text
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_LIFETIME
+              default: 600
+              validate:
+                type: int
+
+        twig:
+          type: tab
+          title: PLUGIN_ADMIN.TWIG_TEMPLATING
+
+          fields:
+            twig_section:
+              type: section
+              title: PLUGIN_ADMIN.TWIG_TEMPLATING
+              underline: true
+
+            twig.cache:
+              type: toggle
+              label: PLUGIN_ADMIN.TWIG_CACHING
+              help: PLUGIN_ADMIN.TWIG_CACHING_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            twig.debug:
+              type: toggle
+              label: PLUGIN_ADMIN.TWIG_DEBUG
+              help: PLUGIN_ADMIN.TWIG_DEBUG_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            twig.auto_reload:
+              type: toggle
+              label: PLUGIN_ADMIN.DETECT_CHANGES
+              help: PLUGIN_ADMIN.DETECT_CHANGES_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            twig.autoescape:
+              type: toggle
+              label: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES
+              help: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES_HELP
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            twig.umask_fix:
+              type: toggle
+              label: PLUGIN_ADMIN.TWIG_UMASK_FIX
+              help: PLUGIN_ADMIN.TWIG_UMASK_FIX_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+        assets:
+          type: tab
+          title: PLUGIN_ADMIN.ASSETS
+
+          fields:
+            general_config_section:
+              type: section
+              title: PLUGIN_ADMIN.GENERAL_CONFIG
+              underline: true
+
+            assets.enable_asset_timestamp:
+              type: toggle
+              label: PLUGIN_ADMIN.ENABLED_TIMESTAMPS_ON_ASSETS
+              help: PLUGIN_ADMIN.ENABLED_TIMESTAMPS_ON_ASSETS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.enable_asset_sri:
+              type: toggle
+              label: PLUGIN_ADMIN.ENABLED_SRI_ON_ASSETS
+              help: PLUGIN_ADMIN.ENABLED_SRI_ON_ASSETS_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.collections:
+              type: multilevel
+              label: PLUGIN_ADMIN.COLLECTIONS
+              placeholder_key: collection_name
+              placeholder_value: collection_path
+              validate:
+                type: array
+
+
+            css_assets_section:
+              type: section
+              title: PLUGIN_ADMIN.CSS_ASSETS
+              underline: true
+
+            assets.css_pipeline:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_PIPELINE
+              help: PLUGIN_ADMIN.CSS_PIPELINE_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.css_pipeline_include_externals:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS
+              help: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.css_pipeline_before_excludes:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES
+              help: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.css_minify:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_MINIFY
+              help: PLUGIN_ADMIN.CSS_MINIFY_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.css_minify_windows:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_MINIFY_WINDOWS_OVERRIDE
+              help: PLUGIN_ADMIN.CSS_MINIFY_WINDOWS_OVERRIDE_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.css_rewrite:
+              type: toggle
+              label: PLUGIN_ADMIN.CSS_REWRITE
+              help: PLUGIN_ADMIN.CSS_REWRITE_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            js_assets_section:
+              type: section
+              title: PLUGIN_ADMIN.JS_ASSETS
+              underline: true
+
+            assets.js_pipeline:
+              type: toggle
+              label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE
+              help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.js_pipeline_include_externals:
+              type: toggle
+              label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS
+              help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.js_pipeline_before_excludes:
+              type: toggle
+              label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES
+              help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.js_minify:
+              type: toggle
+              label: PLUGIN_ADMIN.JAVASCRIPT_MINIFY
+              help: PLUGIN_ADMIN.JAVASCRIPT_MINIFY_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            js_module_assets_section:
+              type: section
+              title: PLUGIN_ADMIN.JS_MODULE_ASSETS
+              underline: true
+
+            assets.js_module_pipeline:
+              type: toggle
+              label: PLUGIN_ADMIN.JAVASCRIPT_MODULE_PIPELINE
+              help: PLUGIN_ADMIN.JAVASCRIPT_MODULE_PIPELINE_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.js_module_pipeline_include_externals:
+              type: toggle
+              label: PLUGIN_ADMIN.JAVASCRIPT_MODULE_PIPELINE_INCLUDE_EXTERNALS
+              help: PLUGIN_ADMIN.JAVASCRIPT_MODULE_PIPELINE_INCLUDE_EXTERNALS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            assets.js_module_pipeline_before_excludes:
+              type: toggle
+              label: PLUGIN_ADMIN.JAVASCRIPT_MODULE_PIPELINE_BEFORE_EXCLUDES
+              help: PLUGIN_ADMIN.JAVASCRIPT_MODULE_PIPELINE_BEFORE_EXCLUDES_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+
+
+        errors:
+          type: tab
+          title: PLUGIN_ADMIN.ERROR_HANDLER
+
+          fields:
+            errors_section:
+              type: section
+              title: PLUGIN_ADMIN.ERROR_HANDLER
+              underline: true
+
+            errors.display:
+              type: select
+              label: PLUGIN_ADMIN.DISPLAY_ERRORS
+              help: PLUGIN_ADMIN.DISPLAY_ERRORS_HELP
+              size: medium
+              highlight: 1
+              options:
+                -1: PLUGIN_ADMIN.ERROR_SYSTEM
+                0: PLUGIN_ADMIN.ERROR_SIMPLE
+                1: PLUGIN_ADMIN.ERROR_FULL_BACKTRACE
+              validate:
+                type: int
+
+
+            errors.log:
+              type: toggle
+              label: PLUGIN_ADMIN.LOG_ERRORS
+              help: PLUGIN_ADMIN.LOG_ERRORS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            log.handler:
+              type: select
+              size: small
+              label: PLUGIN_ADMIN.LOG_HANDLER
+              help: PLUGIN_ADMIN.LOG_HANDLER_HELP
+              default: 'file'
+              options:
+                'file': 'File'
+                'syslog': 'Syslog'
+
+            log.syslog.facility:
+              type: select
+              size: small
+              label: PLUGIN_ADMIN.SYSLOG_FACILITY
+              help: PLUGIN_ADMIN.SYSLOG_FACILITY_HELP
+              default: local6
+              options:
+                auth: auth
+                authpriv: authpriv
+                cron: cron
+                daemon: daemon
+                kern: kern
+                lpr: lpr
+                mail: mail
+                news: news
+                syslog: syslog
+                user: user
+                uucp: uucp
+                local0: local0
+                local1: local1
+                local2: local2
+                local3: local3
+                local4: local4
+                local5: local5
+                local6: local6
+                local7: local7
+
+            log.syslog.tag:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.SYSLOG_TAG
+              help: PLUGIN_ADMIN.SYSLOG_TAG_HELP
+              placeholder: "grav"
+
+        debugger:
+          type: tab
+          title: PLUGIN_ADMIN.DEBUGGER
+
+          fields:
+            debugger_section:
+              type: section
+              title: PLUGIN_ADMIN.DEBUGGER
+              underline: true
+
+            debugger.enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.DEBUGGER
+              help: PLUGIN_ADMIN.DEBUGGER_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            debugger.provider:
+              type: select
+              label: PLUGIN_ADMIN.DEBUGGER_PROVIDER
+              help: PLUGIN_ADMIN.DEBUGGER_PROVIDER_HELP
+              size: medium
+              default: debugbar
+              options:
+                debugbar: PLUGIN_ADMIN.DEBUGGER_DEBUGBAR
+                clockwork: PLUGIN_ADMIN.DEBUGGER_CLOCKWORK
+
+            debugger.censored:
+              type: toggle
+              label: PLUGIN_ADMIN.DEBUGGER_CENSORED
+              help: PLUGIN_ADMIN.DEBUGGER_CENSORED_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            debugger.shutdown.close_connection:
+              type: toggle
+              label: PLUGIN_ADMIN.SHUTDOWN_CLOSE_CONNECTION
+              help: PLUGIN_ADMIN.SHUTDOWN_CLOSE_CONNECTION_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+        media:
+          type: tab
+          title: PLUGIN_ADMIN.MEDIA
+
+          fields:
+            media_section:
+              type: section
+              title: PLUGIN_ADMIN.MEDIA
+              underline: true
+
+            images.default_image_quality:
+              type: range
+              append: '%'
+              label: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY
+              help: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY_HELP
+              validate:
+                min: 1
+                max: 100
+
+            images.cache_all:
+              type: toggle
+              label: PLUGIN_ADMIN.CACHE_ALL
+              help: PLUGIN_ADMIN.CACHE_ALL_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.cache_perms:
+              type: select
+              size: small
+              label: PLUGIN_ADMIN.CACHE_PERMS
+              help: PLUGIN_ADMIN.CACHE_PERMS_HELP
+              highlight: '0755'
+              options:
+                '0755': '0755'
+                '0775': '0775'
+
+            images.debug:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_DEBUG
+              help: PLUGIN_ADMIN.IMAGES_DEBUG_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.auto_fix_orientation:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION
+              help: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.defaults.loading:
+              type: select
+              size: small
+              label: PLUGIN_ADMIN.IMAGES_LOADING
+              help: PLUGIN_ADMIN.IMAGES_LOADING_HELP
+              highlight: auto
+              options:
+                auto: Auto
+                lazy: Lazy
+                eager: Eager
+
+            images.seofriendly:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_SEOFRIENDLY
+              help: PLUGIN_ADMIN.IMAGES_SEOFRIENDLY_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            media.enable_media_timestamp:
+              type: toggle
+              label: PLUGIN_ADMIN.ENABLE_MEDIA_TIMESTAMP
+              help: PLUGIN_ADMIN.ENABLE_MEDIA_TIMESTAMP_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            media.auto_metadata_exif:
+              type: toggle
+              label: PLUGIN_ADMIN.ENABLE_AUTO_METADATA
+              help: PLUGIN_ADMIN.ENABLE_AUTO_METADATA_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            media.allowed_fallback_types:
+              type: selectize
+              size: large
+              label: PLUGIN_ADMIN.FALLBACK_TYPES
+              help: PLUGIN_ADMIN.FALLBACK_TYPES_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+            media.unsupported_inline_types:
+              type: selectize
+              size: large
+              label: PLUGIN_ADMIN.INLINE_TYPES
+              help: PLUGIN_ADMIN.INLINE_TYPES_HELP
+              classes: fancy
+              validate:
+                type: commalist
+
+            section_images_cls:
+              type: section
+              title: PLUGIN_ADMIN.IMAGES_CLS_TITLE
+              underline: true
+
+            images.cls.auto_sizes:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_CLS_AUTO_SIZES
+              help: PLUGIN_ADMIN.IMAGES_CLS_AUTO_SIZES_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.cls.aspect_ratio:
+              type: toggle
+              label: PLUGIN_ADMIN.IMAGES_CLS_ASPECT_RATIO
+              help: PLUGIN_ADMIN.IMAGES_CLS_ASPECT_RATIO_HELP
+              highlight: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            images.cls.retina_scale:
+              type: select
+              label: PLUGIN_ADMIN.IMAGES_CLS_RETINA_SCALE
+              help: PLUGIN_ADMIN.IMAGES_CLS_RETINA_SCALE_HELP
+              size: small
+              highlight: 1
+              options:
+                1: 1X
+                2: 2X
+                3: 3X
+                4: 4X
+
+        session:
+          type: tab
+          title: PLUGIN_ADMIN.SESSION
+
+          fields:
+            session_section:
+              type: section
+              title: PLUGIN_ADMIN.SESSION
+              underline: true
+
+            session.enabled:
+              type: hidden
+              label: PLUGIN_ADMIN.ENABLED
+              help: PLUGIN_ADMIN.SESSION_ENABLED_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: true
+              validate:
+                type: bool
+
+            session.initialize:
+              type: toggle
+              label: PLUGIN_ADMIN.SESSION_INITIALIZE
+              help: PLUGIN_ADMIN.SESSION_INITIALIZE_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: true
+              validate:
+                type: bool
+
+            session.timeout:
+              type: text
+              size: small
+              append: GRAV.NICETIME.SECOND_PLURAL
+              label: PLUGIN_ADMIN.TIMEOUT
+              help: PLUGIN_ADMIN.TIMEOUT_HELP
+              validate:
+                type: number
+                min: 0
+
+            session.name:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.NAME
+              help: PLUGIN_ADMIN.SESSION_NAME_HELP
+
+            session.uniqueness:
+              type: select
+              size: medium
+              label: PLUGIN_ADMIN.SESSION_UNIQUENESS
+              help: PLUGIN_ADMIN.SESSION_UNIQUENESS_HELP
+              highlight: path
+              default: path
+              options:
+                path: Grav's root file path
+                salt: Grav's random security salt
+
+            session.secure:
+              type: toggle
+              label: PLUGIN_ADMIN.SESSION_SECURE
+              help: PLUGIN_ADMIN.SESSION_SECURE_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: false
+              validate:
+                type: bool
+
+            session.secure_https:
+              type: toggle
+              label: PLUGIN_ADMIN.SESSION_SECURE_HTTPS
+              help: PLUGIN_ADMIN.SESSION_SECURE_HTTPS_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: true
+              validate:
+                type: bool
+
+            session.httponly:
+              type: toggle
+              label: PLUGIN_ADMIN.SESSION_HTTPONLY
+              help: PLUGIN_ADMIN.SESSION_HTTPONLY_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: true
+              validate:
+                type: bool
+
+            session.domain:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.SESSION_DOMAIN
+              help: PLUGIN_ADMIN.SESSION_DOMAIN_HELP
+
+            session.path:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.SESSION_PATH
+              help: PLUGIN_ADMIN.SESSION_PATH_HELP
+
+            session.samesite:
+              type: text
+              size: small
+              label: PLUGIN_ADMIN.SESSION_SAMESITE
+              help: PLUGIN_ADMIN.SESSION_SAMESITE_HELP
+
+            session.split:
+              type: toggle
+              label: PLUGIN_ADMIN.SESSION_SPLIT
+              help: PLUGIN_ADMIN.SESSION_SPLIT_HELP
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: true
+              validate:
+                type: bool
+
+        advanced:
+          type: tab
+          title: PLUGIN_ADMIN.ADVANCED
+
+          fields:
+            advanced_section:
+              type: section
+              title: PLUGIN_ADMIN.ADVANCED
+              underline: true
+
+            gpm_section:
+              type: section
+              title: PLUGIN_ADMIN.GPM_SECTION
+
+            gpm.releases:
+              type: toggle
+              label: PLUGIN_ADMIN.GPM_RELEASES
+              highlight: stable
+              help: PLUGIN_ADMIN.GPM_RELEASES_HELP
+              options:
+                stable: PLUGIN_ADMIN.STABLE
+                testing: PLUGIN_ADMIN.TESTING
+
+            gpm.official_gpm_only:
+              type: toggle
+              label: PLUGIN_ADMIN.GPM_OFFICIAL_ONLY
+              highlight: 1
+              help: PLUGIN_ADMIN.GPM_OFFICIAL_ONLY_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: true
+              validate:
+                type: bool
+
+            http_section:
+              type: section
+              title: PLUGIN_ADMIN.HTTP_SECTION
+
+            http.method:
+              type: toggle
+              label: PLUGIN_ADMIN.GPM_METHOD
+              highlight: auto
+              help: PLUGIN_ADMIN.GPM_METHOD_HELP
+              options:
+                auto: PLUGIN_ADMIN.AUTO
+                fopen: PLUGIN_ADMIN.FOPEN
+                curl: PLUGIN_ADMIN.CURL
+
+            http.enable_proxy:
+              type: toggle
+              label: PLUGIN_ADMIN.SSL_ENABLE_PROXY
+              highlight: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              default: false
+              validate:
+                type: bool
+
+            http.proxy_url:
+              type: text
+              size: medium
+              placeholder: "e.g. 127.0.0.1:3128"
+              label: PLUGIN_ADMIN.PROXY_URL
+              help: PLUGIN_ADMIN.PROXY_URL_HELP
+
+            http.proxy_cert_path:
+              type: text
+              size: medium
+              placeholder: "e.g. /Users/bob/certs/"
+              label: PLUGIN_ADMIN.PROXY_CERT
+              help: PLUGIN_ADMIN.PROXY_CERT_HELP
+
+            http.verify_peer:
+              type: toggle
+              label: PLUGIN_ADMIN.SSL_VERIFY_PEER
+              highlight: 1
+              help: PLUGIN_ADMIN.SSL_VERIFY_PEER_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            http.verify_host:
+              type: toggle
+              label: PLUGIN_ADMIN.SSL_VERIFY_HOST
+              highlight: 1
+              help: PLUGIN_ADMIN.SSL_VERIFY_HOST_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            http.concurrent_connections:
+              type: number
+              size: x-small
+              label: PLUGIN_ADMIN.HTTP_CONNECTIONS
+              help: PLUGIN_ADMIN.HTTP_CONNECTIONS_HELP
+              validate:
+                min: 1
+                max: 20
+
+            misc_section:
+              type: section
+              title: PLUGIN_ADMIN.MISC_SECTION
+
+            reverse_proxy_setup:
+              type: toggle
+              label: PLUGIN_ADMIN.REVERSE_PROXY
+              highlight: 0
+              help: PLUGIN_ADMIN.REVERSE_PROXY_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            username_regex:
+              type: text
+              size: large
+              label: PLUGIN_ADMIN.USERNAME_REGEX
+              help: PLUGIN_ADMIN.USERNAME_REGEX_HELP
+
+            pwd_regex:
+              type: text
+              size: large
+              label: PLUGIN_ADMIN.PWD_REGEX
+              help: PLUGIN_ADMIN.PWD_REGEX_HELP
+
+            intl_enabled:
+              type: toggle
+              label: PLUGIN_ADMIN.INTL_ENABLED
+              highlight: 1
+              help: PLUGIN_ADMIN.INTL_ENABLED_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            wrapped_site:
+              type: toggle
+              label: PLUGIN_ADMIN.WRAPPED_SITE
+              highlight: 0
+              help: PLUGIN_ADMIN.WRAPPED_SITE_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            absolute_urls:
+              type: toggle
+              label: PLUGIN_ADMIN.ABSOLUTE_URLS
+              highlight: 0
+              help: PLUGIN_ADMIN.ABSOLUTE_URLS_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            param_sep:
+              type: select
+              size: medium
+              label: PLUGIN_ADMIN.PARAMETER_SEPARATOR
+              classes: fancy
+              help: PLUGIN_ADMIN.PARAMETER_SEPARATOR_HELP
+              default: ''
+              options:
+                ':': ': (default)'
+                ';': '; (for Apache running on Windows)'
+
+            force_ssl:
+              type: toggle
+              label: PLUGIN_ADMIN.FORCE_SSL
+              highlight: 0
+              help: PLUGIN_ADMIN.FORCE_SSL_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            force_lowercase_urls:
+              type: toggle
+              label: PLUGIN_ADMIN.FORCE_LOWERCASE_URLS
+              highlight: 1
+              default: 1
+              help: PLUGIN_ADMIN.FORCE_LOWERCASE_URLS_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            custom_base_url:
+              type: text
+              size: medium
+              placeholder: "e.g. http://yoursite.com/yourpath"
+              label: PLUGIN_ADMIN.CUSTOM_BASE_URL
+              help: PLUGIN_ADMIN.CUSTOM_BASE_URL_HELP
+
+            http_x_forwarded.protocol:
+              type: toggle
+              label: HTTP_X_FORWARDED_PROTO Enabled
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            http_x_forwarded.host:
+              type: toggle
+              label: HTTP_X_FORWARDED_HOST Enabled
+              highlight: 0
+              default: 0
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            http_x_forwarded.port:
+              type: toggle
+              label: HTTP_X_FORWARDED_PORT Enabled
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            http_x_forwarded.ip:
+              type: toggle
+              label: HTTP_X_FORWARDED IP Enabled
+              highlight: 1
+              default: 1
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+
+            strict_mode.blueprint_compat:
+              type: toggle
+              label: PLUGIN_ADMIN.STRICT_BLUEPRINT_COMPAT
+              highlight: 0
+              default: 0
+              help: PLUGIN_ADMIN.STRICT_BLUEPRINT_COMPAT_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            strict_mode.yaml_compat:
+              type: toggle
+              label: PLUGIN_ADMIN.STRICT_YAML_COMPAT
+              highlight: 0
+              default: 0
+              help: PLUGIN_ADMIN.STRICT_YAML_COMPAT_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+            strict_mode.twig_compat:
+              type: toggle
+              label: PLUGIN_ADMIN.STRICT_TWIG_COMPAT
+              highlight: 0
+              default: 0
+              help: PLUGIN_ADMIN.STRICT_TWIG_COMPAT_HELP
+              options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+              validate:
+                type: bool
+
+
+        accounts:
+          type: tab
+          title: PLUGIN_ADMIN.ACCOUNTS
+
+          fields:
+            flex_accounts:
+              type: section
+              title: User Accounts
+
+            accounts.type:
+              type: select
+              label: PLUGIN_ADMIN.ACCOUNTS_TYPE
+              highlight: stable
+              help: PLUGIN_ADMIN.ACCOUNTS_TYPE_HELP
+              options:
+                regular: PLUGIN_ADMIN.REGULAR
+                flex: PLUGIN_ADMIN.FLEX
+
+            accounts.storage:
+              type: select
+              label: PLUGIN_ADMIN.ACCOUNTS_STORAGE
+              highlight: stable
+              help: PLUGIN_ADMIN.ACCOUNTS_STORAGE_HELP
+              options:
+                file: PLUGIN_ADMIN.FILE
+                folder: PLUGIN_ADMIN.FOLDER
+
+            accounts.avatar:
+              type: select
+              label: PLUGIN_ADMIN.AVATAR
+              default: gravatar
+              help: PLUGIN_ADMIN.AVATAR_HELP
+              options:
+                multiavatar: Multiavatar [local]
+                gravatar: Gravatar [external]
+
+#        experimental:
+#          type: tab
+#          title: PLUGIN_ADMIN.EXPERIMENTAL
+#
+#          fields:
+#            experimental_section:
+#              type: section
+#              title: PLUGIN_ADMIN.EXPERIMENTAL
+#              underline: true
+#
+#            flex_pages:
+#              type: section
+#              title: Flex Pages
+#
+#            pages.type:
+#              type: select
+#              label: PLUGIN_ADMIN.PAGES_TYPE
+#              highlight: regular
+#              help: PLUGIN_ADMIN.PAGES_TYPE_HELP
+#              options:
+#                regular: PLUGIN_ADMIN.REGULAR
+#                flex: PLUGIN_ADMIN.FLEX
+#
+#            pages.type:
+#              type: hidden
+
+
+
diff --git a/system/blueprints/flex/accounts.yaml b/system/blueprints/flex/accounts.yaml
new file mode 100644
index 0000000000..52eff696d7
--- /dev/null
+++ b/system/blueprints/flex/accounts.yaml
@@ -0,0 +1,8 @@
+title: Flex User Accounts
+description: Manage your User Accounts in Flex.
+type: flex-objects
+
+# Deprecated in Grav 1.7.0-rc.4: file was renamed to user-accounts.yaml
+extends@:
+  type: user-accounts
+  context: blueprints://flex
diff --git a/system/blueprints/flex/configure/compat.yaml b/system/blueprints/flex/configure/compat.yaml
new file mode 100644
index 0000000000..08497d400b
--- /dev/null
+++ b/system/blueprints/flex/configure/compat.yaml
@@ -0,0 +1,17 @@
+form:
+  compatibility:
+    type: tab
+    title: Compatibility
+    fields:
+      object.compat.events:
+        type: toggle
+        toggleable: true
+        label: Admin event compatibility
+        help: Enables onAdminSave and onAdminAfterSave events for plugins
+        highlight: 1
+        default: 1
+        options:
+          1: PLUGIN_ADMIN.ENABLED
+          0: PLUGIN_ADMIN.DISABLED
+        validate:
+          type: bool
diff --git a/system/blueprints/flex/pages.yaml b/system/blueprints/flex/pages.yaml
new file mode 100644
index 0000000000..89dab6a56b
--- /dev/null
+++ b/system/blueprints/flex/pages.yaml
@@ -0,0 +1,212 @@
+title: Pages
+description: Manage your Grav Pages in Flex.
+type: flex-objects
+
+# Extends a page (blueprint gets overridden inside the object)
+extends@:
+  type: default
+  context: blueprints://pages
+
+#
+# HIGHLY SPECIALIZED FLEX TYPE, AVOID USING PAGES AS BASE FOR YOUR OWN TYPE.
+#
+
+# Flex configuration
+config:
+  # Administration Configuration (needs Flex Objects plugin)
+  admin:
+    # Admin router
+    router:
+      path: '/pages'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.pages:
+        type: crudl
+        label: Pages
+      admin.configuration.pages:
+        type: default
+        label: Pages Configuration
+
+    # Admin menu
+    menu:
+      list:
+        route: '/pages'
+        title: PLUGIN_ADMIN.PAGES
+        icon: fa-file-text
+        authorize: ['admin.pages.list', 'admin.super']
+        priority: 5
+
+    # Admin template type (folder)
+    template: pages
+
+    # Allowed admin actions
+    actions:
+      list: true
+      create: true
+      read: true
+      update: true
+      delete: true
+
+    # List view
+    list:
+      # Fields shown in the list view
+      fields:
+        published:
+          width: 8
+          alias: header.published
+        visible:
+          width: 8
+          field:
+            label: Visible
+            type: toggle
+        menu:
+          link: edit
+          alias: header.menu
+        full_route:
+          field:
+            label: Route
+            type: text
+          link: edit
+          sort:
+            field: key
+        name:
+          width: 8
+          field:
+            label: Type
+            type: text
+        translations:
+          width: 8
+          field:
+            label: Translations
+            type: text
+#        updated_date:
+#          alias: header.update_date
+
+      # Extra options
+      options:
+        # Default number of records for pagination
+        per_page: 20
+        # Default ordering
+        order:
+          by: key
+          dir: asc
+
+      # TODO: not used yet
+      buttons:
+        back:
+          icon: reply
+          title: PLUGIN_ADMIN.BACK
+        add:
+          icon: plus
+          label: PLUGIN_ADMIN.ADD
+
+    edit:
+      title:
+        template: "{% if object.root %}Root <small>( &lt;root&gt; )</small>{% else %}{{ (form.value('header.title') ?? form.value('folder'))|e }} <small>( {{ (object.getRoute().toString(false) ?: '/')|e }} )</small>{% endif %}"
+
+      # TODO: not used yet
+      buttons:
+        back:
+          icon: reply
+          title: PLUGIN_ADMIN.BACK
+        preview:
+          icon: eye
+          title: PLUGIN_ADMIN.PREVIEW
+        add:
+          icon: plus
+          label: PLUGIN_ADMIN.ADD
+        copy:
+          icon: copy
+          label: PLUGIN_ADMIN.COPY
+        move:
+          icon: arrows
+          label: PLUGIN_ADMIN.MOVE
+        delete:
+          icon: close
+          label: PLUGIN_ADMIN.DELETE
+        save:
+          icon: check
+          label: PLUGIN_ADMIN.SAVE
+
+    # Preview View
+    preview:
+      enabled: true
+
+    # Configure view
+    configure:
+      authorize: 'admin.configuration.pages'
+
+  # Site Configuration
+  site:
+    # Hide from flex types
+    hidden: true
+    templates:
+      collection:
+        # Lookup for the template layout files for collections of objects
+        paths:
+          - 'flex/{TYPE}/collection/{LAYOUT}{EXT}'
+      object:
+        # Lookup for the template layout files for objects
+        paths:
+          - 'flex/{TYPE}/object/{LAYOUT}{EXT}'
+      defaults:
+        # Default template {TYPE}; overridden by filename of this blueprint if template folder exists
+        type: pages
+        # Default template {LAYOUT}; can be overridden in render calls (usually Twig in templates)
+        layout: default
+
+    # Default filters for frontend.
+    filter:
+      - withPublished
+
+  # Data Configuration
+  data:
+    object: 'Grav\Common\Flex\Types\Pages\PageObject'
+    collection: 'Grav\Common\Flex\Types\Pages\PageCollection'
+    index: 'Grav\Common\Flex\Types\Pages\PageIndex'
+    storage:
+      class: 'Grav\Common\Flex\Types\Pages\Storage\PageStorage'
+      options:
+        formatter:
+          class: 'Grav\Framework\File\Formatter\MarkdownFormatter'
+        folder: 'page://'
+        # Keep index file in filesystem to speed up lookups
+        indexed: true
+    # Set default ordering of the pages
+    ordering:
+      storage_key: ASC
+    search:
+       # Search options
+      options:
+        contains: 1
+      # Fields to be searched
+      fields:
+        - key
+        - slug
+        - menu
+        - title
+
+blueprints:
+  configure:
+    fields:
+      import@:
+        type: configure/compat
+        context: blueprints://flex
+
+# Regular form definition
+form:
+  fields:
+    lang:
+      type: hidden
+      value: ''
+
+    tabs:
+      fields:
+        security:
+          type: tab
+          title: PLUGIN_ADMIN.SECURITY
+          import@:
+            type: partials/security
+            context: blueprints://pages
diff --git a/system/blueprints/flex/shared/configure.yaml b/system/blueprints/flex/shared/configure.yaml
new file mode 100644
index 0000000000..e3e5dcbe3a
--- /dev/null
+++ b/system/blueprints/flex/shared/configure.yaml
@@ -0,0 +1,70 @@
+form:
+  validation: loose
+
+  fields:
+    tabs:
+      type: tabs
+      fields:
+        cache:
+          type: tab
+          title: Caching
+          fields:
+            object.cache.index.enabled:
+              type: toggle
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_ENABLED
+              highlight: 1
+              config-default@: system.flex.cache.index.enabled
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            object.cache.index.lifetime:
+              type: text
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_INDEX_CACHE_LIFETIME
+              config-default@: system.flex.cache.index.lifetime
+              validate:
+                type: int
+
+            object.cache.object.enabled:
+              type: toggle
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_ENABLED
+              highlight: 1
+              config-default@: system.flex.cache.object.enabled
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            object.cache.object.lifetime:
+              type: text
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_OBJECT_CACHE_LIFETIME
+              config-default@: system.flex.cache.object.lifetime
+              validate:
+                type: int
+
+            object.cache.render.enabled:
+              type: toggle
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_ENABLED
+              highlight: 1
+              config-default@: system.flex.cache.render.enabled
+              options:
+                1: PLUGIN_ADMIN.ENABLED
+                0: PLUGIN_ADMIN.DISABLED
+              validate:
+                type: bool
+
+            object.cache.render.lifetime:
+              type: text
+              toggleable: true
+              label: PLUGIN_ADMIN.FLEX_RENDER_CACHE_LIFETIME
+              config-default@: system.flex.cache.render.lifetime
+              validate:
+                type: int
diff --git a/system/blueprints/flex/user-accounts.yaml b/system/blueprints/flex/user-accounts.yaml
new file mode 100644
index 0000000000..74baeb623c
--- /dev/null
+++ b/system/blueprints/flex/user-accounts.yaml
@@ -0,0 +1,155 @@
+title: User Accounts
+description: Manage your User Accounts in Flex.
+type: flex-objects
+
+# Extends user account
+extends@:
+  type: account
+  context: blueprints://user
+
+#
+# HIGHLY SPECIALIZED FLEX TYPE, AVOID USING USER ACCOUNTS AS BASE FOR YOUR OWN TYPE.
+#
+
+# Flex configuration
+config:
+  # Administration Configuration (needs Flex Objects plugin)
+  admin:
+    # Admin router
+    router:
+      path: '/accounts/users'
+      actions:
+        configure:
+          path: '/accounts/configure'
+      redirects:
+        '/user': '/accounts/users'
+        '/accounts': '/accounts/users'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.users:
+        type: crudl
+        label: User Accounts
+      admin.configuration.users:
+        type: default
+        label: Accounts Configuration
+
+    # Admin menu
+    menu:
+      base:
+        location: '/accounts'
+        route: '/accounts/users'
+        index: 0
+        title: PLUGIN_ADMIN.ACCOUNTS
+        icon: fa-users
+        authorize: ['admin.users.list', 'admin.super']
+        priority: 6
+
+    # Admin template type (folder)
+    template: user-accounts
+
+    # List view
+    list:
+      # Fields shown in the list view
+      fields:
+        username:
+          link: edit
+          search: true
+          field:
+            label: PLUGIN_ADMIN.USERNAME
+        email:
+          search: true
+        fullname:
+          search: true
+      # Extra options
+      options:
+        per_page: 20
+        order:
+          by: username
+          dir: asc
+
+    # Edit view
+    edit:
+      title:
+        template: "{{ form.value('fullname') ?? form.value('username') }} &lt;{{ form.value('email') }}&gt;"
+
+    # Configure view
+    configure:
+      hidden: true
+      authorize: 'admin.configuration.users'
+      form: 'accounts'
+      title:
+        template: "{{ 'PLUGIN_ADMIN.ACCOUNTS'|tu }} {{ 'PLUGIN_ADMIN.CONFIGURATION'|tu }}"
+
+  # Site Configuration
+  site:
+    # Hide from flex types
+    hidden: true
+    templates:
+      collection:
+        # Lookup for the template layout files for collections of objects
+        paths:
+          - 'flex/{TYPE}/collection/{LAYOUT}{EXT}'
+      object:
+        # Lookup for the template layout files for objects
+        paths:
+          - 'flex/{TYPE}/object/{LAYOUT}{EXT}'
+      defaults:
+        # Default template {TYPE}; overridden by filename of this blueprint if template folder exists
+        type: user-accounts
+        # Default template {LAYOUT}; can be overridden in render calls (usually Twig in templates)
+        layout: default
+
+  # Data Configuration
+  data:
+    object: 'Grav\Common\Flex\Types\Users\UserObject'
+    collection: 'Grav\Common\Flex\Types\Users\UserCollection'
+    index: 'Grav\Common\Flex\Types\Users\UserIndex'
+    storage:
+      class: 'Grav\Common\Flex\Types\Users\Storage\UserFileStorage'
+      options:
+        formatter:
+          class: 'Grav\Framework\File\Formatter\YamlFormatter'
+        folder: 'account://'
+        pattern: '{FOLDER}/{KEY}{EXT}'
+        indexed: true
+        key: username
+        case_sensitive: false
+    search:
+      options:
+        contains: 1
+      fields:
+        - key
+        - email
+        - username
+        - fullname
+
+  relationships:
+    media:
+      type: media
+      cardinality: to-many
+    avatar:
+      type: media
+      cardinality: to-one
+#    roles:
+#      type: user-groups
+#      cardinality: to-many
+
+blueprints:
+  configure:
+    fields:
+      import@:
+        type: configure/compat
+        context: blueprints://flex
+
+# Regular form definition
+form:
+  fields:
+    username:
+      flex-disabled@: exists
+      disabled: false
+      flex-readonly@: exists
+      readonly: false
+      validate:
+        required: true
diff --git a/system/blueprints/flex/user-groups.yaml b/system/blueprints/flex/user-groups.yaml
new file mode 100644
index 0000000000..a5d348b5aa
--- /dev/null
+++ b/system/blueprints/flex/user-groups.yaml
@@ -0,0 +1,124 @@
+title: User Groups
+description: Manage your User Groups in Flex.
+type: flex-objects
+
+# Extends user group
+extends@:
+  type: group
+  context: blueprints://user
+
+# Flex configuration
+config:
+  # Administration Configuration (needs Flex Objects plugin)
+  admin:
+    # Admin router
+    router:
+      path: '/accounts/groups'
+      actions:
+        configure:
+          path: '/accounts/configure'
+      redirects:
+        '/groups': '/accounts/groups'
+        '/accounts': '/accounts/groups'
+
+    # Permissions
+    permissions:
+      # Primary permissions
+      admin.users:
+        type: crudl
+        label: User Accounts
+      admin.configuration.users:
+        type: default
+        label: Accounts Configuration
+
+    # Admin menu
+    menu:
+      base:
+        location: '/accounts'
+        route: '/accounts/groups'
+        index: 1
+        title: PLUGIN_ADMIN.ACCOUNTS
+        icon: fa-users
+        authorize: ['admin.users.list', 'admin.super']
+        priority: 6
+
+    # Admin template type (folder)
+    template: user-groups
+
+    # List view
+    list:
+      # Fields shown in the list view
+      fields:
+        groupname:
+          link: edit
+          search: true
+        readableName:
+          search: true
+        description:
+          search: true
+      # Extra options
+      options:
+        per_page: 20
+        order:
+          by: groupname
+          dir: asc
+
+    # Edit view
+    edit:
+      title:
+        template: "{{ form.value('readableName') ?? form.value('groupname') }}"
+
+    # Configure view
+    configure:
+      hidden: true
+      authorize: 'admin.configuration.users'
+      form: 'accounts'
+      title:
+        template: "{{ 'PLUGIN_ADMIN.ACCOUNTS'|tu }} {{ 'PLUGIN_ADMIN.CONFIGURATION'|tu }}"
+
+  # Site Configuration
+  site:
+    # Hide from flex types
+    hidden: true
+    templates:
+      collection:
+        # Lookup for the template layout files for collections of objects
+        paths:
+          - 'flex/{TYPE}/collection/{LAYOUT}{EXT}'
+      object:
+        # Lookup for the template layout files for objects
+        paths:
+          - 'flex/{TYPE}/object/{LAYOUT}{EXT}'
+      defaults:
+        # Default template {TYPE}; overridden by filename of this blueprint if template folder exists
+        type: user-groups
+        # Default template {LAYOUT}; can be overridden in render calls (usually Twig in templates)
+        layout: default
+
+  # Data Configuration
+  data:
+    object: 'Grav\Common\Flex\Types\UserGroups\UserGroupObject'
+    collection: 'Grav\Common\Flex\Types\UserGroups\UserGroupCollection'
+    index: 'Grav\Common\Flex\Types\UserGroups\UserGroupIndex'
+    storage:
+      class: 'Grav\Framework\Flex\Storage\SimpleStorage'
+      options:
+        formatter:
+          class: 'Grav\Framework\File\Formatter\YamlFormatter'
+        folder: 'user://config/groups.yaml'
+        key: groupname
+    search:
+      options:
+        contains: 1
+      fields:
+        - key
+        - groupname
+        - readableName
+        - description
+
+blueprints:
+  configure:
+    fields:
+      import@:
+        type: configure/compat
+        context: blueprints://flex
diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml
index 0e7b8c374c..a573a83c83 100644
--- a/system/blueprints/pages/default.yaml
+++ b/system/blueprints/pages/default.yaml
@@ -121,7 +121,7 @@ form:
                       underline: true
 
                     folder:
-                      type: text
+                      type: folder-slug
                       label: PLUGIN_ADMIN.FOLDER_NAME
                       validate:
                         rule: slug
@@ -320,6 +320,18 @@ form:
 
               fields:
 
+                header.redirect_default_route:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE
+                  help: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE_HELP
+                  config-highlight@: system.pages.redirect_default_route
+                  options:
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
+                  validate:
+                    type: bool
+
                 header.routes.default:
                   type: text
                   toggleable: true
diff --git a/system/blueprints/pages/external.yaml b/system/blueprints/pages/external.yaml
index df1d7b0aad..d3bb57ac95 100644
--- a/system/blueprints/pages/external.yaml
+++ b/system/blueprints/pages/external.yaml
@@ -1,7 +1,7 @@
-title: PLUGIN_ADMIN:EXTERNAL
+title: PLUGIN_ADMIN.EXTERNAL
 extends@:
-    type: default
-    context: blueprints://pages
+  type: default
+  context: blueprints://pages
 
 form:
   validation: loose
@@ -29,16 +29,16 @@ form:
               unset@: true
 
             header.external_url:
-                type: text
-                label: PLUGIN_ADMIN.EXTERNAL_URL
-                placeholder: https://getgrav.org
-                validate:
-                    required: true
+              type: text
+              label: PLUGIN_ADMIN.EXTERNAL_URL
+              placeholder: https://getgrav.org
+              validate:
+                required: true
+
         options:
           fields:
 
             publishing:
-
               fields:
 
                 header.date:
diff --git a/system/blueprints/pages/modular.yaml b/system/blueprints/pages/modular.yaml
index 94f56506a4..5461b238d3 100644
--- a/system/blueprints/pages/modular.yaml
+++ b/system/blueprints/pages/modular.yaml
@@ -1,4 +1,4 @@
-title: PLUGIN_ADMIN.MODULAR
+title: PLUGIN_ADMIN.MODULE
 extends@: default
 
 form:
@@ -13,7 +13,7 @@ form:
 
             modular_title:
               type: spacer
-              title: PLUGIN_ADMIN.MODULAR_SETUP
+              title: PLUGIN_ADMIN.MODULE_SETUP
 
             header.content.items:
               type: text
@@ -34,5 +34,3 @@ form:
               help: '"desc" or "asc" are valid values'
               placeholder: desc
               size: small
-
-
diff --git a/system/blueprints/pages/partials/security.yaml b/system/blueprints/pages/partials/security.yaml
new file mode 100644
index 0000000000..26d8c7dcb0
--- /dev/null
+++ b/system/blueprints/pages/partials/security.yaml
@@ -0,0 +1,67 @@
+form:
+  fields:
+    _site:
+      type: section
+      title: PLUGIN_ADMIN.PAGE_ACCESS
+      underline: true
+
+      fields:
+
+        header.login.visibility_requires_access:
+          type: toggle
+          toggleable: true
+          label: PLUGIN_ADMIN.PAGE_VISIBILITY_REQUIRES_ACCESS
+          help: PLUGIN_ADMIN.PAGE_VISIBILITY_REQUIRES_ACCESS_HELP
+          highlight: 0
+          options:
+            1: PLUGIN_ADMIN.YES
+            0: PLUGIN_ADMIN.NO
+          validate:
+            type: bool
+
+
+        header.access:
+          type: acl_picker
+          label: PLUGIN_ADMIN.PAGE_ACCESS
+          help: PLUGIN_ADMIN.PAGE_ACCESS_HELP
+          ignore_empty: true
+          data_type: access
+          validate:
+            type: array
+            value_type: bool
+
+    _admin:
+      security@: {or: [admin.super, admin.configuration.pages]}
+      type: section
+      title: PLUGIN_ADMIN.PAGE PERMISSIONS
+      underline: true
+
+      fields:
+
+        header.permissions.inherit:
+          type: toggle
+          toggleable: true
+          label: PLUGIN_ADMIN.PAGE_INHERIT_PERMISSIONS
+          help: PLUGIN_ADMIN.PAGE_INHERIT_PERMISSIONS_HELP
+          highlight: 1
+          options:
+            1: PLUGIN_ADMIN.YES
+            0: PLUGIN_ADMIN.NO
+          validate:
+            type: bool
+
+        header.permissions.authors:
+          type: array
+          toggleable: true
+          value_only: true
+          placeholder_value: PLUGIN_ADMIN.USERNAME
+          label: PLUGIN_ADMIN.PAGE_AUTHORS
+          help: PLUGIN_ADMIN.PAGE_AUTHORS_HELP
+
+        header.permissions.groups:
+          ignore@: true
+          type: acl_picker
+          label: PLUGIN_ADMIN.PAGE_GROUPS
+          help: PLUGIN_ADMIN.PAGE_GROUPS_HELP
+          ignore_empty: true
+          data_type: permissions
diff --git a/system/blueprints/pages/root.yaml b/system/blueprints/pages/root.yaml
new file mode 100644
index 0000000000..5abc516448
--- /dev/null
+++ b/system/blueprints/pages/root.yaml
@@ -0,0 +1,16 @@
+title: PLUGIN_ADMIN.ROOT
+
+rules:
+  slug:
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
+
+form:
+  validation: loose
+
+  fields:
+
+    tabs:
+      type: tabs
+      active: 1
diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml
index 897cc98a20..ef5f25b045 100644
--- a/system/blueprints/user/account.yaml
+++ b/system/blueprints/user/account.yaml
@@ -11,10 +11,21 @@ form:
         avatar:
             type: file
             size: large
-            destination: 'user://accounts/avatars'
+            destination: 'account://avatars'
             multiple: false
             random_name: true
 
+        multiavatar_only:
+          type: conditional
+          condition: config.system.accounts.avatar == 'multiavatar'
+          fields:
+            avatar_hash:
+                type: text
+                label: ''
+                placeholder: 'e.g. dceaadcfda491f4e45'
+                description: PLUGIN_ADMIN.AVATAR_HASH
+                size: large
+
         content:
             type: section
             title: PLUGIN_ADMIN.ACCOUNT
@@ -67,6 +78,15 @@ form:
             default: 'en'
             help: PLUGIN_ADMIN.LANGUAGE_HELP
 
+        content_editor:
+            type: select
+            label: PLUGIN_ADMIN.CONTENT_EDITOR
+            size: medium
+            classes: fancy
+            data-options@: 'Grav\Plugin\Admin\Admin::contentEditor'
+            default: 'default'
+            help: PLUGIN_ADMIN.CONTENT_EDITOR_HELP
+
         twofa_check:
             type: conditional
             condition: config.plugins.admin.twofa_enabled
@@ -98,6 +118,14 @@ form:
                     label: PLUGIN_ADMIN.2FA_SECRET
                     sublabel: PLUGIN_ADMIN.2FA_SECRET_HELP
 
+                yubikey_id:
+                    type: text
+                    label: PLUGIN_ADMIN.YUBIKEY_ID
+                    description: PLUGIN_ADMIN.YUBIKEY_HELP
+                    size: small
+                    maxlength: 12
+
+
 
         security:
             security@: admin.super
@@ -121,7 +149,9 @@ form:
                 access:
                     security@: admin.super
                     type: permissions
+                    check_authorize: true
                     label: PLUGIN_ADMIN.PERMISSIONS
                     ignore_empty: true
                     validate:
                         type: array
+                        value_type: bool
diff --git a/system/blueprints/user/account_new.yaml b/system/blueprints/user/account_new.yaml
index 7a92518510..1b22f93b79 100644
--- a/system/blueprints/user/account_new.yaml
+++ b/system/blueprints/user/account_new.yaml
@@ -13,6 +13,6 @@ form:
       label: PLUGIN_ADMIN.USERNAME
       help: PLUGIN_ADMIN.USERNAME_HELP
       unset-disabled@: true
-      unset-readonly@: true
+      unset-readonly@: true
       validate:
         required: true
diff --git a/system/blueprints/user/accounts.yaml b/system/blueprints/user/accounts.yaml
deleted file mode 100644
index 49b0f71b3e..0000000000
--- a/system/blueprints/user/accounts.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-title: User Accounts
-description: User Accounts
-type: flex-objects
-
-extends@: 'user/account'
-
-config:
-  admin:
-    list:
-      fields:
-        username:
-          link: edit
-          search: true
-        email:
-          search: true
-        fullname:
-          search: true
-      options:
-        per_page: 20
-        order:
-          by: username
-          dir: asc
-
-    menu:
-      list:
-        route: '/accounts'
-        title: Accounts
-        icon: fa-users
-        authorize: ['admin.users', 'admin.accounts', 'admin.super']
-
-form:
-  fields:
-    username:
-      flex-disabled@: exists
-      disabled: false
-      flex-readonly@: exists
-      readonly: false
-      validate:
-        required: true
\ No newline at end of file
diff --git a/system/blueprints/user/group.yaml b/system/blueprints/user/group.yaml
index a5a7477b6f..61f0227895 100644
--- a/system/blueprints/user/group.yaml
+++ b/system/blueprints/user/group.yaml
@@ -1,37 +1,55 @@
 title: Group
+rules:
+  slug:
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
+
 form:
-    validation: loose
+  validation: loose
 
-    fields:
-        spacer:
-            type: spacer
-            text: '<br>'
+  fields:
+    groupname:
+      type: text
+      size: large
+      label: PLUGIN_ADMIN.GROUP_NAME
+      flex-disabled@: exists
+      flex-readonly@: exists
+      validate:
+        required: true
+        rule: slug
 
-        groupname:
-            type: text
-            size: large
-            label: PLUGIN_ADMIN.NAME
-            disabled: true
-            readonly: true
+    readableName:
+      type: text
+      size: large
+      label: PLUGIN_ADMIN.DISPLAY_NAME
 
-        readableName:
-            type: text
-            size: large
-            label: PLUGIN_ADMIN_PRO.READABLE_NAME
+    description:
+      type: text
+      size: large
+      label: PLUGIN_ADMIN.DESCRIPTION
 
-        description:
-            type: text
-            size: large
-            label: PLUGIN_ADMIN.DESCRIPTION
+    icon:
+      type: text
+      size: small
+      label: PLUGIN_ADMIN.ICON
 
-        icon:
-            type: text
-            size: small
-            label: PLUGIN_ADMIN_PRO.ICON
+    enabled:
+      type: toggle
+      label: PLUGIN_ADMIN.ENABLED
+      highlight: 1
+      default: 1
+      options:
+        1: PLUGIN_ADMIN.YES
+        0: PLUGIN_ADMIN.NO
+      validate:
+        type: bool
 
-        access:
-            type: permissions
-            label: PLUGIN_ADMIN.PERMISSIONS
-            ignore_empty: true
-            validate:
-                type: array
+    access:
+      type: permissions
+      check_authorize: false
+      label: PLUGIN_ADMIN.PERMISSIONS
+      ignore_empty: true
+      validate:
+        type: array
+        value_type: bool
diff --git a/system/blueprints/user/group_new.yaml b/system/blueprints/user/group_new.yaml
index dd816a954f..baa37c3cc3 100644
--- a/system/blueprints/user/group_new.yaml
+++ b/system/blueprints/user/group_new.yaml
@@ -1,5 +1,11 @@
 title: PLUGIN_ADMIN_PRO.ADD_GROUP
 
+rules:
+  slug:
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
+
 form:
   validation: loose
   fields:
@@ -14,3 +20,4 @@ form:
       help: PLUGIN_ADMIN_PRO.GROUP_NAME_HELP
       validate:
         required: true
+        rule: slug
diff --git a/system/config/media.yaml b/system/config/media.yaml
index 7326b03cbd..fad5e0dcb2 100644
--- a/system/config/media.yaml
+++ b/system/config/media.yaml
@@ -24,6 +24,14 @@ types:
     type: image
     thumb: media/thumb-png.png
     mime: image/png
+  webp:
+    type: image
+    thumb: media/thumb-webp.png
+    mime: image/webp
+  avif:
+    type: image
+    thumb: media/thumb.png
+    mime: image/avif
   gif:
     type: animated
     thumb: media/thumb-gif.png
@@ -87,7 +95,7 @@ types:
   aif:
     type: audio
     thumb: media/thumb-aif.png
-    mime: audio/aif
+    mime: audio/aiff
   txt:
     type: file
     thumb: media/thumb-txt.png
@@ -103,7 +111,7 @@ types:
   docx:
     type: file
     thumb: media/thumb-docx.png
-    mime: application/msword
+    mime: application/vnd.openxmlformats-officedocument.wordprocessingml.document
   xls:
     type: file
     thumb: media/thumb-xls.png
@@ -111,7 +119,7 @@ types:
   xlsx:
     type: file
     thumb: media/thumb-xlsx.png
-    mime: application/vnd.ms-excel
+    mime: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
   ppt:
     type: file
     thumb: media/thumb-ppt.png
@@ -119,7 +127,7 @@ types:
   pptx:
     type: file
     thumb: media/thumb-pptx.png
-    mime: application/vnd.ms-powerpoint
+    mime: application/vnd.openxmlformats-officedocument.presentationml.presentation
   pps:
     type: file
     thumb: media/thumb-pps.png
@@ -191,7 +199,7 @@ types:
   gz:
     type: file
     thumb: media/thumb-gz.png
-    mime: application/gzip
+    mime: application/x-gzip
   tar:
     type: file
     thumb: media/thumb-tar.png
@@ -203,7 +211,7 @@ types:
   js:
     type: file
     thumb: media/thumb-js.png
-    mime: application/javascript
+    mime: text/javascript
   json:
     type: file
     thumb: media/thumb-json.png
diff --git a/system/config/mime.yaml b/system/config/mime.yaml
new file mode 100644
index 0000000000..3143c67337
--- /dev/null
+++ b/system/config/mime.yaml
@@ -0,0 +1,1986 @@
+types:
+  '123':
+  - application/vnd.lotus-1-2-3
+  wof:
+  - application/font-woff
+  php:
+  - application/php
+  - application/x-httpd-php
+  - application/x-httpd-php-source
+  - application/x-php
+  - text/php
+  - text/x-php
+  otf:
+  - application/x-font-otf
+  - font/otf
+  ttf:
+  - application/x-font-ttf
+  - font/ttf
+  ttc:
+  - application/x-font-ttf
+  - font/collection
+  zip:
+  - application/x-gzip
+  - application/zip
+  - application/x-zip-compressed
+  amr:
+  - audio/amr
+  mp3:
+  - audio/mpeg
+  mpga:
+  - audio/mpeg
+  mp2:
+  - audio/mpeg
+  mp2a:
+  - audio/mpeg
+  m2a:
+  - audio/mpeg
+  m3a:
+  - audio/mpeg
+  jpg:
+  - image/jpeg
+  jpeg:
+  - image/jpeg
+  jpe:
+  - image/jpeg
+  bmp:
+  - image/x-ms-bmp
+  - image/bmp
+  ez:
+  - application/andrew-inset
+  aw:
+  - application/applixware
+  atom:
+  - application/atom+xml
+  atomcat:
+  - application/atomcat+xml
+  atomsvc:
+  - application/atomsvc+xml
+  ccxml:
+  - application/ccxml+xml
+  cdmia:
+  - application/cdmi-capability
+  cdmic:
+  - application/cdmi-container
+  cdmid:
+  - application/cdmi-domain
+  cdmio:
+  - application/cdmi-object
+  cdmiq:
+  - application/cdmi-queue
+  cu:
+  - application/cu-seeme
+  davmount:
+  - application/davmount+xml
+  dbk:
+  - application/docbook+xml
+  dssc:
+  - application/dssc+der
+  xdssc:
+  - application/dssc+xml
+  ecma:
+  - application/ecmascript
+  emma:
+  - application/emma+xml
+  epub:
+  - application/epub+zip
+  exi:
+  - application/exi
+  pfr:
+  - application/font-tdpfr
+  gml:
+  - application/gml+xml
+  gpx:
+  - application/gpx+xml
+  gxf:
+  - application/gxf
+  stk:
+  - application/hyperstudio
+  ink:
+  - application/inkml+xml
+  inkml:
+  - application/inkml+xml
+  ipfix:
+  - application/ipfix
+  jar:
+  - application/java-archive
+  ser:
+  - application/java-serialized-object
+  class:
+  - application/java-vm
+  js:
+  - application/javascript
+  json:
+  - application/json
+  jsonml:
+  - application/jsonml+json
+  lostxml:
+  - application/lost+xml
+  hqx:
+  - application/mac-binhex40
+  cpt:
+  - application/mac-compactpro
+  mads:
+  - application/mads+xml
+  mrc:
+  - application/marc
+  mrcx:
+  - application/marcxml+xml
+  ma:
+  - application/mathematica
+  nb:
+  - application/mathematica
+  mb:
+  - application/mathematica
+  mathml:
+  - application/mathml+xml
+  mbox:
+  - application/mbox
+  mscml:
+  - application/mediaservercontrol+xml
+  metalink:
+  - application/metalink+xml
+  meta4:
+  - application/metalink4+xml
+  mets:
+  - application/mets+xml
+  mods:
+  - application/mods+xml
+  m21:
+  - application/mp21
+  mp21:
+  - application/mp21
+  mp4s:
+  - application/mp4
+  doc:
+  - application/msword
+  dot:
+  - application/msword
+  mxf:
+  - application/mxf
+  bin:
+  - application/octet-stream
+  dms:
+  - application/octet-stream
+  lrf:
+  - application/octet-stream
+  mar:
+  - application/octet-stream
+  so:
+  - application/octet-stream
+  dist:
+  - application/octet-stream
+  distz:
+  - application/octet-stream
+  pkg:
+  - application/octet-stream
+  bpk:
+  - application/octet-stream
+  dump:
+  - application/octet-stream
+  elc:
+  - application/octet-stream
+  deploy:
+  - application/octet-stream
+  oda:
+  - application/oda
+  opf:
+  - application/oebps-package+xml
+  ogx:
+  - application/ogg
+  omdoc:
+  - application/omdoc+xml
+  onetoc:
+  - application/onenote
+  onetoc2:
+  - application/onenote
+  onetmp:
+  - application/onenote
+  onepkg:
+  - application/onenote
+  oxps:
+  - application/oxps
+  xer:
+  - application/patch-ops-error+xml
+  pdf:
+  - application/pdf
+  pgp:
+  - application/pgp-encrypted
+  asc:
+  - application/pgp-signature
+  sig:
+  - application/pgp-signature
+  prf:
+  - application/pics-rules
+  p10:
+  - application/pkcs10
+  p7m:
+  - application/pkcs7-mime
+  p7c:
+  - application/pkcs7-mime
+  p7s:
+  - application/pkcs7-signature
+  p8:
+  - application/pkcs8
+  ac:
+  - application/pkix-attr-cert
+  cer:
+  - application/pkix-cert
+  crl:
+  - application/pkix-crl
+  pkipath:
+  - application/pkix-pkipath
+  pki:
+  - application/pkixcmp
+  pls:
+  - application/pls+xml
+  ai:
+  - application/postscript
+  eps:
+  - application/postscript
+  ps:
+  - application/postscript
+  cww:
+  - application/prs.cww
+  pskcxml:
+  - application/pskc+xml
+  rdf:
+  - application/rdf+xml
+  rif:
+  - application/reginfo+xml
+  rnc:
+  - application/relax-ng-compact-syntax
+  rl:
+  - application/resource-lists+xml
+  rld:
+  - application/resource-lists-diff+xml
+  rs:
+  - application/rls-services+xml
+  gbr:
+  - application/rpki-ghostbusters
+  mft:
+  - application/rpki-manifest
+  roa:
+  - application/rpki-roa
+  rsd:
+  - application/rsd+xml
+  rss:
+  - application/rss+xml
+  rtf:
+  - application/rtf
+  sbml:
+  - application/sbml+xml
+  scq:
+  - application/scvp-cv-request
+  scs:
+  - application/scvp-cv-response
+  spq:
+  - application/scvp-vp-request
+  spp:
+  - application/scvp-vp-response
+  sdp:
+  - application/sdp
+  setpay:
+  - application/set-payment-initiation
+  setreg:
+  - application/set-registration-initiation
+  shf:
+  - application/shf+xml
+  smi:
+  - application/smil+xml
+  smil:
+  - application/smil+xml
+  rq:
+  - application/sparql-query
+  srx:
+  - application/sparql-results+xml
+  gram:
+  - application/srgs
+  grxml:
+  - application/srgs+xml
+  sru:
+  - application/sru+xml
+  ssdl:
+  - application/ssdl+xml
+  ssml:
+  - application/ssml+xml
+  tei:
+  - application/tei+xml
+  teicorpus:
+  - application/tei+xml
+  tfi:
+  - application/thraud+xml
+  tsd:
+  - application/timestamped-data
+  plb:
+  - application/vnd.3gpp.pic-bw-large
+  psb:
+  - application/vnd.3gpp.pic-bw-small
+  pvb:
+  - application/vnd.3gpp.pic-bw-var
+  tcap:
+  - application/vnd.3gpp2.tcap
+  pwn:
+  - application/vnd.3m.post-it-notes
+  aso:
+  - application/vnd.accpac.simply.aso
+  imp:
+  - application/vnd.accpac.simply.imp
+  acu:
+  - application/vnd.acucobol
+  atc:
+  - application/vnd.acucorp
+  acutc:
+  - application/vnd.acucorp
+  air:
+  - application/vnd.adobe.air-application-installer-package+zip
+  fcdt:
+  - application/vnd.adobe.formscentral.fcdt
+  fxp:
+  - application/vnd.adobe.fxp
+  fxpl:
+  - application/vnd.adobe.fxp
+  xdp:
+  - application/vnd.adobe.xdp+xml
+  xfdf:
+  - application/vnd.adobe.xfdf
+  ahead:
+  - application/vnd.ahead.space
+  azf:
+  - application/vnd.airzip.filesecure.azf
+  azs:
+  - application/vnd.airzip.filesecure.azs
+  azw:
+  - application/vnd.amazon.ebook
+  acc:
+  - application/vnd.americandynamics.acc
+  ami:
+  - application/vnd.amiga.ami
+  apk:
+  - application/vnd.android.package-archive
+  cii:
+  - application/vnd.anser-web-certificate-issue-initiation
+  fti:
+  - application/vnd.anser-web-funds-transfer-initiation
+  atx:
+  - application/vnd.antix.game-component
+  mpkg:
+  - application/vnd.apple.installer+xml
+  m3u8:
+  - application/vnd.apple.mpegurl
+  swi:
+  - application/vnd.aristanetworks.swi
+  iota:
+  - application/vnd.astraea-software.iota
+  aep:
+  - application/vnd.audiograph
+  mpm:
+  - application/vnd.blueice.multipass
+  bmi:
+  - application/vnd.bmi
+  rep:
+  - application/vnd.businessobjects
+  cdxml:
+  - application/vnd.chemdraw+xml
+  mmd:
+  - application/vnd.chipnuts.karaoke-mmd
+  cdy:
+  - application/vnd.cinderella
+  cla:
+  - application/vnd.claymore
+  rp9:
+  - application/vnd.cloanto.rp9
+  c4g:
+  - application/vnd.clonk.c4group
+  c4d:
+  - application/vnd.clonk.c4group
+  c4f:
+  - application/vnd.clonk.c4group
+  c4p:
+  - application/vnd.clonk.c4group
+  c4u:
+  - application/vnd.clonk.c4group
+  c11amc:
+  - application/vnd.cluetrust.cartomobile-config
+  c11amz:
+  - application/vnd.cluetrust.cartomobile-config-pkg
+  csp:
+  - application/vnd.commonspace
+  cdbcmsg:
+  - application/vnd.contact.cmsg
+  cmc:
+  - application/vnd.cosmocaller
+  clkx:
+  - application/vnd.crick.clicker
+  clkk:
+  - application/vnd.crick.clicker.keyboard
+  clkp:
+  - application/vnd.crick.clicker.palette
+  clkt:
+  - application/vnd.crick.clicker.template
+  clkw:
+  - application/vnd.crick.clicker.wordbank
+  wbs:
+  - application/vnd.criticaltools.wbs+xml
+  pml:
+  - application/vnd.ctc-posml
+  ppd:
+  - application/vnd.cups-ppd
+  car:
+  - application/vnd.curl.car
+  pcurl:
+  - application/vnd.curl.pcurl
+  dart:
+  - application/vnd.dart
+  rdz:
+  - application/vnd.data-vision.rdz
+  uvf:
+  - application/vnd.dece.data
+  uvvf:
+  - application/vnd.dece.data
+  uvd:
+  - application/vnd.dece.data
+  uvvd:
+  - application/vnd.dece.data
+  uvt:
+  - application/vnd.dece.ttml+xml
+  uvvt:
+  - application/vnd.dece.ttml+xml
+  uvx:
+  - application/vnd.dece.unspecified
+  uvvx:
+  - application/vnd.dece.unspecified
+  uvz:
+  - application/vnd.dece.zip
+  uvvz:
+  - application/vnd.dece.zip
+  fe_launch:
+  - application/vnd.denovo.fcselayout-link
+  dna:
+  - application/vnd.dna
+  mlp:
+  - application/vnd.dolby.mlp
+  dpg:
+  - application/vnd.dpgraph
+  dfac:
+  - application/vnd.dreamfactory
+  kpxx:
+  - application/vnd.ds-keypoint
+  ait:
+  - application/vnd.dvb.ait
+  svc:
+  - application/vnd.dvb.service
+  geo:
+  - application/vnd.dynageo
+  mag:
+  - application/vnd.ecowin.chart
+  nml:
+  - application/vnd.enliven
+  esf:
+  - application/vnd.epson.esf
+  msf:
+  - application/vnd.epson.msf
+  qam:
+  - application/vnd.epson.quickanime
+  slt:
+  - application/vnd.epson.salt
+  ssf:
+  - application/vnd.epson.ssf
+  es3:
+  - application/vnd.eszigno3+xml
+  et3:
+  - application/vnd.eszigno3+xml
+  ez2:
+  - application/vnd.ezpix-album
+  ez3:
+  - application/vnd.ezpix-package
+  fdf:
+  - application/vnd.fdf
+  mseed:
+  - application/vnd.fdsn.mseed
+  seed:
+  - application/vnd.fdsn.seed
+  dataless:
+  - application/vnd.fdsn.seed
+  gph:
+  - application/vnd.flographit
+  ftc:
+  - application/vnd.fluxtime.clip
+  fm:
+  - application/vnd.framemaker
+  frame:
+  - application/vnd.framemaker
+  maker:
+  - application/vnd.framemaker
+  book:
+  - application/vnd.framemaker
+  fnc:
+  - application/vnd.frogans.fnc
+  ltf:
+  - application/vnd.frogans.ltf
+  fsc:
+  - application/vnd.fsc.weblaunch
+  oas:
+  - application/vnd.fujitsu.oasys
+  oa2:
+  - application/vnd.fujitsu.oasys2
+  oa3:
+  - application/vnd.fujitsu.oasys3
+  fg5:
+  - application/vnd.fujitsu.oasysgp
+  bh2:
+  - application/vnd.fujitsu.oasysprs
+  ddd:
+  - application/vnd.fujixerox.ddd
+  xdw:
+  - application/vnd.fujixerox.docuworks
+  xbd:
+  - application/vnd.fujixerox.docuworks.binder
+  fzs:
+  - application/vnd.fuzzysheet
+  txd:
+  - application/vnd.genomatix.tuxedo
+  ggb:
+  - application/vnd.geogebra.file
+  ggt:
+  - application/vnd.geogebra.tool
+  gex:
+  - application/vnd.geometry-explorer
+  gre:
+  - application/vnd.geometry-explorer
+  gxt:
+  - application/vnd.geonext
+  g2w:
+  - application/vnd.geoplan
+  g3w:
+  - application/vnd.geospace
+  gmx:
+  - application/vnd.gmx
+  kml:
+  - application/vnd.google-earth.kml+xml
+  kmz:
+  - application/vnd.google-earth.kmz
+  gqf:
+  - application/vnd.grafeq
+  gqs:
+  - application/vnd.grafeq
+  gac:
+  - application/vnd.groove-account
+  ghf:
+  - application/vnd.groove-help
+  gim:
+  - application/vnd.groove-identity-message
+  grv:
+  - application/vnd.groove-injector
+  gtm:
+  - application/vnd.groove-tool-message
+  tpl:
+  - application/vnd.groove-tool-template
+  vcg:
+  - application/vnd.groove-vcard
+  hal:
+  - application/vnd.hal+xml
+  zmm:
+  - application/vnd.handheld-entertainment+xml
+  hbci:
+  - application/vnd.hbci
+  les:
+  - application/vnd.hhe.lesson-player
+  hpgl:
+  - application/vnd.hp-hpgl
+  hpid:
+  - application/vnd.hp-hpid
+  hps:
+  - application/vnd.hp-hps
+  jlt:
+  - application/vnd.hp-jlyt
+  pcl:
+  - application/vnd.hp-pcl
+  pclxl:
+  - application/vnd.hp-pclxl
+  sfd-hdstx:
+  - application/vnd.hydrostatix.sof-data
+  mpy:
+  - application/vnd.ibm.minipay
+  afp:
+  - application/vnd.ibm.modcap
+  listafp:
+  - application/vnd.ibm.modcap
+  list3820:
+  - application/vnd.ibm.modcap
+  irm:
+  - application/vnd.ibm.rights-management
+  sc:
+  - application/vnd.ibm.secure-container
+  icc:
+  - application/vnd.iccprofile
+  icm:
+  - application/vnd.iccprofile
+  igl:
+  - application/vnd.igloader
+  ivp:
+  - application/vnd.immervision-ivp
+  ivu:
+  - application/vnd.immervision-ivu
+  igm:
+  - application/vnd.insors.igm
+  xpw:
+  - application/vnd.intercon.formnet
+  xpx:
+  - application/vnd.intercon.formnet
+  i2g:
+  - application/vnd.intergeo
+  qbo:
+  - application/vnd.intu.qbo
+  qfx:
+  - application/vnd.intu.qfx
+  rcprofile:
+  - application/vnd.ipunplugged.rcprofile
+  irp:
+  - application/vnd.irepository.package+xml
+  xpr:
+  - application/vnd.is-xpr
+  fcs:
+  - application/vnd.isac.fcs
+  jam:
+  - application/vnd.jam
+  rms:
+  - application/vnd.jcp.javame.midlet-rms
+  jisp:
+  - application/vnd.jisp
+  joda:
+  - application/vnd.joost.joda-archive
+  ktz:
+  - application/vnd.kahootz
+  ktr:
+  - application/vnd.kahootz
+  karbon:
+  - application/vnd.kde.karbon
+  chrt:
+  - application/vnd.kde.kchart
+  kfo:
+  - application/vnd.kde.kformula
+  flw:
+  - application/vnd.kde.kivio
+  kon:
+  - application/vnd.kde.kontour
+  kpr:
+  - application/vnd.kde.kpresenter
+  kpt:
+  - application/vnd.kde.kpresenter
+  ksp:
+  - application/vnd.kde.kspread
+  kwd:
+  - application/vnd.kde.kword
+  kwt:
+  - application/vnd.kde.kword
+  htke:
+  - application/vnd.kenameaapp
+  kia:
+  - application/vnd.kidspiration
+  kne:
+  - application/vnd.kinar
+  knp:
+  - application/vnd.kinar
+  skp:
+  - application/vnd.koan
+  skd:
+  - application/vnd.koan
+  skt:
+  - application/vnd.koan
+  skm:
+  - application/vnd.koan
+  sse:
+  - application/vnd.kodak-descriptor
+  lasxml:
+  - application/vnd.las.las+xml
+  lbd:
+  - application/vnd.llamagraphics.life-balance.desktop
+  lbe:
+  - application/vnd.llamagraphics.life-balance.exchange+xml
+  apr:
+  - application/vnd.lotus-approach
+  pre:
+  - application/vnd.lotus-freelance
+  nsf:
+  - application/vnd.lotus-notes
+  org:
+  - application/vnd.lotus-organizer
+  scm:
+  - application/vnd.lotus-screencam
+  lwp:
+  - application/vnd.lotus-wordpro
+  portpkg:
+  - application/vnd.macports.portpkg
+  mcd:
+  - application/vnd.mcd
+  mc1:
+  - application/vnd.medcalcdata
+  cdkey:
+  - application/vnd.mediastation.cdkey
+  mwf:
+  - application/vnd.mfer
+  mfm:
+  - application/vnd.mfmp
+  flo:
+  - application/vnd.micrografx.flo
+  igx:
+  - application/vnd.micrografx.igx
+  mif:
+  - application/vnd.mif
+  daf:
+  - application/vnd.mobius.daf
+  dis:
+  - application/vnd.mobius.dis
+  mbk:
+  - application/vnd.mobius.mbk
+  mqy:
+  - application/vnd.mobius.mqy
+  msl:
+  - application/vnd.mobius.msl
+  plc:
+  - application/vnd.mobius.plc
+  txf:
+  - application/vnd.mobius.txf
+  mpn:
+  - application/vnd.mophun.application
+  mpc:
+  - application/vnd.mophun.certificate
+  xul:
+  - application/vnd.mozilla.xul+xml
+  cil:
+  - application/vnd.ms-artgalry
+  cab:
+  - application/vnd.ms-cab-compressed
+  xls:
+  - application/vnd.ms-excel
+  xlm:
+  - application/vnd.ms-excel
+  xla:
+  - application/vnd.ms-excel
+  xlc:
+  - application/vnd.ms-excel
+  xlt:
+  - application/vnd.ms-excel
+  xlw:
+  - application/vnd.ms-excel
+  xlam:
+  - application/vnd.ms-excel.addin.macroenabled.12
+  xlsb:
+  - application/vnd.ms-excel.sheet.binary.macroenabled.12
+  xlsm:
+  - application/vnd.ms-excel.sheet.macroenabled.12
+  xltm:
+  - application/vnd.ms-excel.template.macroenabled.12
+  eot:
+  - application/vnd.ms-fontobject
+  chm:
+  - application/vnd.ms-htmlhelp
+  ims:
+  - application/vnd.ms-ims
+  lrm:
+  - application/vnd.ms-lrm
+  thmx:
+  - application/vnd.ms-officetheme
+  cat:
+  - application/vnd.ms-pki.seccat
+  stl:
+  - application/vnd.ms-pki.stl
+  ppt:
+  - application/vnd.ms-powerpoint
+  pps:
+  - application/vnd.ms-powerpoint
+  pot:
+  - application/vnd.ms-powerpoint
+  ppam:
+  - application/vnd.ms-powerpoint.addin.macroenabled.12
+  pptm:
+  - application/vnd.ms-powerpoint.presentation.macroenabled.12
+  sldm:
+  - application/vnd.ms-powerpoint.slide.macroenabled.12
+  ppsm:
+  - application/vnd.ms-powerpoint.slideshow.macroenabled.12
+  potm:
+  - application/vnd.ms-powerpoint.template.macroenabled.12
+  mpp:
+  - application/vnd.ms-project
+  mpt:
+  - application/vnd.ms-project
+  docm:
+  - application/vnd.ms-word.document.macroenabled.12
+  dotm:
+  - application/vnd.ms-word.template.macroenabled.12
+  wps:
+  - application/vnd.ms-works
+  wks:
+  - application/vnd.ms-works
+  wcm:
+  - application/vnd.ms-works
+  wdb:
+  - application/vnd.ms-works
+  wpl:
+  - application/vnd.ms-wpl
+  xps:
+  - application/vnd.ms-xpsdocument
+  mseq:
+  - application/vnd.mseq
+  mus:
+  - application/vnd.musician
+  msty:
+  - application/vnd.muvee.style
+  taglet:
+  - application/vnd.mynfc
+  nlu:
+  - application/vnd.neurolanguage.nlu
+  ntf:
+  - application/vnd.nitf
+  nitf:
+  - application/vnd.nitf
+  nnd:
+  - application/vnd.noblenet-directory
+  nns:
+  - application/vnd.noblenet-sealer
+  nnw:
+  - application/vnd.noblenet-web
+  ngdat:
+  - application/vnd.nokia.n-gage.data
+  n-gage:
+  - application/vnd.nokia.n-gage.symbian.install
+  rpst:
+  - application/vnd.nokia.radio-preset
+  rpss:
+  - application/vnd.nokia.radio-presets
+  edm:
+  - application/vnd.novadigm.edm
+  edx:
+  - application/vnd.novadigm.edx
+  ext:
+  - application/vnd.novadigm.ext
+  odc:
+  - application/vnd.oasis.opendocument.chart
+  otc:
+  - application/vnd.oasis.opendocument.chart-template
+  odb:
+  - application/vnd.oasis.opendocument.database
+  odf:
+  - application/vnd.oasis.opendocument.formula
+  odft:
+  - application/vnd.oasis.opendocument.formula-template
+  odg:
+  - application/vnd.oasis.opendocument.graphics
+  otg:
+  - application/vnd.oasis.opendocument.graphics-template
+  odi:
+  - application/vnd.oasis.opendocument.image
+  oti:
+  - application/vnd.oasis.opendocument.image-template
+  odp:
+  - application/vnd.oasis.opendocument.presentation
+  otp:
+  - application/vnd.oasis.opendocument.presentation-template
+  ods:
+  - application/vnd.oasis.opendocument.spreadsheet
+  ots:
+  - application/vnd.oasis.opendocument.spreadsheet-template
+  odt:
+  - application/vnd.oasis.opendocument.text
+  odm:
+  - application/vnd.oasis.opendocument.text-master
+  ott:
+  - application/vnd.oasis.opendocument.text-template
+  oth:
+  - application/vnd.oasis.opendocument.text-web
+  xo:
+  - application/vnd.olpc-sugar
+  dd2:
+  - application/vnd.oma.dd2+xml
+  oxt:
+  - application/vnd.openofficeorg.extension
+  pptx:
+  - application/vnd.openxmlformats-officedocument.presentationml.presentation
+  sldx:
+  - application/vnd.openxmlformats-officedocument.presentationml.slide
+  ppsx:
+  - application/vnd.openxmlformats-officedocument.presentationml.slideshow
+  potx:
+  - application/vnd.openxmlformats-officedocument.presentationml.template
+  xlsx:
+  - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+  xltx:
+  - application/vnd.openxmlformats-officedocument.spreadsheetml.template
+  docx:
+  - application/vnd.openxmlformats-officedocument.wordprocessingml.document
+  dotx:
+  - application/vnd.openxmlformats-officedocument.wordprocessingml.template
+  mgp:
+  - application/vnd.osgeo.mapguide.package
+  dp:
+  - application/vnd.osgi.dp
+  esa:
+  - application/vnd.osgi.subsystem
+  pdb:
+  - application/vnd.palm
+  pqa:
+  - application/vnd.palm
+  oprc:
+  - application/vnd.palm
+  paw:
+  - application/vnd.pawaafile
+  str:
+  - application/vnd.pg.format
+  ei6:
+  - application/vnd.pg.osasli
+  efif:
+  - application/vnd.picsel
+  wg:
+  - application/vnd.pmi.widget
+  plf:
+  - application/vnd.pocketlearn
+  pbd:
+  - application/vnd.powerbuilder6
+  box:
+  - application/vnd.previewsystems.box
+  mgz:
+  - application/vnd.proteus.magazine
+  qps:
+  - application/vnd.publishare-delta-tree
+  ptid:
+  - application/vnd.pvi.ptid1
+  qxd:
+  - application/vnd.quark.quarkxpress
+  qxt:
+  - application/vnd.quark.quarkxpress
+  qwd:
+  - application/vnd.quark.quarkxpress
+  qwt:
+  - application/vnd.quark.quarkxpress
+  qxl:
+  - application/vnd.quark.quarkxpress
+  qxb:
+  - application/vnd.quark.quarkxpress
+  bed:
+  - application/vnd.realvnc.bed
+  mxl:
+  - application/vnd.recordare.musicxml
+  musicxml:
+  - application/vnd.recordare.musicxml+xml
+  cryptonote:
+  - application/vnd.rig.cryptonote
+  cod:
+  - application/vnd.rim.cod
+  rm:
+  - application/vnd.rn-realmedia
+  rmvb:
+  - application/vnd.rn-realmedia-vbr
+  link66:
+  - application/vnd.route66.link66+xml
+  st:
+  - application/vnd.sailingtracker.track
+  see:
+  - application/vnd.seemail
+  sema:
+  - application/vnd.sema
+  semd:
+  - application/vnd.semd
+  semf:
+  - application/vnd.semf
+  ifm:
+  - application/vnd.shana.informed.formdata
+  itp:
+  - application/vnd.shana.informed.formtemplate
+  iif:
+  - application/vnd.shana.informed.interchange
+  ipk:
+  - application/vnd.shana.informed.package
+  twd:
+  - application/vnd.simtech-mindmapper
+  twds:
+  - application/vnd.simtech-mindmapper
+  mmf:
+  - application/vnd.smaf
+  teacher:
+  - application/vnd.smart.teacher
+  sdkm:
+  - application/vnd.solent.sdkm+xml
+  sdkd:
+  - application/vnd.solent.sdkm+xml
+  dxp:
+  - application/vnd.spotfire.dxp
+  sfs:
+  - application/vnd.spotfire.sfs
+  sdc:
+  - application/vnd.stardivision.calc
+  sda:
+  - application/vnd.stardivision.draw
+  sdd:
+  - application/vnd.stardivision.impress
+  smf:
+  - application/vnd.stardivision.math
+  sdw:
+  - application/vnd.stardivision.writer
+  vor:
+  - application/vnd.stardivision.writer
+  sgl:
+  - application/vnd.stardivision.writer-global
+  smzip:
+  - application/vnd.stepmania.package
+  sm:
+  - application/vnd.stepmania.stepchart
+  sxc:
+  - application/vnd.sun.xml.calc
+  stc:
+  - application/vnd.sun.xml.calc.template
+  sxd:
+  - application/vnd.sun.xml.draw
+  std:
+  - application/vnd.sun.xml.draw.template
+  sxi:
+  - application/vnd.sun.xml.impress
+  sti:
+  - application/vnd.sun.xml.impress.template
+  sxm:
+  - application/vnd.sun.xml.math
+  sxw:
+  - application/vnd.sun.xml.writer
+  sxg:
+  - application/vnd.sun.xml.writer.global
+  stw:
+  - application/vnd.sun.xml.writer.template
+  sus:
+  - application/vnd.sus-calendar
+  susp:
+  - application/vnd.sus-calendar
+  svd:
+  - application/vnd.svd
+  sis:
+  - application/vnd.symbian.install
+  sisx:
+  - application/vnd.symbian.install
+  xsm:
+  - application/vnd.syncml+xml
+  bdm:
+  - application/vnd.syncml.dm+wbxml
+  xdm:
+  - application/vnd.syncml.dm+xml
+  tao:
+  - application/vnd.tao.intent-module-archive
+  pcap:
+  - application/vnd.tcpdump.pcap
+  cap:
+  - application/vnd.tcpdump.pcap
+  dmp:
+  - application/vnd.tcpdump.pcap
+  tmo:
+  - application/vnd.tmobile-livetv
+  tpt:
+  - application/vnd.trid.tpt
+  mxs:
+  - application/vnd.triscape.mxs
+  tra:
+  - application/vnd.trueapp
+  ufd:
+  - application/vnd.ufdl
+  ufdl:
+  - application/vnd.ufdl
+  utz:
+  - application/vnd.uiq.theme
+  umj:
+  - application/vnd.umajin
+  unityweb:
+  - application/vnd.unity
+  uoml:
+  - application/vnd.uoml+xml
+  vcx:
+  - application/vnd.vcx
+  vsd:
+  - application/vnd.visio
+  vst:
+  - application/vnd.visio
+  vss:
+  - application/vnd.visio
+  vsw:
+  - application/vnd.visio
+  vis:
+  - application/vnd.visionary
+  vsf:
+  - application/vnd.vsf
+  wbxml:
+  - application/vnd.wap.wbxml
+  wmlc:
+  - application/vnd.wap.wmlc
+  wmlsc:
+  - application/vnd.wap.wmlscriptc
+  wtb:
+  - application/vnd.webturbo
+  nbp:
+  - application/vnd.wolfram.player
+  wpd:
+  - application/vnd.wordperfect
+  wqd:
+  - application/vnd.wqd
+  stf:
+  - application/vnd.wt.stf
+  xar:
+  - application/vnd.xara
+  xfdl:
+  - application/vnd.xfdl
+  hvd:
+  - application/vnd.yamaha.hv-dic
+  hvs:
+  - application/vnd.yamaha.hv-script
+  hvp:
+  - application/vnd.yamaha.hv-voice
+  osf:
+  - application/vnd.yamaha.openscoreformat
+  osfpvg:
+  - application/vnd.yamaha.openscoreformat.osfpvg+xml
+  saf:
+  - application/vnd.yamaha.smaf-audio
+  spf:
+  - application/vnd.yamaha.smaf-phrase
+  cmp:
+  - application/vnd.yellowriver-custom-menu
+  zir:
+  - application/vnd.zul
+  zirz:
+  - application/vnd.zul
+  zaz:
+  - application/vnd.zzazz.deck+xml
+  vxml:
+  - application/voicexml+xml
+  wgt:
+  - application/widget
+  hlp:
+  - application/winhlp
+  wsdl:
+  - application/wsdl+xml
+  wspolicy:
+  - application/wspolicy+xml
+  7z:
+  - application/x-7z-compressed
+  abw:
+  - application/x-abiword
+  ace:
+  - application/x-ace-compressed
+  dmg:
+  - application/x-apple-diskimage
+  aab:
+  - application/x-authorware-bin
+  x32:
+  - application/x-authorware-bin
+  u32:
+  - application/x-authorware-bin
+  vox:
+  - application/x-authorware-bin
+  aam:
+  - application/x-authorware-map
+  aas:
+  - application/x-authorware-seg
+  bcpio:
+  - application/x-bcpio
+  torrent:
+  - application/x-bittorrent
+  blb:
+  - application/x-blorb
+  blorb:
+  - application/x-blorb
+  bz:
+  - application/x-bzip
+  bz2:
+  - application/x-bzip2
+  boz:
+  - application/x-bzip2
+  cbr:
+  - application/x-cbr
+  cba:
+  - application/x-cbr
+  cbt:
+  - application/x-cbr
+  cbz:
+  - application/x-cbr
+  cb7:
+  - application/x-cbr
+  vcd:
+  - application/x-cdlink
+  cfs:
+  - application/x-cfs-compressed
+  chat:
+  - application/x-chat
+  pgn:
+  - application/x-chess-pgn
+  nsc:
+  - application/x-conference
+  cpio:
+  - application/x-cpio
+  csh:
+  - application/x-csh
+  deb:
+  - application/x-debian-package
+  udeb:
+  - application/x-debian-package
+  dgc:
+  - application/x-dgc-compressed
+  dir:
+  - application/x-director
+  dcr:
+  - application/x-director
+  dxr:
+  - application/x-director
+  cst:
+  - application/x-director
+  cct:
+  - application/x-director
+  cxt:
+  - application/x-director
+  w3d:
+  - application/x-director
+  fgd:
+  - application/x-director
+  swa:
+  - application/x-director
+  wad:
+  - application/x-doom
+  ncx:
+  - application/x-dtbncx+xml
+  dtb:
+  - application/x-dtbook+xml
+  res:
+  - application/x-dtbresource+xml
+  dvi:
+  - application/x-dvi
+  evy:
+  - application/x-envoy
+  eva:
+  - application/x-eva
+  bdf:
+  - application/x-font-bdf
+  gsf:
+  - application/x-font-ghostscript
+  psf:
+  - application/x-font-linux-psf
+  pcf:
+  - application/x-font-pcf
+  snf:
+  - application/x-font-snf
+  pfa:
+  - application/x-font-type1
+  pfb:
+  - application/x-font-type1
+  pfm:
+  - application/x-font-type1
+  afm:
+  - application/x-font-type1
+  arc:
+  - application/x-freearc
+  spl:
+  - application/x-futuresplash
+  gca:
+  - application/x-gca-compressed
+  ulx:
+  - application/x-glulx
+  gnumeric:
+  - application/x-gnumeric
+  gramps:
+  - application/x-gramps-xml
+  gtar:
+  - application/x-gtar
+  hdf:
+  - application/x-hdf
+  install:
+  - application/x-install-instructions
+  iso:
+  - application/x-iso9660-image
+  jnlp:
+  - application/x-java-jnlp-file
+  latex:
+  - application/x-latex
+  lzh:
+  - application/x-lzh-compressed
+  lha:
+  - application/x-lzh-compressed
+  mie:
+  - application/x-mie
+  prc:
+  - application/x-mobipocket-ebook
+  mobi:
+  - application/x-mobipocket-ebook
+  application:
+  - application/x-ms-application
+  lnk:
+  - application/x-ms-shortcut
+  wmd:
+  - application/x-ms-wmd
+  wmz:
+  - application/x-ms-wmz
+  - application/x-msmetafile
+  xbap:
+  - application/x-ms-xbap
+  mdb:
+  - application/x-msaccess
+  obd:
+  - application/x-msbinder
+  crd:
+  - application/x-mscardfile
+  clp:
+  - application/x-msclip
+  exe:
+  - application/x-msdownload
+  dll:
+  - application/x-msdownload
+  com:
+  - application/x-msdownload
+  bat:
+  - application/x-msdownload
+  msi:
+  - application/x-msdownload
+  mvb:
+  - application/x-msmediaview
+  m13:
+  - application/x-msmediaview
+  m14:
+  - application/x-msmediaview
+  wmf:
+  - application/x-msmetafile
+  emf:
+  - application/x-msmetafile
+  emz:
+  - application/x-msmetafile
+  mny:
+  - application/x-msmoney
+  pub:
+  - application/x-mspublisher
+  scd:
+  - application/x-msschedule
+  trm:
+  - application/x-msterminal
+  wri:
+  - application/x-mswrite
+  nc:
+  - application/x-netcdf
+  cdf:
+  - application/x-netcdf
+  nzb:
+  - application/x-nzb
+  p12:
+  - application/x-pkcs12
+  pfx:
+  - application/x-pkcs12
+  p7b:
+  - application/x-pkcs7-certificates
+  spc:
+  - application/x-pkcs7-certificates
+  p7r:
+  - application/x-pkcs7-certreqresp
+  rar:
+  - application/x-rar-compressed
+  ris:
+  - application/x-research-info-systems
+  sh:
+  - application/x-sh
+  shar:
+  - application/x-shar
+  swf:
+  - application/x-shockwave-flash
+  xap:
+  - application/x-silverlight-app
+  sql:
+  - application/x-sql
+  sit:
+  - application/x-stuffit
+  sitx:
+  - application/x-stuffitx
+  srt:
+  - application/x-subrip
+  sv4cpio:
+  - application/x-sv4cpio
+  sv4crc:
+  - application/x-sv4crc
+  t3:
+  - application/x-t3vm-image
+  gam:
+  - application/x-tads
+  tar:
+  - application/x-tar
+  tcl:
+  - application/x-tcl
+  tex:
+  - application/x-tex
+  tfm:
+  - application/x-tex-tfm
+  texinfo:
+  - application/x-texinfo
+  texi:
+  - application/x-texinfo
+  obj:
+  - application/x-tgif
+  ustar:
+  - application/x-ustar
+  src:
+  - application/x-wais-source
+  der:
+  - application/x-x509-ca-cert
+  crt:
+  - application/x-x509-ca-cert
+  fig:
+  - application/x-xfig
+  xlf:
+  - application/x-xliff+xml
+  xpi:
+  - application/x-xpinstall
+  xz:
+  - application/x-xz
+  z1:
+  - application/x-zmachine
+  z2:
+  - application/x-zmachine
+  z3:
+  - application/x-zmachine
+  z4:
+  - application/x-zmachine
+  z5:
+  - application/x-zmachine
+  z6:
+  - application/x-zmachine
+  z7:
+  - application/x-zmachine
+  z8:
+  - application/x-zmachine
+  xaml:
+  - application/xaml+xml
+  xdf:
+  - application/xcap-diff+xml
+  xenc:
+  - application/xenc+xml
+  xhtml:
+  - application/xhtml+xml
+  xht:
+  - application/xhtml+xml
+  xml:
+  - application/xml
+  xsl:
+  - application/xml
+  dtd:
+  - application/xml-dtd
+  xop:
+  - application/xop+xml
+  xpl:
+  - application/xproc+xml
+  xslt:
+  - application/xslt+xml
+  xspf:
+  - application/xspf+xml
+  mxml:
+  - application/xv+xml
+  xhvml:
+  - application/xv+xml
+  xvml:
+  - application/xv+xml
+  xvm:
+  - application/xv+xml
+  yang:
+  - application/yang
+  yin:
+  - application/yin+xml
+  adp:
+  - audio/adpcm
+  au:
+  - audio/basic
+  snd:
+  - audio/basic
+  mid:
+  - audio/midi
+  midi:
+  - audio/midi
+  kar:
+  - audio/midi
+  rmi:
+  - audio/midi
+  m4a:
+  - audio/mp4
+  mp4a:
+  - audio/mp4
+  oga:
+  - audio/ogg
+  ogg:
+  - audio/ogg
+  spx:
+  - audio/ogg
+  s3m:
+  - audio/s3m
+  sil:
+  - audio/silk
+  uva:
+  - audio/vnd.dece.audio
+  uvva:
+  - audio/vnd.dece.audio
+  eol:
+  - audio/vnd.digital-winds
+  dra:
+  - audio/vnd.dra
+  dts:
+  - audio/vnd.dts
+  dtshd:
+  - audio/vnd.dts.hd
+  lvp:
+  - audio/vnd.lucent.voice
+  pya:
+  - audio/vnd.ms-playready.media.pya
+  ecelp4800:
+  - audio/vnd.nuera.ecelp4800
+  ecelp7470:
+  - audio/vnd.nuera.ecelp7470
+  ecelp9600:
+  - audio/vnd.nuera.ecelp9600
+  rip:
+  - audio/vnd.rip
+  weba:
+  - audio/webm
+  aac:
+  - audio/x-aac
+  aif:
+  - audio/x-aiff
+  aiff:
+  - audio/x-aiff
+  aifc:
+  - audio/x-aiff
+  caf:
+  - audio/x-caf
+  flac:
+  - audio/x-flac
+  mka:
+  - audio/x-matroska
+  m3u:
+  - audio/x-mpegurl
+  wax:
+  - audio/x-ms-wax
+  wma:
+  - audio/x-ms-wma
+  ram:
+  - audio/x-pn-realaudio
+  ra:
+  - audio/x-pn-realaudio
+  rmp:
+  - audio/x-pn-realaudio-plugin
+  wav:
+  - audio/x-wav
+  xm:
+  - audio/xm
+  cdx:
+  - chemical/x-cdx
+  cif:
+  - chemical/x-cif
+  cmdf:
+  - chemical/x-cmdf
+  cml:
+  - chemical/x-cml
+  csml:
+  - chemical/x-csml
+  xyz:
+  - chemical/x-xyz
+  woff:
+  - font/woff
+  woff2:
+  - font/woff2
+  cgm:
+  - image/cgm
+  g3:
+  - image/g3fax
+  gif:
+  - image/gif
+  ief:
+  - image/ief
+  ktx:
+  - image/ktx
+  png:
+  - image/png
+  btif:
+  - image/prs.btif
+  sgi:
+  - image/sgi
+  svg:
+  - image/svg+xml
+  svgz:
+  - image/svg+xml
+  tiff:
+  - image/tiff
+  tif:
+  - image/tiff
+  psd:
+  - image/vnd.adobe.photoshop
+  uvi:
+  - image/vnd.dece.graphic
+  uvvi:
+  - image/vnd.dece.graphic
+  uvg:
+  - image/vnd.dece.graphic
+  uvvg:
+  - image/vnd.dece.graphic
+  djvu:
+  - image/vnd.djvu
+  djv:
+  - image/vnd.djvu
+  sub:
+  - image/vnd.dvb.subtitle
+  - text/vnd.dvb.subtitle
+  dwg:
+  - image/vnd.dwg
+  dxf:
+  - image/vnd.dxf
+  fbs:
+  - image/vnd.fastbidsheet
+  fpx:
+  - image/vnd.fpx
+  fst:
+  - image/vnd.fst
+  mmr:
+  - image/vnd.fujixerox.edmics-mmr
+  rlc:
+  - image/vnd.fujixerox.edmics-rlc
+  mdi:
+  - image/vnd.ms-modi
+  wdp:
+  - image/vnd.ms-photo
+  npx:
+  - image/vnd.net-fpx
+  wbmp:
+  - image/vnd.wap.wbmp
+  xif:
+  - image/vnd.xiff
+  webp:
+  - image/webp
+  3ds:
+  - image/x-3ds
+  ras:
+  - image/x-cmu-raster
+  cmx:
+  - image/x-cmx
+  fh:
+  - image/x-freehand
+  fhc:
+  - image/x-freehand
+  fh4:
+  - image/x-freehand
+  fh5:
+  - image/x-freehand
+  fh7:
+  - image/x-freehand
+  ico:
+  - image/x-icon
+  sid:
+  - image/x-mrsid-image
+  pcx:
+  - image/x-pcx
+  pic:
+  - image/x-pict
+  pct:
+  - image/x-pict
+  pnm:
+  - image/x-portable-anymap
+  pbm:
+  - image/x-portable-bitmap
+  pgm:
+  - image/x-portable-graymap
+  ppm:
+  - image/x-portable-pixmap
+  rgb:
+  - image/x-rgb
+  tga:
+  - image/x-tga
+  xbm:
+  - image/x-xbitmap
+  xpm:
+  - image/x-xpixmap
+  xwd:
+  - image/x-xwindowdump
+  eml:
+  - message/rfc822
+  mime:
+  - message/rfc822
+  igs:
+  - model/iges
+  iges:
+  - model/iges
+  msh:
+  - model/mesh
+  mesh:
+  - model/mesh
+  silo:
+  - model/mesh
+  dae:
+  - model/vnd.collada+xml
+  dwf:
+  - model/vnd.dwf
+  gdl:
+  - model/vnd.gdl
+  gtw:
+  - model/vnd.gtw
+  mts:
+  - model/vnd.mts
+  vtu:
+  - model/vnd.vtu
+  wrl:
+  - model/vrml
+  vrml:
+  - model/vrml
+  x3db:
+  - model/x3d+binary
+  x3dbz:
+  - model/x3d+binary
+  x3dv:
+  - model/x3d+vrml
+  x3dvz:
+  - model/x3d+vrml
+  x3d:
+  - model/x3d+xml
+  x3dz:
+  - model/x3d+xml
+  appcache:
+  - text/cache-manifest
+  ics:
+  - text/calendar
+  ifb:
+  - text/calendar
+  css:
+  - text/css
+  csv:
+  - text/csv
+  html:
+  - text/html
+  htm:
+  - text/html
+  n3:
+  - text/n3
+  txt:
+  - text/plain
+  text:
+  - text/plain
+  conf:
+  - text/plain
+  def:
+  - text/plain
+  list:
+  - text/plain
+  log:
+  - text/plain
+  in:
+  - text/plain
+  dsc:
+  - text/prs.lines.tag
+  rtx:
+  - text/richtext
+  sgml:
+  - text/sgml
+  sgm:
+  - text/sgml
+  tsv:
+  - text/tab-separated-values
+  t:
+  - text/troff
+  tr:
+  - text/troff
+  roff:
+  - text/troff
+  man:
+  - text/troff
+  me:
+  - text/troff
+  ms:
+  - text/troff
+  ttl:
+  - text/turtle
+  uri:
+  - text/uri-list
+  uris:
+  - text/uri-list
+  urls:
+  - text/uri-list
+  vcard:
+  - text/vcard
+  curl:
+  - text/vnd.curl
+  dcurl:
+  - text/vnd.curl.dcurl
+  mcurl:
+  - text/vnd.curl.mcurl
+  scurl:
+  - text/vnd.curl.scurl
+  fly:
+  - text/vnd.fly
+  flx:
+  - text/vnd.fmi.flexstor
+  gv:
+  - text/vnd.graphviz
+  3dml:
+  - text/vnd.in3d.3dml
+  spot:
+  - text/vnd.in3d.spot
+  jad:
+  - text/vnd.sun.j2me.app-descriptor
+  wml:
+  - text/vnd.wap.wml
+  wmls:
+  - text/vnd.wap.wmlscript
+  s:
+  - text/x-asm
+  asm:
+  - text/x-asm
+  c:
+  - text/x-c
+  cc:
+  - text/x-c
+  cxx:
+  - text/x-c
+  cpp:
+  - text/x-c
+  h:
+  - text/x-c
+  hh:
+  - text/x-c
+  dic:
+  - text/x-c
+  f:
+  - text/x-fortran
+  for:
+  - text/x-fortran
+  f77:
+  - text/x-fortran
+  f90:
+  - text/x-fortran
+  java:
+  - text/x-java-source
+  nfo:
+  - text/x-nfo
+  opml:
+  - text/x-opml
+  p:
+  - text/x-pascal
+  pas:
+  - text/x-pascal
+  etx:
+  - text/x-setext
+  sfv:
+  - text/x-sfv
+  uu:
+  - text/x-uuencode
+  vcs:
+  - text/x-vcalendar
+  vcf:
+  - text/x-vcard
+  3gp:
+  - video/3gpp
+  3g2:
+  - video/3gpp2
+  h261:
+  - video/h261
+  h263:
+  - video/h263
+  h264:
+  - video/h264
+  jpgv:
+  - video/jpeg
+  jpm:
+  - video/jpm
+  jpgm:
+  - video/jpm
+  mj2:
+  - video/mj2
+  mjp2:
+  - video/mj2
+  mp4:
+  - video/mp4
+  mp4v:
+  - video/mp4
+  mpg4:
+  - video/mp4
+  mpeg:
+  - video/mpeg
+  mpg:
+  - video/mpeg
+  mpe:
+  - video/mpeg
+  m1v:
+  - video/mpeg
+  m2v:
+  - video/mpeg
+  ogv:
+  - video/ogg
+  qt:
+  - video/quicktime
+  mov:
+  - video/quicktime
+  uvh:
+  - video/vnd.dece.hd
+  uvvh:
+  - video/vnd.dece.hd
+  uvm:
+  - video/vnd.dece.mobile
+  uvvm:
+  - video/vnd.dece.mobile
+  uvp:
+  - video/vnd.dece.pd
+  uvvp:
+  - video/vnd.dece.pd
+  uvs:
+  - video/vnd.dece.sd
+  uvvs:
+  - video/vnd.dece.sd
+  uvv:
+  - video/vnd.dece.video
+  uvvv:
+  - video/vnd.dece.video
+  dvb:
+  - video/vnd.dvb.file
+  fvt:
+  - video/vnd.fvt
+  mxu:
+  - video/vnd.mpegurl
+  m4u:
+  - video/vnd.mpegurl
+  pyv:
+  - video/vnd.ms-playready.media.pyv
+  uvu:
+  - video/vnd.uvvu.mp4
+  uvvu:
+  - video/vnd.uvvu.mp4
+  viv:
+  - video/vnd.vivo
+  webm:
+  - video/webm
+  f4v:
+  - video/x-f4v
+  fli:
+  - video/x-fli
+  flv:
+  - video/x-flv
+  m4v:
+  - video/x-m4v
+  mkv:
+  - video/x-matroska
+  mk3d:
+  - video/x-matroska
+  mks:
+  - video/x-matroska
+  mng:
+  - video/x-mng
+  asf:
+  - video/x-ms-asf
+  asx:
+  - video/x-ms-asf
+  vob:
+  - video/x-ms-vob
+  wm:
+  - video/x-ms-wm
+  wmv:
+  - video/x-ms-wmv
+  wmx:
+  - video/x-ms-wmx
+  wvx:
+  - video/x-ms-wvx
+  avi:
+  - video/x-msvideo
+  movie:
+  - video/x-sgi-movie
+  smv:
+  - video/x-smv
+  ice:
+  - x-conference/x-cooltalk
diff --git a/system/config/permissions.yaml b/system/config/permissions.yaml
new file mode 100644
index 0000000000..a65b2231ff
--- /dev/null
+++ b/system/config/permissions.yaml
@@ -0,0 +1,53 @@
+actions:
+  site:
+    type: access
+    label: Site
+  admin:
+    type: access
+    label: Admin
+  admin.pages:
+    type: access
+    label: Pages
+  admin.users:
+    type: access
+    label: User Accounts
+
+types:
+  default:
+    type: access
+
+  crud:
+    type: compact
+    letters:
+      c:
+        action: create
+        label: PLUGIN_ADMIN.CREATE
+      r:
+        action: read
+        label: PLUGIN_ADMIN.READ
+      u:
+        action: update
+        label: PLUGIN_ADMIN.UPDATE
+      d:
+        action: delete
+        label: PLUGIN_ADMIN.DELETE
+
+  crudp:
+    type: crud
+    letters:
+      p:
+        action: publish
+        label: PLUGIN_ADMIN.PUBLISH
+
+  crudl:
+    type: crud
+    letters:
+      l:
+        action: list
+        label: PLUGIN_ADMIN.LIST
+
+  crudpl:
+    type: crud
+    use:
+      - crudp
+      - crudl
diff --git a/system/config/security.yaml b/system/config/security.yaml
index 964e6821e8..2cc815fb5b 100644
--- a/system/config/security.yaml
+++ b/system/config/security.yaml
@@ -36,3 +36,4 @@ uploads_dangerous_extensions:
     - htm
     - js
     - exe
+sanitize_svg: true
diff --git a/system/config/streams.yaml b/system/config/streams.yaml
deleted file mode 100644
index 1af0024663..0000000000
--- a/system/config/streams.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-schemes:
-  image:
-    type: Stream
-    paths:
-      - user://images
-      - system://images
-
-  page:
-    type: ReadOnlyStream
-    paths:
-      - user://pages
-
-  account:
-    type: ReadOnlyStream
-    paths:
-      - user://accounts
diff --git a/system/config/system.yaml b/system/config/system.yaml
index 405a961205..2ffd02a8c9 100644
--- a/system/config/system.yaml
+++ b/system/config/system.yaml
@@ -10,23 +10,32 @@ custom_base_url: ''                              # Set the base_url manually, e.
 username_regex: '^[a-z0-9_-]{3,16}$'             # Only lowercase chars, digits, dashes, underscores. 3 - 16 chars
 pwd_regex: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}' # At least one number, one uppercase and lowercase letter, and be at least 8+ chars
 intl_enabled: true                               # Special logic for PHP International Extension (mod_intl)
+http_x_forwarded:                                # Configuration options for the various HTTP_X_FORWARD headers
+  protocol: true
+  host: false
+  port: true
+  ip: true
 
 languages:
   supported: []                                  # List of languages supported. eg: [en, fr, de]
   default_lang:                                  # Default is the first supported language. Must be one of the supported languages
   include_default_lang: true                     # Include the default lang prefix in all URLs
-  pages_fallback_only: false                     # Only fallback to find page content through supported languages
-  translations: true                             # Enable translations by default
+  include_default_lang_file_extension: true      # If true, include language code for the default language in file extension: default.en.md
+  translations: true                             # If false, translation keys are used instead of translated strings
   translations_fallback: true                    # Fallback through supported translations if active lang doesn't exist
   session_store_active: false                    # Store active language in session
   http_accept_language: false                    # Attempt to set the language based on http_accept_language header in the browser
   override_locale: false                         # Override the default or system locale with language specific one
+  content_fallback: {}                           # Custom language fallbacks. eg: {fr: ['fr', 'en']}
+  pages_fallback_only: false                     # DEPRECATED: Use `content_fallback` instead
 
 home:
   alias: '/home'                                 # Default path for home, ie /
   hide_in_urls: false                            # Hide the home route in URLs
 
 pages:
+  type: regular                                  # EXPERIMENTAL: Page type: regular or flex
+  dirs: ['page://']                              # Advanced functionality, allows for multiple page paths
   theme: quark                                   # Default theme (defaults to "quark" theme)
   order:
     by: default                                  # Order pages by "default", "alpha" or "date"
@@ -54,16 +63,22 @@ pages:
     special_chars:                               # List of special characters to automatically convert to entities
       '>': 'gt'
       '<': 'lt'
+    valid_link_attributes:                       # Valid attributes to pass through via markdown links
+      - rel
+      - target
+      - id
+      - class
+      - classes
   types: [html,htm,xml,txt,json,rss,atom]        # list of valid page types
   append_url_extension: ''                       # Append page's extension in Page urls (e.g. '.html' results in /path/page.html)
   expires: 604800                                # Page expires time in seconds (604800 seconds = 7 days)
   cache_control:                                 # Can be blank for no setting, or a valid `cache-control` text value
   last_modified: false                           # Set the last modified date header based on file modification timestamp
-  etag: false                                    # Set the etag header tag
+  etag: true                                     # Set the etag header tag
   vary_accept_encoding: false                    # Add `Vary: Accept-Encoding` header
-  redirect_default_route: false                  # Automatically redirect to a page's default route
-  redirect_default_code: 302                     # Default code to use for redirects
-  redirect_trailing_slash: true                  # Handle automatically or 302 redirect a trailing / URL
+  redirect_default_code: 302                     # Default code to use for redirects: 301|302|303
+  redirect_trailing_slash: 1                     # Always redirect trailing slash with redirect code 0|1|301|302 (0: no redirect, 1: use default code)
+  redirect_default_route: 0                      # Always redirect to page's default route using code 0|1|301|302, also removes .htm and .html extensions
   ignore_files: [.DS_Store]                      # Files to ignore in Pages
   ignore_folders: [.git, .idea]                  # Folders to ignore in Pages
   ignore_hidden: true                            # Ignore all Hidden files and folders
@@ -82,21 +97,25 @@ cache:
   purge_at: '0 4 * * *'                          # How often to purge old file cache (using new scheduler)
   clear_at: '0 3 * * *'                           # How often to clear cache (using new scheduler)
   clear_job_type: 'standard'                     # Type to clear when processing the scheduled clear job `standard`|`all`
-  clear_images_by_default: true                  # By default grav will include processed images in cache clear, this can be disabled
+  clear_images_by_default: false                 # By default grav does not include processed images in cache clear, this can be enabled
   cli_compatibility: false                       # Ensures only non-volatile drivers are used (file, redis, memcache, etc.)
   lifetime: 604800                               # Lifetime of cached data in seconds (0 = infinite)
   gzip: false                                    # GZip compress the page output
   allow_webserver_gzip: false                    # If true, `content-encoding: identity` but connection isn't closed before `onShutDown()` event
   redis:
     socket: false                                # Path to redis unix socket (e.g. /var/run/redis/redis.sock), false = use server and port to connect
+    password:                                    # Optional password
+    database:                                    # Optional database ID
 
 twig:
   cache: true                                    # Set to true to enable Twig caching
   debug: true                                    # Enable Twig debug
   auto_reload: true                              # Refresh cache on changes
-  autoescape: false                              # Autoescape Twig vars (DEPRECATED, always enabled in strict mode)
+  autoescape: true                               # Autoescape Twig vars (DEPRECATED, always enabled in strict mode)
   undefined_functions: true                      # Allow undefined functions
   undefined_filters: true                        # Allow undefined filters
+  safe_functions: []                             # List of PHP functions which are allowed to be used as Twig functions
+  safe_filters: []                               # List of PHP functions which are allowed to be used as Twig filters
   umask_fix: false                               # By default Twig creates cached files as 755, fix switches this to 775
 
 assets:                                          # Configuration for Assets Manager (JS, CSS)
@@ -109,10 +128,14 @@ assets:                                          # Configuration for Assets Mana
   js_pipeline: false                             # The JS pipeline is the unification of multiple JS resources into one file
   js_pipeline_include_externals: true            # Include external URLs in the pipeline by default
   js_pipeline_before_excludes: true              # Render the pipeline before any excluded files
+  js_module_pipeline: false                      # The JS Module pipeline is the unification of multiple JS Module resources into one file
+  js_module_pipeline_include_externals: true     # Include external URLs in the pipeline by default
+  js_module_pipeline_before_excludes: true       # Render the pipeline before any excluded files
   js_minify: true                                # Minify the JS during pipelining
   enable_asset_timestamp: false                  # Enable asset timestamps
+  enable_asset_sri: false                        # Enable asset SRI
   collections:
-    jquery: system://assets/jquery/jquery-2.x.min.js
+    jquery: system://assets/jquery/jquery-3.x.min.js
 
 errors:
   display: 0                                     # Display either (1) Full backtrace | (0) Simple Error | (-1) System Error
@@ -122,9 +145,12 @@ log:
   handler: file                                 # Log handler. Currently supported: file | syslog
   syslog:
     facility: local6                            # Syslog facilities output
+    tag: grav                                   # Syslog tag. Default: "grav".
 
 debugger:
   enabled: false                                 # Enable Grav debugger and following settings
+  provider: clockwork                            # Debugger provider: debugbar | clockwork
+  censored: false                                # Censor potentially sensitive information (POST parameters, cookies, files, configuration and most array/object data in log messages)
   shutdown:
     close_connection: true                       # Close the connection before calling onShutdown(). false for debugging
 
@@ -133,8 +159,20 @@ images:
   cache_all: false                               # Cache all image by default
   cache_perms: '0755'                            # MUST BE IN QUOTES!! Default cache folder perms. Usually '0755' or '0775'
   debug: false                                   # Show an overlay over images indicating the pixel depth of the image when working with retina for example
-  auto_fix_orientation: false                    # Automatically fix the image orientation based on the Exif data
+  auto_fix_orientation: true                     # Automatically fix the image orientation based on the Exif data
   seofriendly: false                             # SEO-friendly processed image names
+  cls:                                           # Cumulative Layout Shift: See https://web.dev/optimize-cls/
+    auto_sizes: false                            # Automatically add height/width to image
+    aspect_ratio: false                          # Reserve space with aspect ratio style
+    retina_scale: 1                              # scale to adjust auto-sizes for better handling of HiDPI resolutions
+  defaults:
+    loading: auto                                # Let browser pick [auto|lazy|eager]
+  watermark:
+    image: 'system://images/watermark.png'       # Path to a watermark image
+    position_y: 'center'                         # top|center|bottom
+    position_x: 'center'                         # left|center|right
+    scale: 33                                    # percentage of watermark scale
+    watermark_all: false                         # automatically watermark all images
 
 media:
   enable_media_timestamp: false                  # Enable media timestamps
@@ -149,21 +187,44 @@ session:
   name: grav-site                                # Name prefix of the session cookie. Use alphanumeric, dashes or underscores only. Do not use dots in the session name
   uniqueness: path                               # Should sessions be `path` based or `security.salt` based
   secure: false                                  # Set session secure. If true, indicates that communication for this cookie must be over an encrypted transmission. Enable this only on sites that run exclusively on HTTPS
+  secure_https: true                             # Set session secure on HTTPS but not on HTTP. Has no effect if you have `session.secure: true`. Set to false if your site jumps between HTTP and HTTPS.
   httponly: true                                 # Set session HTTP only. If true, indicates that cookies should be used only over HTTP, and JavaScript modification is not allowed.
+  samesite: Lax                                  # Set session SameSite. Possible values are Lax, Strict and None. See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
   split: true                                    # Sessions should be independent between site and plugins (such as admin)
-  path:
+  domain:                                        # Domain used by sessions.
+  path:                                          # Path used by sessions.
 
 gpm:
   releases: stable                               # Set to either 'stable' or 'testing'
-  proxy_url:                                     # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
-  method: 'auto'                                 # Either 'curl', 'fopen' or 'auto'. 'auto' will try fopen first and if not available cURL
-  verify_peer: true                              # Sometimes on some systems (Windows most commonly) GPM is unable to connect because the SSL certificate cannot be verified. Disabling this setting might help.
   official_gpm_only: true                        # By default GPM direct-install will only allow URLs via the official GPM proxy to ensure security
 
+http:
+  method: auto                                   # Either 'curl', 'fopen' or 'auto'. 'auto' will try fopen first and if not available cURL
+  enable_proxy: true                             # Enable proxy server configuration
+  proxy_url:                                     # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
+  proxy_cert_path:                               # Local path to proxy certificate folder containing pem files
+  concurrent_connections: 5                      # Concurrent HTTP connections when multiplexing
+  verify_peer: true                              # Enable/Disable SSL verification of peer certificates
+  verify_host: true                              # Enable/Disable SSL verification of host certificates
+
 accounts:
-  type: data                                     # Account type: data or flex
-  storage: file                                  # Flex storage type: file or folder
+  type: regular                                  # EXPERIMENTAL: Account type: regular or flex
+  storage: file                                  # EXPERIMENTAL: Flex storage type: file or folder
+  avatar: gravatar                               # Avatar generator [multiavatar|gravatar]
+
+flex:
+  cache:
+    index:
+      enabled: true                             # Set to true to enable Flex index caching. Is used to cache timestamps in files
+      lifetime: 60                              # Lifetime of cached index in seconds (0 = infinite)
+    object:
+      enabled: true                             # Set to true to enable Flex object caching. Is used to cache object data
+      lifetime: 600                             # Lifetime of cached objects in seconds (0 = infinite)
+    render:
+      enabled: true                             # Set to true to enable Flex render caching. Is used to cache rendered output
+      lifetime: 600                             # Lifetime of cached HTML in seconds (0 = infinite)
 
 strict_mode:
-  yaml_compat: true                              # Grav 1.5+: Enables YAML backwards compatibility
-  twig_compat: true                              # Grav 1.5+: Enables deprecated Twig autoescape setting (autoescape: false)
+  yaml_compat: false                            # Set to true to enable YAML backwards compatibility
+  twig_compat: false                            # Set to true to enable deprecated Twig settings (autoescape: false)
+  blueprint_compat: false                       # Set to true to enable backward compatible strict support for blueprints
diff --git a/system/defines.php b/system/defines.php
index bee2c1cafa..aa56627ea5 100644
--- a/system/defines.php
+++ b/system/defines.php
@@ -1,42 +1,90 @@
 <?php
+
 /**
  * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.6.15');
+define('GRAV_VERSION', '1.7.37.1');
+define('GRAV_SCHEMA', '1.7.0_2020-11-20_1');
 define('GRAV_TESTING', false);
-define('DS', '/');
 
+// PHP minimum requirement
 if (!defined('GRAV_PHP_MIN')) {
-    define('GRAV_PHP_MIN', '7.1.3');
+    define('GRAV_PHP_MIN', '7.3.6');
+}
+
+// Directory separator
+if (!defined('DS')) {
+    define('DS', '/');
 }
 
-// Directories and Paths
+// Absolute path to Grav root. This is where Grav is installed into.
 if (!defined('GRAV_ROOT')) {
-    define('GRAV_ROOT', str_replace(DIRECTORY_SEPARATOR, DS, getcwd()));
+    $path = rtrim(str_replace(DIRECTORY_SEPARATOR, DS, getenv('GRAV_ROOT') ?: getcwd()), DS);
+    define('GRAV_ROOT', $path);
+}
+// Absolute path to Grav webroot. This is the path where your site is located in.
+if (!defined('GRAV_WEBROOT')) {
+    $path = rtrim(getenv('GRAV_WEBROOT') ?: GRAV_ROOT, DS);
+    define('GRAV_WEBROOT', $path);
+}
+// Relative path to user folder. This path needs to be located under GRAV_WEBROOT.
+if (!defined('GRAV_USER_PATH')) {
+    $path = rtrim(getenv('GRAV_USER_PATH') ?: 'user', DS);
+    define('GRAV_USER_PATH', $path);
+}
+// Absolute or relative path to system folder. Defaults to GRAV_ROOT/system
+// If system folder is outside of webroot, see https://github.com/getgrav/grav/issues/3297#issuecomment-810294972
+if (!defined('GRAV_SYSTEM_PATH')) {
+    $path = rtrim(getenv('GRAV_SYSTEM_PATH') ?: 'system', DS);
+    define('GRAV_SYSTEM_PATH', $path);
 }
-define('ROOT_DIR', GRAV_ROOT . '/');
-define('USER_PATH', 'user/');
-define('USER_DIR', ROOT_DIR . USER_PATH);
-define('CACHE_DIR', ROOT_DIR . 'cache/');
+// Absolute or relative path to cache folder. Defaults to GRAV_ROOT/cache
+if (!defined('GRAV_CACHE_PATH')) {
+    $path = rtrim(getenv('GRAV_CACHE_PATH') ?: 'cache', DS);
+    define('GRAV_CACHE_PATH', $path);
+}
+// Absolute or relative path to logs folder. Defaults to GRAV_ROOT/logs
+if (!defined('GRAV_LOG_PATH')) {
+    $path = rtrim(getenv('GRAV_LOG_PATH') ?: 'logs', DS);
+    define('GRAV_LOG_PATH', $path);
+}
+// Absolute or relative path to tmp folder. Defaults to GRAV_ROOT/tmp
+if (!defined('GRAV_TMP_PATH')) {
+    $path = rtrim(getenv('GRAV_TMP_PATH') ?: 'tmp', DS);
+    define('GRAV_TMP_PATH', $path);
+}
+// Absolute or relative path to backup folder. Defaults to GRAV_ROOT/backup
+if (!defined('GRAV_BACKUP_PATH')) {
+    $path = rtrim(getenv('GRAV_BACKUP_PATH') ?: 'backup', DS);
+    define('GRAV_BACKUP_PATH', $path);
+}
+unset($path);
+
+// INTERNAL: Do not use!
+define('USER_DIR', GRAV_WEBROOT . '/' . GRAV_USER_PATH . '/');
+define('CACHE_DIR', (!preg_match('`^(/|[a-z]:[\\\/])`ui', GRAV_CACHE_PATH) ? GRAV_ROOT . '/' : '') . GRAV_CACHE_PATH . '/');
 
 // DEPRECATED: Do not use!
-define('ASSETS_DIR', ROOT_DIR . 'assets/');
-define('IMAGES_DIR', ROOT_DIR . 'images/');
-define('ACCOUNTS_DIR', USER_DIR .'accounts/');
-define('PAGES_DIR', USER_DIR .'pages/');
-define('DATA_DIR', USER_DIR .'data/');
-define('SYSTEM_DIR', ROOT_DIR .'system/');
-define('LIB_DIR', SYSTEM_DIR .'src/');
-define('PLUGINS_DIR', USER_DIR .'plugins/');
-define('THEMES_DIR', USER_DIR .'themes/');
-define('VENDOR_DIR', ROOT_DIR .'vendor/');
-define('LOG_DIR', ROOT_DIR .'logs/');
+define('CACHE_PATH', GRAV_CACHE_PATH . DS);
+define('USER_PATH', GRAV_USER_PATH . DS);
+define('ROOT_DIR', GRAV_ROOT . DS);
+define('ASSETS_DIR', GRAV_WEBROOT . '/assets/');
+define('IMAGES_DIR', GRAV_WEBROOT . '/images/');
+define('ACCOUNTS_DIR', USER_DIR . 'accounts/');
+define('PAGES_DIR', USER_DIR . 'pages/');
+define('DATA_DIR', USER_DIR . 'data/');
+define('PLUGINS_DIR', USER_DIR . 'plugins/');
+define('THEMES_DIR', USER_DIR . 'themes/');
+define('SYSTEM_DIR', (!preg_match('`^(/|[a-z]:[\\\/])`ui', GRAV_SYSTEM_PATH) ? GRAV_ROOT . '/' : '') . GRAV_SYSTEM_PATH . '/');
+define('LIB_DIR', SYSTEM_DIR . 'src/');
+define('VENDOR_DIR', GRAV_ROOT . '/vendor/');
+define('LOG_DIR', (!preg_match('`^(/|[a-z]:[\\\/])`ui', GRAV_LOG_PATH) ? GRAV_ROOT . '/' : '') . GRAV_LOG_PATH . '/');
 // END DEPRECATED
 
 // Some extensions
diff --git a/system/images/watermark.png b/system/images/watermark.png
new file mode 100644
index 0000000000..0f38a75c40
Binary files /dev/null and b/system/images/watermark.png differ
diff --git a/system/install.php b/system/install.php
index 15c3f8b870..5c9440f975 100644
--- a/system/install.php
+++ b/system/install.php
@@ -2,7 +2,7 @@
 /**
  * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -10,8 +10,6 @@
     die();
 }
 
-use Grav\Installer\Install;
-
 require_once __DIR__ . '/src/Grav/Installer/Install.php';
 
-return Install::instance();
\ No newline at end of file
+return Grav\Installer\Install::instance();
diff --git a/system/languages/ar.yaml b/system/languages/ar.yaml
index 04e63f9761..53b0a07430 100644
--- a/system/languages/ar.yaml
+++ b/system/languages/ar.yaml
@@ -1,6 +1,17 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nالعنوان: %1$s\n---\n# خطأ: مادة أمامية غير صحيحة\n\nمسار: '%2$s'\n\n**%3$s**\n\n, , ,\n\n%4$s\n, , ,"
+  INFLECTOR_UNCOUNTABLE:
+    - 'معدّات'
+    - 'معلومات'
+    - 'أرز'
+    - 'مال'
+    - 'نوع'
+    - 'سلسلة'
+    - 'سمك'
+    - 'خروف'
+  INFLECTOR_IRREGULAR:
+    'person': 'أشخاص'
   NICETIME:
     NO_DATE_PROVIDED: لم يتم تقديم التاريخ
     BAD_DATE: تاريخ خاطئ
@@ -37,9 +48,10 @@ GRAV:
     YR_PLURAL: سنوات
     DEC_PLURAL: عقود
   FORM:
-    VALIDATION_FAIL: <b>فشل التحقق من صحة:</b>
-    INVALID_INPUT: إدخال غير صحيح في
+    VALIDATION_FAIL: '<b>فشل التحقق من صحة:</b>'
+    INVALID_INPUT: 'إدخال غير صحيح في'
     MISSING_REQUIRED_FIELD: 'حقل مطلوب مفقود:'
+    XSS_ISSUES: "مشاكل XSS محتملة تم اكتشافها في حقل '%s' '"
   MONTHS_OF_THE_YEAR:
     - 'كانون الثاني'
     - 'شباط'
@@ -61,3 +73,21 @@ GRAV:
     - 'الجمعة'
     - 'السبت'
     - 'الأحد'
+  YES: "نعم"
+  NO: "لا"
+  CRON:
+    EVERY: كل
+    EVERY_HOUR: كل ساعة
+    EVERY_MINUTE: كل دقيقة
+    EVERY_DAY_OF_WEEK: كل يوم في الأسبوع
+    EVERY_DAY_OF_MONTH: كل يوم في الشهر
+    EVERY_MONTH: ' كل شهر'
+    TEXT_PERIOD: كل <b />
+    TEXT_MINS: ' في <b /> دقيقة(دقائق) بعد الساعة'
+    TEXT_TIME: ' في <b />:<b />'
+    TEXT_DOW: ' في <b />'
+    TEXT_MONTH: ' من <b />'
+    TEXT_DOM: ' في <b />'
+    ERROR1: الوسم %s غير مدعوم!
+    ERROR2: عدد عناصر غير صالح.
+    ERROR4: تعبير غير معروف
diff --git a/system/languages/bg.yaml b/system/languages/bg.yaml
index 48daceb162..174b3a45d1 100644
--- a/system/languages/bg.yaml
+++ b/system/languages/bg.yaml
@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: г
     DEC_PLURAL: дстлт
   FORM:
-    VALIDATION_FAIL: <b>Неуспешна проверка:</b>
-    INVALID_INPUT: Невалидно въвеждане в
+    VALIDATION_FAIL: '<b>Неуспешна проверка:</b>'
+    INVALID_INPUT: 'Невалидно въвеждане в'
     MISSING_REQUIRED_FIELD: 'Липсва задължително поле:'
   MONTHS_OF_THE_YEAR:
     - 'януари'
diff --git a/system/languages/ca.yaml b/system/languages/ca.yaml
index bd04474c00..f5a194017b 100644
--- a/system/languages/ca.yaml
+++ b/system/languages/ca.yaml
@@ -1,11 +1,21 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# S'ha produït un error: Frontmatter invàlid\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - 'informació'
+    - 'rice'
+    - 'money'
+    - 'species'
+    - 'series'
+    - 'fish'
+    - 'sheep'
   NICETIME:
     NO_DATE_PROVIDED: No s'ha proporcionat data
     BAD_DATE: Data invàlida
     AGO: abans
     FROM_NOW: des d'ara
+    JUST_NOW: Ara mateix
     SECOND: segon
     MINUTE: minut
     HOUR: hora
@@ -36,9 +46,10 @@ GRAV:
     YR_PLURAL: anys
     DEC_PLURAL: dèc.
   FORM:
-    VALIDATION_FAIL: <b>Ha fallat la validació:</b>
-    INVALID_INPUT: Entrada no vàlida a
+    VALIDATION_FAIL: '<b>Ha fallat la validació:</b>'
+    INVALID_INPUT: 'Entrada no vàlida a'
     MISSING_REQUIRED_FIELD: 'Falta camp obligatori:'
+    XSS_ISSUES: "Detectats potencials problemes XSS al camp '%s'"
   MONTHS_OF_THE_YEAR:
     - 'Gener'
     - 'Febrer'
@@ -60,3 +71,17 @@ GRAV:
     - 'Divendres'
     - 'Dissabte'
     - 'Diumenge'
+  YES: "Sí"
+  NO: "No"
+  CRON:
+    EVERY: cada
+    EVERY_HOUR: cada hora
+    EVERY_MINUTE: cada minut
+    EVERY_DAY_OF_WEEK: cada dia de la setmana
+    EVERY_DAY_OF_MONTH: cada dia del mes
+    EVERY_MONTH: cada mes
+    TEXT_PERIOD: Cada <b />
+    ERROR1: L'etiqueta %s no està suportada!
+    ERROR2: Nombre d'elements incorrecte
+    ERROR3: El jquery_element s'ha d'establir a la configuració de jqCron
+    ERROR4: Expressió no reconeguda
diff --git a/system/languages/cs.yaml b/system/languages/cs.yaml
index 80844c9979..bfad423648 100644
--- a/system/languages/cs.yaml
+++ b/system/languages/cs.yaml
@@ -101,9 +101,10 @@ GRAV:
     YR_PLURAL: r
     DEC_PLURAL: dek
   FORM:
-    VALIDATION_FAIL: <b>Ověření se nezdařilo:</b>
-    INVALID_INPUT: Neplatný vstup v
+    VALIDATION_FAIL: '<b>Ověření se nezdařilo:</b>'
+    INVALID_INPUT: 'Neplatný vstup v'
     MISSING_REQUIRED_FIELD: 'Chybí požadované pole:'
+    XSS_ISSUES: "Byly zjištěny možné problémy XSS v poli '%s'"
   MONTHS_OF_THE_YEAR:
     - 'leden'
     - 'únor'
@@ -125,6 +126,8 @@ GRAV:
     - 'pátek'
     - 'sobota'
     - 'neděle'
+  YES: "Ano"
+  NO: "Ne"
   CRON:
     EVERY: každý
     EVERY_HOUR: každou hodinu
diff --git a/system/languages/da.yaml b/system/languages/da.yaml
index 17ce683ba3..f23477c537 100644
--- a/system/languages/da.yaml
+++ b/system/languages/da.yaml
@@ -1,11 +1,27 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nTitel: %1$s\n---\n\n# Fejl: Ugyldigt frontmatter\n\nSti: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'udstyr'
+    - 'information'
+    - 'ris'
+    - 'penge'
+    - 'arter'
+    - 'Serier'
+    - 'fisk'
+    - 'får'
+  INFLECTOR_IRREGULAR:
+    'person': 'personer'
+    'man': 'mænd'
+    'child': 'børn'
+    'sex': 'køn'
+    'move': 'flyt'
   NICETIME:
     NO_DATE_PROVIDED: Ingen dato angivet
     BAD_DATE: Ugyldig dato
     AGO: siden
     FROM_NOW: fra nu
+    JUST_NOW: lige nu
     SECOND: sekund
     MINUTE: minut
     HOUR: time
@@ -15,6 +31,7 @@ GRAV:
     YEAR: år
     DECADE: årti
     SEC: sek
+    MIN: min.
     HR: t
     WK: u
     MO: md
@@ -36,8 +53,8 @@ GRAV:
     YR_PLURAL: år
     DEC_PLURAL: årtier
   FORM:
-    VALIDATION_FAIL: <b>Validering mislykkedes:</b>
-    INVALID_INPUT: Ugyldigt input i
+    VALIDATION_FAIL: '<b>Validering mislykkedes:</b>'
+    INVALID_INPUT: 'Ugyldigt input i'
     MISSING_REQUIRED_FIELD: 'Mangler obligatorisk felt:'
   MONTHS_OF_THE_YEAR:
     - 'januar'
@@ -60,3 +77,14 @@ GRAV:
     - 'fredag'
     - 'lørdag'
     - 'søndag'
+  CRON:
+    EVERY: hver
+    EVERY_HOUR: hver time
+    EVERY_MINUTE: hvert minut
+    EVERY_DAY_OF_WEEK: alle ugens dage
+    EVERY_DAY_OF_MONTH: alle dage i måneden
+    EVERY_MONTH: hver måned
+    TEXT_PERIOD: Hver <b />
+    TEXT_MINS: ' ved <b /> minut(ter) over timen'
+    ERROR1: Tagget %s understøttes ikke!
+    ERROR2: Ugyldigt antal elementer
diff --git a/system/languages/de.yaml b/system/languages/de.yaml
index e9a2d4b600..45c24e79c6 100644
--- a/system/languages/de.yaml
+++ b/system/languages/de.yaml
@@ -101,9 +101,10 @@ GRAV:
     YR_PLURAL: Jahre
     DEC_PLURAL: Jahrzehnten
   FORM:
-    VALIDATION_FAIL: <b>Überprüfung fehlgeschlagen:</b>
-    INVALID_INPUT: Ungültige Eingabe in
+    VALIDATION_FAIL: '<b>Überprüfung fehlgeschlagen:</b>'
+    INVALID_INPUT: 'Ungültige Eingabe in'
     MISSING_REQUIRED_FIELD: 'Erforderliches Feld fehlt:'
+    XSS_ISSUES: "Potenzielle XSS-Probleme im Feld '%s' erkannt"
   MONTHS_OF_THE_YEAR:
     - 'Januar'
     - 'Februar'
@@ -125,6 +126,8 @@ GRAV:
     - 'Freitag'
     - 'Samstag'
     - 'Sonntag'
+  YES: "Ja"
+  NO: "Nein"
   CRON:
     EVERY: jede
     EVERY_HOUR: jede Stunde
diff --git a/system/languages/el.yaml b/system/languages/el.yaml
index 1faa8dd87f..28619f8099 100644
--- a/system/languages/el.yaml
+++ b/system/languages/el.yaml
@@ -1,11 +1,75 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nΤίτλος: %1$s\n---\n\n# Σφάλμα: Μη έγκυρη διαδρομή Frontmatter\n\nΔιαδρομή: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'εξοπλισμός'
+    - 'πληροφοριες'
+    - 'rice'
+    - 'χρήματα'
+    - 'είδη'
+    - 'σειρές'
+    - 'ψάρι'
+    - 'πρόβατο'
+  INFLECTOR_IRREGULAR:
+    'person': 'άνθρωποι'
+    'man': 'άνδρες'
+    'child': 'παιδιά'
+    'sex': 'φύλο'
+    'move': 'κινήσεις'
+  INFLECTOR_ORDINALS:
+    'default': 'th'
+    'first': 'st'
+    'second': 'nd'
+    'third': 'rd'
   NICETIME:
     NO_DATE_PROVIDED: Δεν δόθηκε καμία ημερομηνία
     BAD_DATE: Εσφαλμένη ημερομηνία
     AGO: πρίν
     FROM_NOW: από τώρα
+    JUST_NOW: μόλις τώρα
     SECOND: δευτερόλεπτο
     MINUTE: λεπτό
     HOUR: ώρα
@@ -37,8 +101,8 @@ GRAV:
     YR_PLURAL: έτη
     DEC_PLURAL: δεκαετίες
   FORM:
-    VALIDATION_FAIL: <b>Η επικύρωση απέτυχε:</b>
-    INVALID_INPUT: Μη έγκυρα δεδομένα σε
+    VALIDATION_FAIL: '<b>Η επικύρωση απέτυχε:</b>'
+    INVALID_INPUT: 'Μη έγκυρα δεδομένα σε'
     MISSING_REQUIRED_FIELD: 'Λείπει το απαιτούμενο πεδίο:'
   MONTHS_OF_THE_YEAR:
     - 'Ιανουάριος'
@@ -61,3 +125,20 @@ GRAV:
     - 'Παρασκευή'
     - 'Σάββατο'
     - 'Κυριακή'
+  CRON:
+    EVERY: κάθε
+    EVERY_HOUR: κάθε ώρα
+    EVERY_MINUTE: κάθε λεπτό
+    EVERY_DAY_OF_WEEK: κάθε μέρα της εβδομάδος
+    EVERY_DAY_OF_MONTH: κάθε μέρα του μήνα
+    EVERY_MONTH: κάθε μήνα
+    TEXT_PERIOD: Κάθε <b />
+    TEXT_MINS: ' κατά <b /> λεπτό(ά) μετά την ώρα'
+    TEXT_TIME: ' στο <b />:<b />'
+    TEXT_DOW: ' στις <b />'
+    TEXT_MONTH: ' από <b />'
+    TEXT_DOM: ' στις <b />'
+    ERROR1: Η ετικέτα %s δεν υποστηρίζεται!
+    ERROR2: Μη έγκυρος αριθμός στοιχείων
+    ERROR3: Το jquery_element θα έπρεπε να οριστεί στις ρυθμίσεις του jqCron
+    ERROR4: Μη αναγνωρισμένη έκφραση
diff --git a/system/languages/en.yaml b/system/languages/en.yaml
index 7c351e6495..7a8a68c003 100644
--- a/system/languages/en.yaml
+++ b/system/languages/en.yaml
@@ -94,9 +94,10 @@ GRAV:
         YR_PLURAL: yrs
         DEC_PLURAL: decs
     FORM:
-        VALIDATION_FAIL: <b>Validation failed:</b>
-        INVALID_INPUT: Invalid input in
-        MISSING_REQUIRED_FIELD: Missing required field:
+        VALIDATION_FAIL: '<b>Validation failed:</b>'
+        INVALID_INPUT: 'Invalid input in'
+        MISSING_REQUIRED_FIELD: 'Missing required field:'
+        XSS_ISSUES: "Potential XSS issues detected in '%s' field"
     MONTHS_OF_THE_YEAR: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
     DAYS_OF_THE_WEEK: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
     YES: "Yes"
diff --git a/system/languages/es.yaml b/system/languages/es.yaml
index 7bacfeb981..a8a47aa382 100644
--- a/system/languages/es.yaml
+++ b/system/languages/es.yaml
@@ -1,19 +1,25 @@
 ---
 GRAV:
-  FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Error: Frontmatter no válido\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Error: Prefacio no válido\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1ios'
+    '/s$/i': 's'
+    '/$/': 's'
   INFLECTOR_UNCOUNTABLE:
-    - 'equipo'
+    - 'equipamiento'
     - 'información'
-    - 'rice'
+    - 'arroz'
     - 'dinero'
-    - 'species'
+    - 'especies'
     - 'series'
     - 'pescado'
     - 'oveja'
   INFLECTOR_IRREGULAR:
+    'person': 'personas'
     'man': 'hombres'
     'child': 'niños'
     'sex': 'sexos'
+    'move': 'movido'
   INFLECTOR_ORDINALS:
     'first': 'ro'
     'second': 'do'
@@ -33,10 +39,12 @@ GRAV:
     YEAR: año
     DECADE: década
     SEC: seg
+    MIN: min
     HR: h
     WK: sem
     MO: mes
     YR: año
+    DEC: déc
     SECOND_PLURAL: segundos
     MINUTE_PLURAL: minutos
     HOUR_PLURAL: horas
@@ -46,6 +54,7 @@ GRAV:
     YEAR_PLURAL: años
     DECADE_PLURAL: décadas
     SEC_PLURAL: segs
+    MIN_PLURAL: mins
     HR_PLURAL: hs
     WK_PLURAL: sem
     MO_PLURAL: mes
@@ -55,6 +64,7 @@ GRAV:
     VALIDATION_FAIL: '<b>Falló la validación: </b>'
     INVALID_INPUT: 'Dato inválido en: '
     MISSING_REQUIRED_FIELD: 'Falta el campo requerido: '
+    XSS_ISSUES: "Se detectaron potenciales problemas XSS en el campo '%s'"
   MONTHS_OF_THE_YEAR:
     - 'Enero'
     - 'Febrero'
@@ -76,6 +86,8 @@ GRAV:
     - 'Viernes'
     - 'Sábado'
     - 'Domingo'
+  YES: "Sí"
+  NO: "No"
   CRON:
     EVERY: cada
     EVERY_HOUR: cada hora
@@ -84,12 +96,12 @@ GRAV:
     EVERY_DAY_OF_MONTH: cada día del mes
     EVERY_MONTH: cada mes
     TEXT_PERIOD: Cada <b />
-    TEXT_MINS: ' a <b /> minuto(s) despues de la hora'
+    TEXT_MINS: ' a <b /> minuto(s) después de la hora'
     TEXT_TIME: ' a <b />:<b />'
     TEXT_DOW: ' en <b />'
     TEXT_MONTH: ' de<b />'
     TEXT_DOM: ' en<b />'
-    ERROR1: La etiqueta %s no está soportada!
-    ERROR2: El número de elementos es erroneo
+    ERROR1: '¡La etiqueta %s no está soportada!'
+    ERROR2: El número de elementos es erróneo
     ERROR3: El jquery_element debería establecerse en la configuración del jqCron
     ERROR4: Expresión no reconocida
diff --git a/system/languages/et.yaml b/system/languages/et.yaml
index 619aa1a735..e5659d333d 100644
--- a/system/languages/et.yaml
+++ b/system/languages/et.yaml
@@ -1,11 +1,22 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\npealkiri: %1$s\n---\n\n# Viga: vigane Frontmatter'i\n\nasukoht: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(octop|vir)us$/i': '\1i'
+  INFLECTOR_SINGULAR:
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
   INFLECTOR_UNCOUNTABLE:
     - 'equipment'
     - 'informatsioon'
-    - 'rice'
-    - 'money'
+    - 'riis'
+    - 'raha'
     - 'species'
     - 'series'
     - 'kala'
@@ -34,6 +45,7 @@ GRAV:
     YEAR: aasta
     DECADE: 10 aastat
     SEC: sek
+    MIN: min
     HR: t
     WK: näd
     MO: k.
@@ -55,7 +67,7 @@ GRAV:
     YR_PLURAL: aastat
     DEC_PLURAL: dek.
   FORM:
-    VALIDATION_FAIL: <b>Kinnitamine nurjus:</b>
+    VALIDATION_FAIL: '<b>Kinnitamine nurjus:</b>'
     INVALID_INPUT: 'Vigane sisend:'
     MISSING_REQUIRED_FIELD: 'Nõutud väli puudub:'
   MONTHS_OF_THE_YEAR:
@@ -81,5 +93,12 @@ GRAV:
     - 'pühapäev'
   CRON:
     EVERY: iga
+    EVERY_HOUR: iga tund
+    EVERY_MINUTE: iga minut
+    EVERY_DAY_OF_WEEK: iga nädala päev
     EVERY_MONTH: iga kuu
     TEXT_PERIOD: Iga <b />
+    ERROR1: Silt %s pole toetatud!
+    ERROR2: Vale elementide arv
+    ERROR3: jqCron seadetes peaks olema määratud jquery_element
+    ERROR4: Tundmatu väljend
diff --git a/system/languages/eu.yaml b/system/languages/eu.yaml
index 4a9a58e9e6..91c3c8e2c0 100644
--- a/system/languages/eu.yaml
+++ b/system/languages/eu.yaml
@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: urt
     DEC_PLURAL: ham
   FORM:
-    VALIDATION_FAIL: <b>Balidazioak huts egin du</b>
-    INVALID_INPUT: Baliogabeko sarrera
+    VALIDATION_FAIL: '<b>Balidazioak huts egin du</b>'
+    INVALID_INPUT: 'Baliogabeko sarrera'
     MISSING_REQUIRED_FIELD: 'Derrigorrezko eremua bete gabe:'
   MONTHS_OF_THE_YEAR:
     - 'Urtarrila'
diff --git a/system/languages/fa.yaml b/system/languages/fa.yaml
index 186f79d793..96b96dc042 100644
--- a/system/languages/fa.yaml
+++ b/system/languages/fa.yaml
@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: سال
     DEC_PLURAL: دهه
   FORM:
-    VALIDATION_FAIL: <b>سنجش اعتبار ناموفق بود</b>
-    INVALID_INPUT: ورودی نامعتبر در
+    VALIDATION_FAIL: '<b>سنجش اعتبار ناموفق بود</b>'
+    INVALID_INPUT: 'ورودی نامعتبر در'
     MISSING_REQUIRED_FIELD: 'قسمت ضروری جا افتاده:'
   MONTHS_OF_THE_YEAR:
     - 'ژانویه'
diff --git a/system/languages/fi.yaml b/system/languages/fi.yaml
index e84c19f667..4cb547c687 100644
--- a/system/languages/fi.yaml
+++ b/system/languages/fi.yaml
@@ -100,8 +100,8 @@ GRAV:
     YR_PLURAL: v
     DEC_PLURAL: vuosikymmentä
   FORM:
-    VALIDATION_FAIL: <b>Vahvistus epäonnistui:</b>
-    INVALID_INPUT: Syöte ei kelpaa
+    VALIDATION_FAIL: '<b>Vahvistus epäonnistui:</b>'
+    INVALID_INPUT: 'Syöte ei kelpaa'
     MISSING_REQUIRED_FIELD: 'Puuttuva pakollinen kenttä:'
   MONTHS_OF_THE_YEAR:
     - 'Tammikuu'
diff --git a/system/languages/fr.yaml b/system/languages/fr.yaml
index 9284f7e6df..6c17e6aa51 100644
--- a/system/languages/fr.yaml
+++ b/system/languages/fr.yaml
@@ -16,6 +16,7 @@ GRAV:
     '/(buffal|tomat)o$/i': '\1es'
     '/(bu)s$/i': 'Bus'
     '/(alias|status)/i': 'alias|status'
+    '/(octop|vir)us$/i': 'virus'
     '/(ax|test)is$/i': '\1s'
     '/s$/i': 's'
     '/$/': 's'
@@ -23,6 +24,7 @@ GRAV:
     '/(quiz)zes$/i': '\1'
     '/(alias|status)es$/i': '\1'
     '/([octop|vir])i$/i': '\1us'
+    '/(n)ews$/i': '\1ouvelles'
   INFLECTOR_UNCOUNTABLE:
     - 'équipement'
     - 'information'
@@ -57,10 +59,10 @@ GRAV:
     MONTH: mois
     YEAR: année
     DECADE: décennie
-    SEC: s
-    MIN: m
-    HR: h
-    WK: sem
+    SEC: sec.
+    MIN: min.
+    HR: hr.
+    WK: sem.
     MO: m
     YR: an
     DEC: déc
@@ -80,30 +82,33 @@ GRAV:
     YR_PLURAL: a
     DEC_PLURAL: décs
   FORM:
-    VALIDATION_FAIL: <b>La validation a échoué :</b>
-    INVALID_INPUT: Saisie non valide
+    VALIDATION_FAIL: '<b>La validation a échoué :</b>'
+    INVALID_INPUT: 'Saisie non valide'
     MISSING_REQUIRED_FIELD: 'Champ obligatoire manquant :'
+    XSS_ISSUES: "Erreurs XSS probablement détectées dans le champ '%s'"
   MONTHS_OF_THE_YEAR:
-    - 'Janvier'
-    - 'Février'
-    - 'Mars'
-    - 'Avril'
-    - 'Mai'
-    - 'Juin'
-    - 'Juillet'
-    - 'Août'
-    - 'Septembre'
-    - 'Octobre'
-    - 'Novembre'
-    - 'Décembre'
+    - 'janvier'
+    - 'février'
+    - 'mars'
+    - 'avril'
+    - 'mai'
+    - 'juin'
+    - 'juillet'
+    - 'août'
+    - 'septembre'
+    - 'octobre'
+    - 'novembre'
+    - 'décembre'
   DAYS_OF_THE_WEEK:
-    - 'Lundi'
-    - 'Mardi'
-    - 'Mercredi'
-    - 'Jeudi'
-    - 'Vendredi'
-    - 'Samedi'
-    - 'Dimanche'
+    - 'lundi'
+    - 'mardi'
+    - 'mercredi'
+    - 'jeudi'
+    - 'vendredi'
+    - 'samedi'
+    - 'dimanche'
+  YES: "Oui"
+  NO: "Non"
   CRON:
     EVERY: chaque
     EVERY_HOUR: toutes les heures
@@ -117,7 +122,7 @@ GRAV:
     TEXT_DOW: ' sur <b/>'
     TEXT_MONTH: ' de <b />'
     TEXT_DOM: ' sur <b/>'
-    ERROR1: La balise %s n'est pas supportée!
+    ERROR1: La balise %s n'est pas prise en charge !
     ERROR2: Nombre invalide d'éléments
     ERROR3: L'élément jquery_element doit être défini dans les paramètres jqCron
     ERROR4: Expression non reconnue
diff --git a/system/languages/gl.yaml b/system/languages/gl.yaml
new file mode 100644
index 0000000000..b9e581f913
--- /dev/null
+++ b/system/languages/gl.yaml
@@ -0,0 +1,147 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Erro: Limiar incorrecto\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1'
+    '/(octop|vir)us$/i': '\1'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1ces'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1'
+    '/(cris|ax|test)es$/i': '\1es'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1se'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2se'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipo'
+    - 'información'
+    - 'arroz'
+    - 'diñeiro'
+    - 'especies'
+    - 'series'
+    - 'peixe'
+    - 'ovella'
+  INFLECTOR_IRREGULAR:
+    'person': 'xente'
+    'man': 'home'
+    'child': 'neno'
+    'sex': 'sexos'
+    'move': 'move'
+  INFLECTOR_ORDINALS:
+    'default': 'º'
+    'first': 'º'
+    'second': 'º'
+    'third': 'º'
+  NICETIME:
+    NO_DATE_PROVIDED: Non fornece unha data
+    BAD_DATE: Data errada
+    AGO: hai
+    FROM_NOW: dende agora
+    JUST_NOW: xusto agora
+    SECOND: segundo
+    MINUTE: minuto
+    HOUR: hora
+    DAY: día
+    WEEK: semana
+    MONTH: mes
+    YEAR: ano
+    DECADE: década
+    SEC: seg
+    MIN: min
+    HR: hr 
+    WK: Sem
+    MO: m
+    YR: a
+    DEC: dec
+    SECOND_PLURAL: segundos
+    MINUTE_PLURAL: minutos
+    HOUR_PLURAL: horas
+    DAY_PLURAL: días
+    WEEK_PLURAL: semanas
+    MONTH_PLURAL: meses
+    YEAR_PLURAL: anos
+    DECADE_PLURAL: décadas
+    SEC_PLURAL: segs
+    MIN_PLURAL: mins
+    HR_PLURAL: hrs
+    WK_PLURAL: sem
+    MO_PLURAL: mes
+    YR_PLURAL: a
+    DEC_PLURAL: deca
+  FORM:
+    VALIDATION_FAIL: '<b>Fallou a validación:</b>'
+    INVALID_INPUT: 'Entrada incorrecta en'
+    MISSING_REQUIRED_FIELD: 'Falta un campo requirido:'
+    XSS_ISSUES: "Detectáronse posibles problemas XSS no campo '% s'"
+  MONTHS_OF_THE_YEAR:
+    - 'xaneiro'
+    - 'febreiro'
+    - 'marzo'
+    - 'abril'
+    - 'maio'
+    - 'xuño'
+    - 'xullo'
+    - 'agosto'
+    - 'setembro'
+    - 'outubro'
+    - 'novembro'
+    - 'decembro'
+  DAYS_OF_THE_WEEK:
+    - 'luns'
+    - 'martes'
+    - 'mércores'
+    - 'xoves'
+    - 'venres'
+    - 'sábado'
+    - 'domingo'
+  YES: "Si"
+  NO: "Non"
+  CRON:
+    EVERY: cada
+    EVERY_HOUR: Cada hora
+    EVERY_MINUTE: Cada minuto
+    EVERY_DAY_OF_WEEK: cada día da semana
+    EVERY_DAY_OF_MONTH: cada día do mes
+    EVERY_MONTH: cada mes
+    TEXT_PERIOD: Cada <b />
+    TEXT_MINS: ' dentro de <b /> minuto(s) despois da hora'
+    TEXT_TIME: ' dentro <b />:<b />'
+    TEXT_DOW: ' o <b />'
+    TEXT_MONTH: ' de <b />'
+    TEXT_DOM: ' o <b />'
+    ERROR1: A etiqueta %s non é compatíbel!
+    ERROR2: Mal número de elementos
+    ERROR3: O jquery_element debería estar determinado na configuración de jqCron
+    ERROR4: Expresión non recoñecida
diff --git a/system/languages/he.yaml b/system/languages/he.yaml
index afb63d7f8f..d7f43186e3 100644
--- a/system/languages/he.yaml
+++ b/system/languages/he.yaml
@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: שני'
     DEC_PLURAL: עש'
   FORM:
-    VALIDATION_FAIL: <b>האימות נכשל:</b>
-    INVALID_INPUT: קלט לא חוקי
+    VALIDATION_FAIL: '<b>האימות נכשל:</b>'
+    INVALID_INPUT: 'קלט לא חוקי'
     MISSING_REQUIRED_FIELD: 'שדות חובה חסרים:'
   MONTHS_OF_THE_YEAR:
     - 'ינואר'
diff --git a/system/languages/hr.yaml b/system/languages/hr.yaml
index 1b530b5c22..4827d3eec7 100644
--- a/system/languages/hr.yaml
+++ b/system/languages/hr.yaml
@@ -50,8 +50,8 @@ GRAV:
     YR_PLURAL: g
     DEC_PLURAL: des
   FORM:
-    VALIDATION_FAIL: <b>Validacija nije uspjela:</b>
-    INVALID_INPUT: Pogrešan unos u
+    VALIDATION_FAIL: '<b>Validacija nije uspjela:</b>'
+    INVALID_INPUT: 'Pogrešan unos u'
     MISSING_REQUIRED_FIELD: 'Nedostaje obavezno polje:'
   MONTHS_OF_THE_YEAR:
     - 'Siječanj'
diff --git a/system/languages/hu.yaml b/system/languages/hu.yaml
index a834c45c3b..2624cf938e 100644
--- a/system/languages/hu.yaml
+++ b/system/languages/hu.yaml
@@ -58,7 +58,7 @@ GRAV:
     YR_PLURAL: év
     DEC_PLURAL: évt
   FORM:
-    VALIDATION_FAIL: <b>Érvényesítés nem sikerült:</b>
+    VALIDATION_FAIL: '<b>Érvényesítés nem sikerült:</b>'
     INVALID_INPUT: 'A megadott érték érvénytelen:'
     MISSING_REQUIRED_FIELD: 'Ez a kötelező mező nincs kitöltve:'
   MONTHS_OF_THE_YEAR:
diff --git a/system/languages/id.yaml b/system/languages/id.yaml
index 41431f13e4..8107235957 100644
--- a/system/languages/id.yaml
+++ b/system/languages/id.yaml
@@ -1,26 +1,74 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Frontmatter tidak valid\n\nLokasi: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
   INFLECTOR_UNCOUNTABLE:
-    - 'peralatan'
-    - 'informasi'
-    - 'nasi'
-    - 'uang'
-    - 'spesies'
-    - 'rangkaian'
-    - 'ikan'
-    - 'domba'
+    - 'Peralatan'
+    - 'Informasi '
+    - 'Nasi'
+    - 'Uang'
+    - 'Jenis'
+    - 'Seri'
+    - 'Ikan'
+    - 'Domba'
   INFLECTOR_IRREGULAR:
-    'person': 'orang-orang'
-    'man': 'laki-laki'
-    'child': 'anak-anak'
-    'sex': 'jenis kelamin'
+    'person': 'Orang-orang'
+    'man': 'Pria'
+    'child': 'Balita'
+    'sex': 'Jenis Kelamin'
     'move': 'pindahkan'
+  INFLECTOR_ORDINALS:
+    'default': 'ke'
+    'first': 'pertama'
+    'second': 'nd'
+    'third': 'rd'
   NICETIME:
-    NO_DATE_PROVIDED: Tanggal tidak tersedia
+    NO_DATE_PROVIDED: Tidak ada tanggal yang disediakan
     BAD_DATE: Format tanggal salah
     AGO: yang lalu
-    FROM_NOW: dari saat ini
+    FROM_NOW: dari sekarang
     JUST_NOW: baru saja
     SECOND: detik
     MINUTE: menit
@@ -30,12 +78,12 @@ GRAV:
     MONTH: bulan
     YEAR: tahun
     DECADE: dekade
-    SEC: dtk
-    MIN: mnt
-    HR: j
-    WK: mng
-    MO: bln
-    YR: thn
+    SEC: detik
+    MIN: menit
+    HR: ' jam'
+    WK: minggu
+    MO: bulan
+    YR: tahun
     DEC: desimal
     SECOND_PLURAL: detik
     MINUTE_PLURAL: menit
@@ -45,17 +93,18 @@ GRAV:
     MONTH_PLURAL: bulan
     YEAR_PLURAL: tahun
     DECADE_PLURAL: dekade
-    SEC_PLURAL: dtk
-    MIN_PLURAL: mnt
-    HR_PLURAL: j
-    WK_PLURAL: mgg
-    MO_PLURAL: bln
-    YR_PLURAL: thn
+    SEC_PLURAL: detik
+    MIN_PLURAL: menit
+    HR_PLURAL: jam
+    WK_PLURAL: minggu
+    MO_PLURAL: bulan
+    YR_PLURAL: tahun
     DEC_PLURAL: dekade
   FORM:
-    VALIDATION_FAIL: <b>Validasi gagal:</b>
-    INVALID_INPUT: Input tidak valid di
+    VALIDATION_FAIL: '<b>Validasi gagal:</b>'
+    INVALID_INPUT: 'Input tidak valid di'
     MISSING_REQUIRED_FIELD: 'Data yang diperlukan belum terisi:'
+    XSS_ISSUES: "Isu berpotensial XSS terdeteksi dalam baris %s"
   MONTHS_OF_THE_YEAR:
     - 'Januari'
     - 'Februari'
@@ -74,22 +123,25 @@ GRAV:
     - 'Selasa'
     - 'Rabu'
     - 'Kamis'
-    - 'Jumat'
+    - 'Jum''at'
     - 'Sabtu'
     - 'Minggu'
+  YES: "Ya"
+  NO: "Tidak"
   CRON:
     EVERY: Setiap
     EVERY_HOUR: Setiap jam
     EVERY_MINUTE: Setiap menit
     EVERY_DAY_OF_WEEK: Setiap hari selama seminggu
-    EVERY_DAY_OF_MONTH: pada tanggal setiap bulannya
+    EVERY_DAY_OF_MONTH: Setiap hari dalam sebulan
     EVERY_MONTH: setiap bulan
     TEXT_PERIOD: Setiap <b />
+    TEXT_MINS: 'dalam <b />  menit setelah jam yang lalu'
     TEXT_TIME: ' pada <b />:<b />'
     TEXT_DOW: ' pada <b />'
     TEXT_MONTH: ' pada <b />'
     TEXT_DOM: ' pada <b />'
     ERROR1: Tag %s tidak didukung!
-    ERROR2: Jumlah elemen tidak valid
-    ERROR3: jquery_element harus ditetapkan ke pengaturan jqCron
-    ERROR4: Ekspresi tidak dikenali
+    ERROR2: Jumlah elemen yang buruk
+    ERROR3: jquery_element harus diatur ke dalam pengaturan jqCron
+    ERROR4: Ekspresi tidak dikenal
diff --git a/system/languages/is.yaml b/system/languages/is.yaml
index 6f9761ca10..00d42eefa8 100644
--- a/system/languages/is.yaml
+++ b/system/languages/is.yaml
@@ -46,8 +46,8 @@ GRAV:
     YR_PLURAL: árum
     DEC_PLURAL: árat
   FORM:
-    VALIDATION_FAIL: <b>Sannvottun mistókst:</b>
-    INVALID_INPUT: Ógilt inntak í
+    VALIDATION_FAIL: '<b>Sannvottun mistókst:</b>'
+    INVALID_INPUT: 'Ógilt inntak í'
     MISSING_REQUIRED_FIELD: 'Vantar nauðsynlegan reit:'
   MONTHS_OF_THE_YEAR:
     - 'janúar'
diff --git a/system/languages/it.yaml b/system/languages/it.yaml
index 741f721892..f366eb6657 100644
--- a/system/languages/it.yaml
+++ b/system/languages/it.yaml
@@ -1,6 +1,49 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---Titolo: %1$s---# Errore: Frontmatter non valido: '%2$s' * *%3$s * * ' '%4$s ' '"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
   INFLECTOR_UNCOUNTABLE:
     - 'dotazione'
     - 'informazione'
@@ -58,9 +101,10 @@ GRAV:
     YR_PLURAL: anni
     DEC_PLURAL: decenni
   FORM:
-    VALIDATION_FAIL: <b>Validazione fallita:</b>
-    INVALID_INPUT: Input non valido in
+    VALIDATION_FAIL: '<b>Validazione fallita:</b>'
+    INVALID_INPUT: 'Input non valido in'
     MISSING_REQUIRED_FIELD: 'Campo richiesto mancante:'
+    XSS_ISSUES: "Rilevati potenziali problemi di XSS nel campo '%s'"
   MONTHS_OF_THE_YEAR:
     - 'Gennaio'
     - 'Febbraio'
@@ -82,6 +126,8 @@ GRAV:
     - 'Venerdì'
     - 'Sabato'
     - 'Domenica'
+  YES: "Sì"
+  NO: "No"
   CRON:
     EVERY: ogni
     EVERY_HOUR: ogni ora
diff --git a/system/languages/ja.yaml b/system/languages/ja.yaml
index 0e3fa16af0..701d8e7acc 100644
--- a/system/languages/ja.yaml
+++ b/system/languages/ja.yaml
@@ -1,11 +1,22 @@
 ---
 GRAV:
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - '情報'
+    - 'rice'
+    - 'お金'
+    - 'species'
+    - 'series'
+    - '魚'
+    - 'ヒツジ'
   INFLECTOR_IRREGULAR:
     'person': 'みんな'
     'man': '人'
     'child': '子供'
     'sex': '性別'
     'move': '移動'
+  INFLECTOR_ORDINALS:
+    'first': '番目'
   NICETIME:
     NO_DATE_PROVIDED: 日付が設定されていません
     BAD_DATE: 不正な日付
@@ -40,8 +51,8 @@ GRAV:
     YR_PLURAL: 年
     DEC_PLURAL: 10年
   FORM:
-    VALIDATION_FAIL: <b>バリデーション失敗 :</b>
-    INVALID_INPUT: 不正な入力：
+    VALIDATION_FAIL: '<b>バリデーション失敗 :</b>'
+    INVALID_INPUT: '不正な入力：'
     MISSING_REQUIRED_FIELD: '必須項目が入力されていません:'
   MONTHS_OF_THE_YEAR:
     - '1月'
@@ -64,3 +75,7 @@ GRAV:
     - '金'
     - '土'
     - '日'
+  CRON:
+    EVERY: 毎
+    EVERY_MONTH: 毎月
+    ERROR1: 共有タイプ %s はサポートされていません
diff --git a/system/languages/ko.yaml b/system/languages/ko.yaml
index 6676a6d25f..15aee8ea2a 100644
--- a/system/languages/ko.yaml
+++ b/system/languages/ko.yaml
@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: 년
     DEC_PLURAL: 년간
   FORM:
-    VALIDATION_FAIL: <b>유효성 검사 실패:</b>
-    INVALID_INPUT: 잘못된 입력
+    VALIDATION_FAIL: '<b>유효성 검사 실패:</b>'
+    INVALID_INPUT: '잘못된 입력'
     MISSING_REQUIRED_FIELD: '누락 된 필수 필드:'
   MONTHS_OF_THE_YEAR:
     - '일월'
diff --git a/system/languages/lt.yaml b/system/languages/lt.yaml
index aca0fc37f0..d894b969e0 100644
--- a/system/languages/lt.yaml
+++ b/system/languages/lt.yaml
@@ -52,8 +52,8 @@ GRAV:
     YR_PLURAL: m.
     DEC_PLURAL: dešimtmečiai
   FORM:
-    VALIDATION_FAIL: <b>Patvirtinimas nepavyko:</b>
-    INVALID_INPUT: Neteisingai įvesta į
+    VALIDATION_FAIL: '<b>Patvirtinimas nepavyko:</b>'
+    INVALID_INPUT: 'Neteisingai įvesta į'
     MISSING_REQUIRED_FIELD: 'Būtina užpildyti laukelį:'
   MONTHS_OF_THE_YEAR:
     - 'Sausis'
diff --git a/system/languages/mn.yaml b/system/languages/mn.yaml
new file mode 100644
index 0000000000..73cda0ee39
--- /dev/null
+++ b/system/languages/mn.yaml
@@ -0,0 +1,147 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nГарчиг: %1$s\n---\n\n# Алдаа: Буруу Формат\n\nЗам: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1зүүд'
+    '/^(ox)$/i': '\1ууд'
+    '/([m|l])ouse$/i': '\1ууд'
+    '/(matr|vert|ind)ix|ex$/i': '\1иксүүд'
+    '/(x|ch|ss|sh)$/i': '\1үүд'
+    '/([^aeiouy]|qu)ies$/i': '\1үүд'
+    '/([^aeiouy]|qu)y$/i': '\1үүд'
+    '/(hive)$/i': '\1үүд'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2үүд'
+    '/sis$/i': 'үүд'
+    '/([ti])um$/i': '\1үүд'
+    '/(buffal|tomat)o$/i': '\1үүд'
+    '/(bu)s$/i': '\1үүд'
+    '/(alias|status)/i': '\1үүд'
+    '/(octop|vir)us$/i': '\1үүд'
+    '/(ax|test)is$/i': '\1үүд'
+    '/s$/i': 'үүд'
+    '/$/': 'үүд'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1икс'
+    '/(vert|ind)ices$/i': '\1икс'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1'
+    '/(cris|ax|test)es$/i': '\1'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1'
+    '/(s)eries$/i': '\1'
+    '/([^aeiouy]|qu)ies$/i': '\1үүд'
+    '/([lr])ves$/i': '\1'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1'
+    '/(^analy)ses$/i': '\1'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2үүд'
+    '/([ti])a$/i': '\1'
+    '/(n)ews$/i': '\1'
+  INFLECTOR_UNCOUNTABLE:
+    - 'тоног төхөөрөмж'
+    - 'Мэдээлэл'
+    - 'будаа'
+    - 'мөнгө'
+    - 'төрөл зүйл'
+    - 'цуврал'
+    - 'загас'
+    - 'хонь'
+  INFLECTOR_IRREGULAR:
+    'person': 'хүмүүс'
+    'man': 'эрчүүд'
+    'child': 'хүүхэд'
+    'sex': 'хүйс'
+    'move': 'хөдөлгөөн'
+  INFLECTOR_ORDINALS:
+    'default': 'th'
+    'first': 'st'
+    'second': 'nd'
+    'third': 'rd'
+  NICETIME:
+    NO_DATE_PROVIDED: Огноо алга
+    BAD_DATE: Буруу огноо
+    AGO: өмнө 
+    FROM_NOW: одооноос
+    JUST_NOW: дөнгөж сая
+    SECOND: секунд
+    MINUTE: минут
+    HOUR: цаг
+    DAY: өдөр
+    WEEK: долоо хоног
+    MONTH: сар
+    YEAR: он
+    DECADE: арван жил
+    SEC: сек
+    MIN: мин
+    HR: цаг
+    WK: д.х.
+    MO: сар
+    YR: он
+    DEC: арван жил
+    SECOND_PLURAL: секунд
+    MINUTE_PLURAL: минут
+    HOUR_PLURAL: цаг
+    DAY_PLURAL: өдрүүд
+    WEEK_PLURAL: долоо хоногууд
+    MONTH_PLURAL: сарууд
+    YEAR_PLURAL: онууд
+    DECADE_PLURAL: арван жилүүд
+    SEC_PLURAL: сек.-үүд
+    MIN_PLURAL: мин.-ууд
+    HR_PLURAL: цагууд
+    WK_PLURAL: д.х.-ууд
+    MO_PLURAL: сарууд
+    YR_PLURAL: жилүүд
+    DEC_PLURAL: арван жилүүд
+  FORM:
+    VALIDATION_FAIL: '<b>Баталгаажуулалт амжилтгүй боллоо:</b>'
+    INVALID_INPUT: 'Буруу өгөгдөл дараахид'
+    MISSING_REQUIRED_FIELD: 'Шаардлагатай талбар дутуу байна:'
+    XSS_ISSUES: "'%s' талбарт XSS -ийн болзошгүй асуудлууд илэрсэн"
+  MONTHS_OF_THE_YEAR:
+    - '1-р сар'
+    - '2-р сар'
+    - '3-р сар'
+    - '4-р сар'
+    - '5 сар'
+    - '6 сар'
+    - '7 сар'
+    - '8 сар'
+    - '9 сар'
+    - '10 сар'
+    - '11 сар'
+    - '12 сар'
+  DAYS_OF_THE_WEEK:
+    - 'Даваа гараг'
+    - 'Мягмар гараг'
+    - 'Лхагва гараг'
+    - 'Пүрэв гараг'
+    - 'Баасан гараг'
+    - 'Бямба гараг'
+    - 'Ням гараг'
+  YES: "Тийм"
+  NO: "Үгүй"
+  CRON:
+    EVERY: бүрийн
+    EVERY_HOUR: цаг бүрийн
+    EVERY_MINUTE: минут бүрийн
+    EVERY_DAY_OF_WEEK: долоо хоногийн өдөр болгонд
+    EVERY_DAY_OF_MONTH: сарын өдөр болгонд
+    EVERY_MONTH: сар болгон
+    TEXT_PERIOD: Бүрийн  <b />
+    TEXT_MINS: '  <b /> энэ сүүлийн цагийн минутад'
+    TEXT_TIME: '  <b />:<b /> -д'
+    TEXT_DOW: '  <b /> -д'
+    TEXT_MONTH: '  <b /> -ын'
+    TEXT_DOM: '  <b /> -т'
+    ERROR1: '%s -н утга нь дэмжигддэггүй!'
+    ERROR2: Элементүүдийн тоо хэмжээ буруу
+    ERROR3: jquery_element нь jqCron тохиргоонд хийгдсэн байх ёстой
+    ERROR4: Танигдаагүй илэрхийлэл
diff --git a/system/languages/nl.yaml b/system/languages/nl.yaml
index 9706d03e5b..bd0aed9151 100644
--- a/system/languages/nl.yaml
+++ b/system/languages/nl.yaml
@@ -101,8 +101,8 @@ GRAV:
     YR_PLURAL: jaren
     DEC_PLURAL: decennia
   FORM:
-    VALIDATION_FAIL: <b>Validatie mislukt:</b>
-    INVALID_INPUT: Ongeldige invoer in
+    VALIDATION_FAIL: '<b>Validatie mislukt:</b>'
+    INVALID_INPUT: 'Ongeldige invoer in'
     MISSING_REQUIRED_FIELD: 'Ontbrekend verplicht veld:'
   MONTHS_OF_THE_YEAR:
     - 'Januari'
diff --git a/system/languages/no.yaml b/system/languages/no.yaml
index 5b57938e30..2a93e6efac 100644
--- a/system/languages/no.yaml
+++ b/system/languages/no.yaml
@@ -21,6 +21,7 @@ GRAV:
     BAD_DATE: Ugyldig dato
     AGO: siden
     FROM_NOW: fra nå
+    JUST_NOW: akkurat nå
     SECOND: sekund
     MINUTE: minutt
     HOUR: time
@@ -51,8 +52,8 @@ GRAV:
     YR_PLURAL: år
     DEC_PLURAL: årtier
   FORM:
-    VALIDATION_FAIL: <b>Godkjenning mislyktes:</b>
-    INVALID_INPUT: Ugyldig innhold i
+    VALIDATION_FAIL: '<b>Godkjenning mislyktes:</b>'
+    INVALID_INPUT: 'Ugyldig innhold i'
     MISSING_REQUIRED_FIELD: 'Mangler påkrevd felt:'
   MONTHS_OF_THE_YEAR:
     - 'januar'
@@ -75,3 +76,7 @@ GRAV:
     - 'fredag'
     - 'lørdag'
     - 'søndag'
+  CRON:
+    EVERY: hver
+    EVERY_HOUR: hver time
+    EVERY_MINUTE: hvert minutt
diff --git a/system/languages/pl.yaml b/system/languages/pl.yaml
index bf6fe37128..6da24e5a65 100644
--- a/system/languages/pl.yaml
+++ b/system/languages/pl.yaml
@@ -1,11 +1,32 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Nieprawidłowy Frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_SINGULAR:
+    '/(alias|status)es$/i': '\1'
+  INFLECTOR_UNCOUNTABLE:
+    - 'wyposażenie'
+    - 'informacja'
+    - 'rice'
+    - 'pieniądze'
+    - 'species'
+    - 'series'
+    - 'ryba'
+    - 'owca'
+  INFLECTOR_IRREGULAR:
+    'person': 'człowiek'
+    'man': 'mężczyźni'
+    'child': 'dzieci'
+    'sex': 'płci'
+  INFLECTOR_ORDINALS:
+    'first': 'pierwszy'
+    'second': 'drugi'
+    'third': 'trzeci'
   NICETIME:
     NO_DATE_PROVIDED: Nie podano daty
     BAD_DATE: Zła data
     AGO: temu
     FROM_NOW: od teraz
+    JUST_NOW: właśnie teraz
     SECOND: sekunda
     MINUTE: minuta
     HOUR: godzina
@@ -15,6 +36,7 @@ GRAV:
     YEAR: rok
     DECADE: dekada
     SEC: sek
+    MIN: minuta
     HR: godz
     WK: tydz
     MO: m-c
@@ -36,9 +58,10 @@ GRAV:
     YR_PLURAL: lat
     DEC_PLURAL: dekad
   FORM:
-    VALIDATION_FAIL: <b>Weryfikacja nie powiodła się:</b>
-    INVALID_INPUT: Nieprawidłowe dane wejściowe
+    VALIDATION_FAIL: '<b>Weryfikacja nie powiodła się:</b>'
+    INVALID_INPUT: 'Nieprawidłowe dane wejściowe'
     MISSING_REQUIRED_FIELD: 'Opuszczono wymagane pole:'
+    XSS_ISSUES: "Potencjalne problemy XSS wykryte w polu '%s'"
   MONTHS_OF_THE_YEAR:
     - 'Styczeń'
     - 'Luty'
@@ -60,3 +83,18 @@ GRAV:
     - 'Piątek'
     - 'Sobota'
     - 'Niedziela'
+  YES: "Tak"
+  NO: "Nie"
+  CRON:
+    EVERY: każdy
+    EVERY_HOUR: każdą godzinę
+    EVERY_MINUTE: każdą minutę
+    EVERY_DAY_OF_WEEK: każdego dnia tygodnia
+    EVERY_DAY_OF_MONTH: każdego dnia miesiące
+    EVERY_MONTH: każdego miesiąca
+    TEXT_PERIOD: Każdego <b />
+    TEXT_MINS: 'o <b /> minut po godzinie'
+    TEXT_TIME: 'o <b />:<b />'
+    ERROR1: Znacznik %s nie jest wspierany!
+    ERROR2: Nieprawidłowa liczba elementów
+    ERROR4: Wyrażenie nierozpoznane
diff --git a/system/languages/pt.yaml b/system/languages/pt.yaml
index 590b5e5814..daaa616d0f 100644
--- a/system/languages/pt.yaml
+++ b/system/languages/pt.yaml
@@ -1,8 +1,75 @@
 ---
 GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Erro: Frontmatter Inválido\n\nLocalização: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipamento'
+    - 'informação'
+    - 'arroz'
+    - 'dinheiro'
+    - 'espécie'
+    - 'série'
+    - 'peixe'
+    - 'ovelha'
+  INFLECTOR_IRREGULAR:
+    'person': 'pessoas'
+    'man': 'homens'
+    'child': 'crianças'
+    'sex': 'sexos'
+    'move': 'movimentos'
+  INFLECTOR_ORDINALS:
+    'default': 'º'
+    'first': 'º'
+    'second': 'º'
+    'third': 'º'
   NICETIME:
     NO_DATE_PROVIDED: Nenhuma data fornecida
+    BAD_DATE: Data inválida
     AGO: atrás
+    FROM_NOW: a partir de agora
+    JUST_NOW: mesmo agora
     SECOND: segundo
     MINUTE: minuto
     HOUR: hora
@@ -11,17 +78,33 @@ GRAV:
     MONTH: mês
     YEAR: ano
     DECADE: década
-    SEC: segundos
-    MIN: minutos
+    SEC: seg
+    MIN: min
+    HR: hora
+    WK: semana
+    MO: mês
+    YR: ano
+    DEC: década
+    SECOND_PLURAL: segundos
     MINUTE_PLURAL: minutos
+    HOUR_PLURAL: horas
     DAY_PLURAL: dias
     WEEK_PLURAL: semanas
     MONTH_PLURAL: meses
     YEAR_PLURAL: anos
-    DECADE_PLURAL: decadas
+    DECADE_PLURAL: décadas
+    SEC_PLURAL: segs
+    MIN_PLURAL: mins
+    HR_PLURAL: hrs
+    WK_PLURAL: sems
+    MO_PLURAL: meses
+    YR_PLURAL: anos
+    DEC_PLURAL: décadas
   FORM:
-    VALIDATION_FAIL: <b>Falha na validação!</b>
-    MISSING_REQUIRED_FIELD: 'Campo obrigatório requerido:'
+    VALIDATION_FAIL: '<b>Falha na validação:</b>'
+    INVALID_INPUT: 'Dados inseridos são inválidos em'
+    MISSING_REQUIRED_FIELD: 'Campo obrigatório em falta:'
+    XSS_ISSUES: "Potenciais problemas de XSS detectados no campo '%s'"
   MONTHS_OF_THE_YEAR:
     - 'Janeiro'
     - 'Fevereiro'
@@ -35,12 +118,30 @@ GRAV:
     - 'Outubro'
     - 'Novembro'
     - 'Dezembro'
-  INFLECTOR_UNCOUNTABLE:
-    - 'equipment'
-    - 'information'
-    - 'arroz'
-    - 'money'
-    - 'species'
-    - 'series'
-    - 'fish'
-    - 'sheep'
+  DAYS_OF_THE_WEEK:
+    - 'Segunda-feira'
+    - 'Terça-feira'
+    - 'Quarta-feira'
+    - 'Quinta-feira'
+    - 'Sexta-feira'
+    - 'Sábado'
+    - 'Domingo'
+  YES: "Sim"
+  NO: "Não"
+  CRON:
+    EVERY: cada
+    EVERY_HOUR: cada hora
+    EVERY_MINUTE: cada minuto
+    EVERY_DAY_OF_WEEK: todos os dias da semana
+    EVERY_DAY_OF_MONTH: todos os dias do mês
+    EVERY_MONTH: todos os meses
+    TEXT_PERIOD: Cada <b />
+    TEXT_MINS: ' em <b /> minuto(s) após a hora'
+    TEXT_TIME: ' em <b />:<b />'
+    TEXT_DOW: ' em <b />'
+    TEXT_MONTH: ' de <b />'
+    TEXT_DOM: ' em <b />'
+    ERROR1: A tag %s não é suportada!
+    ERROR2: Número de elementos inválido
+    ERROR3: O jquery_element deve ser definido nas configurações do jqCron
+    ERROR4: Expressão não reconhecida
diff --git a/system/languages/ro.yaml b/system/languages/ro.yaml
index 5bee578c93..dc22b206f7 100644
--- a/system/languages/ro.yaml
+++ b/system/languages/ro.yaml
@@ -53,8 +53,8 @@ GRAV:
     YR_PLURAL: ani
     DEC_PLURAL: decenii
   FORM:
-    VALIDATION_FAIL: <b>Validare nereușită</b>
-    INVALID_INPUT: Date incorecte în
+    VALIDATION_FAIL: '<b>Validare nereușită</b>'
+    INVALID_INPUT: 'Date incorecte în'
     MISSING_REQUIRED_FIELD: 'Câmp obligatoriu lipsă:'
   MONTHS_OF_THE_YEAR:
     - 'Ianuarie'
diff --git a/system/languages/ru.yaml b/system/languages/ru.yaml
index 78c596340a..2097ada48b 100644
--- a/system/languages/ru.yaml
+++ b/system/languages/ru.yaml
@@ -13,7 +13,7 @@ GRAV:
   INFLECTOR_IRREGULAR:
     'person': 'люди'
     'man': 'человек'
-    'child': 'ребенок'
+    'child': 'дети'
     'sex': 'пол'
     'move': 'движется'
   INFLECTOR_ORDINALS:
@@ -58,9 +58,10 @@ GRAV:
     YR_PLURAL: г
     DEC_PLURAL: дстлт
   FORM:
-    VALIDATION_FAIL: <b>Проверка не удалась:</b>
-    INVALID_INPUT: Неверный ввод в
+    VALIDATION_FAIL: '<b>Проверка не удалась:</b>'
+    INVALID_INPUT: 'Неверный ввод в'
     MISSING_REQUIRED_FIELD: 'Отсутствует необходимое поле:'
+    XSS_ISSUES: "Обнаружены потенциальные XSS проблемы в поле '%s'"
   MONTHS_OF_THE_YEAR:
     - 'январь'
     - 'февраль'
@@ -68,12 +69,12 @@ GRAV:
     - 'апрель'
     - 'май'
     - 'июнь'
-    - 'Июль'
-    - 'Август'
-    - 'Сентябрь'
-    - 'Октябрь'
-    - 'Ноябрь'
-    - 'Декабрь'
+    - 'июль'
+    - 'август'
+    - 'сентябрь'
+    - 'октябрь'
+    - 'ноябрь'
+    - 'декабрь'
   DAYS_OF_THE_WEEK:
     - 'понедельник'
     - 'вторник'
@@ -82,6 +83,8 @@ GRAV:
     - 'пятница'
     - 'суббота'
     - 'воскресенье'
+  YES: "Да"
+  NO: "Нет"
   CRON:
     EVERY: раз в
     EVERY_HOUR: раз в час
diff --git a/system/languages/si.yaml b/system/languages/si.yaml
new file mode 100644
index 0000000000..18850a4e01
--- /dev/null
+++ b/system/languages/si.yaml
@@ -0,0 +1,9 @@
+---
+GRAV:
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/(x|ch|ss|sh)es$/i': '\1'
diff --git a/system/languages/sk.yaml b/system/languages/sk.yaml
index 89a7f563e2..9543239a6b 100644
--- a/system/languages/sk.yaml
+++ b/system/languages/sk.yaml
@@ -101,8 +101,8 @@ GRAV:
     YR_PLURAL: rokov
     DEC_PLURAL: dekád
   FORM:
-    VALIDATION_FAIL: <b>Overenie zlyhalo:</b>
-    INVALID_INPUT: Neplatný vstup v
+    VALIDATION_FAIL: '<b>Overenie zlyhalo:</b>'
+    INVALID_INPUT: 'Neplatný vstup v'
     MISSING_REQUIRED_FIELD: 'Chýba vyžadované pole:'
   MONTHS_OF_THE_YEAR:
     - 'Január'
diff --git a/system/languages/sl.yaml b/system/languages/sl.yaml
index ae6032cf7d..879fe1baeb 100644
--- a/system/languages/sl.yaml
+++ b/system/languages/sl.yaml
@@ -36,8 +36,8 @@ GRAV:
     YR_PLURAL: l
     DEC_PLURAL: des
   FORM:
-    VALIDATION_FAIL: <b>Preverjanje veljavnosti ni uspelo:</b>
-    INVALID_INPUT: Neveljaven vnos v
+    VALIDATION_FAIL: '<b>Preverjanje veljavnosti ni uspelo:</b>'
+    INVALID_INPUT: 'Neveljaven vnos v'
     MISSING_REQUIRED_FIELD: 'Manjka obvezno polje:'
   MONTHS_OF_THE_YEAR:
     - 'Januar'
diff --git a/system/languages/sr.yaml b/system/languages/sr.yaml
new file mode 100644
index 0000000000..3368bdfb63
--- /dev/null
+++ b/system/languages/sr.yaml
@@ -0,0 +1,144 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nнаслов: %1$s\n---\n\n# Грешка: неисправан Frontmatter\n\nПутања: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'опрема'
+    - 'информација'
+    - 'пиринач'
+    - 'новац'
+    - 'врсте'
+    - 'серије'
+    - 'риба'
+    - 'овца'
+  INFLECTOR_IRREGULAR:
+    'person': 'особе'
+    'man': 'људи'
+    'child': 'деца'
+    'sex': 'полови'
+    'move': 'помери'
+  INFLECTOR_ORDINALS:
+    'default': 'ти'
+    'first': 'први'
+    'second': 'други'
+    'third': 'трећи'
+  NICETIME:
+    NO_DATE_PROVIDED: Нема датума
+    BAD_DATE: Погрешан датум
+    AGO: од пре
+    FROM_NOW: од сада
+    JUST_NOW: управо сада
+    SECOND: секунда
+    MINUTE: минута
+    HOUR: сат
+    DAY: дан
+    WEEK: недеља
+    MONTH: месец
+    YEAR: година
+    DECADE: декада
+    SEC: сек
+    MIN: мин
+    HR: сат
+    WK: нед
+    MO: мес
+    YR: год
+    DEC: дек
+    SECOND_PLURAL: секунди
+    MINUTE_PLURAL: минута
+    HOUR_PLURAL: сати
+    DAY_PLURAL: дана
+    WEEK_PLURAL: недеља
+    MONTH_PLURAL: месеци
+    YEAR_PLURAL: године(а)
+    DECADE_PLURAL: декаде(а)
+    SEC_PLURAL: сек
+    MIN_PLURAL: мин
+    HR_PLURAL: сати
+    WK_PLURAL: недеља
+    MO_PLURAL: месеци
+    YR_PLURAL: година
+    DEC_PLURAL: декада
+  FORM:
+    VALIDATION_FAIL: '<b>Провера неуспела:</b>'
+    INVALID_INPUT: 'Неисправан унос у'
+    MISSING_REQUIRED_FIELD: 'Недостаје обавезн поље:'
+  MONTHS_OF_THE_YEAR:
+    - 'Јануар'
+    - 'Фебруар'
+    - 'Март'
+    - 'Април'
+    - 'Мај'
+    - 'Јуни'
+    - 'Јули'
+    - 'Август'
+    - 'Септембар'
+    - 'Октобар'
+    - 'Новембар'
+    - 'Децембар'
+  DAYS_OF_THE_WEEK:
+    - 'Понедељак'
+    - 'Уторак'
+    - 'Среда'
+    - 'Четвртак'
+    - 'Петак'
+    - 'Субота'
+    - 'Недеља'
+  CRON:
+    EVERY: сваки
+    EVERY_HOUR: сваки сат
+    EVERY_MINUTE: сваки минут
+    EVERY_DAY_OF_WEEK: сваки дан у недељи
+    EVERY_DAY_OF_MONTH: сваки дан у месецу
+    EVERY_MONTH: сваки месец
+    TEXT_PERIOD: Сваки <b />
+    TEXT_MINS: ' у <b /> минути(а) прошлог сата'
+    TEXT_TIME: ' у <b />:<b />'
+    TEXT_DOW: ' на <b />'
+    TEXT_MONTH: ' од <b />'
+    TEXT_DOM: ' на <b />'
+    ERROR1: Таг %s није подржан!
+    ERROR2: Погрешан број елемената
+    ERROR3: јquery_element би требао да буде постављен у jqCron подешавању
+    ERROR4: Непрепознат израз
diff --git a/system/languages/sv.yaml b/system/languages/sv.yaml
index 16afa16508..bf76beff5a 100644
--- a/system/languages/sv.yaml
+++ b/system/languages/sv.yaml
@@ -12,11 +12,21 @@ GRAV:
     - 'får'
   INFLECTOR_IRREGULAR:
     'person': 'personer'
+    'man': 'män'
+    'child': 'barn'
+    'sex': 'kön'
+    'move': 'flytta'
+  INFLECTOR_ORDINALS:
+    'default': ':e'
+    'first': ':a'
+    'second': ':a'
+    'third': ':e'
   NICETIME:
     NO_DATE_PROVIDED: Inget datum har angivits
     BAD_DATE: Ogiltigt datum
     AGO: sedan
     FROM_NOW: fr.o.m nu
+    JUST_NOW: just nu
     SECOND: sekund
     MINUTE: minut
     HOUR: timme
@@ -26,10 +36,12 @@ GRAV:
     YEAR: år
     DECADE: årtionde
     SEC: sek
+    MIN: min
     HR: t
     WK: v
     MO: m
     YR: år
+    DEC: dec
     SECOND_PLURAL: sekunder
     MINUTE_PLURAL: minuter
     HOUR_PLURAL: timmar
@@ -46,8 +58,8 @@ GRAV:
     YR_PLURAL: år
     DEC_PLURAL: dec
   FORM:
-    VALIDATION_FAIL: <b>Kontrollen misslyckades:</b>
-    INVALID_INPUT: Ogiltig indata i
+    VALIDATION_FAIL: '<b>Kontrollen misslyckades:</b>'
+    INVALID_INPUT: 'Ogiltig indata i'
     MISSING_REQUIRED_FIELD: 'Obligatoriskt fält måste fyllas i:'
   MONTHS_OF_THE_YEAR:
     - 'Januari'
@@ -70,3 +82,19 @@ GRAV:
     - 'Fredag'
     - 'Lördag'
     - 'Söndag'
+  CRON:
+    EVERY: varje
+    EVERY_HOUR: varje timme
+    EVERY_MINUTE: varje minut
+    EVERY_DAY_OF_WEEK: varje veckodag
+    EVERY_DAY_OF_MONTH: alla månadens dagar
+    EVERY_MONTH: varje månad
+    TEXT_PERIOD: Varje <b />
+    TEXT_MINS: ' timmens <b />:e minut'
+    TEXT_TIME: ' kl <b />:<b />'
+    TEXT_DOW: ' <b />'
+    TEXT_MONTH: ' <b />'
+    TEXT_DOM: ' <b />'
+    ERROR1: Taggen %s stöds inte!
+    ERROR2: Ogiltigt antal element
+    ERROR4: Uttrycket känns inte igen
diff --git a/system/languages/th.yaml b/system/languages/th.yaml
index e6ccfaba58..f71b0371bc 100644
--- a/system/languages/th.yaml
+++ b/system/languages/th.yaml
@@ -31,7 +31,7 @@ GRAV:
     YR_PLURAL: ปี
   FORM:
     VALIDATION_FAIL: '<b>ตรวจสอบล้มเหลว: </b>'
-    INVALID_INPUT: ป้อนข้อมูลไม่ถูกต้องใน
+    INVALID_INPUT: 'ป้อนข้อมูลไม่ถูกต้องใน'
     MISSING_REQUIRED_FIELD: 'ขาดข้อมูลที่จำเป็น:'
   MONTHS_OF_THE_YEAR:
     - 'มกราคม'
diff --git a/system/languages/tr.yaml b/system/languages/tr.yaml
index 2143f319cc..47f32dbe83 100644
--- a/system/languages/tr.yaml
+++ b/system/languages/tr.yaml
@@ -1,11 +1,32 @@
 ---
 GRAV:
   FRONTMATTER_ERROR_PAGE: "---\nBaşlık: %1$s\n---\n\n# Hata: Geçersiz Önbölüm\n\nYol: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'ekipman'
+    - 'bilgi'
+    - 'pirinç'
+    - 'para'
+    - 'türler'
+    - 'seriler'
+    - 'balık'
+    - 'koyun'
+  INFLECTOR_IRREGULAR:
+    'person': 'kişi'
+    'man': 'erkek'
+    'child': 'çocuklar'
+    'sex': 'cinsiyet'
+    'move': 'taşınmış'
+  INFLECTOR_ORDINALS:
+    'default': '#F'
+    'first': ' 1.'
+    'second': ' 2.'
+    'third': ' 3.'
   NICETIME:
     NO_DATE_PROVIDED: Sağlanan tarih yok
     BAD_DATE: Yanlış tarih
     AGO: önce
     FROM_NOW: şu andan itibaren
+    JUST_NOW: şimdi
     SECOND: saniye
     MINUTE: dakika
     HOUR: saat
@@ -37,8 +58,8 @@ GRAV:
     YR_PLURAL: yıl
     DEC_PLURAL: onyl
   FORM:
-    VALIDATION_FAIL: <b>Doğrulama başarısız:</b>
-    INVALID_INPUT: Geçersiz bilgi girişi
+    VALIDATION_FAIL: '<b>Doğrulama başarısız:</b>'
+    INVALID_INPUT: 'Geçersiz bilgi girişi'
     MISSING_REQUIRED_FIELD: 'Gerekli alan eksik:'
   MONTHS_OF_THE_YEAR:
     - 'Ocak'
@@ -61,3 +82,19 @@ GRAV:
     - 'Cuma'
     - 'Cumartesi'
     - 'Pazar'
+  YES: "Evet"
+  NO: "Hayır"
+  CRON:
+    EVERY: her
+    EVERY_HOUR: saatte bir
+    EVERY_MINUTE: dakikada bir
+    EVERY_DAY_OF_WEEK: haftanın her günü
+    EVERY_DAY_OF_MONTH: ayın her günü
+    EVERY_MONTH: her ay
+    TEXT_PERIOD: Her <b />
+    TEXT_MINS: ' saatin <b /> dakikasında'
+    TEXT_TIME: ' da'
+    ERROR1: Etiket %s desteklenmiyor!
+    ERROR2: Kötü eleman sayısı
+    ERROR3: jquery_element jqCron ayarları içinde tanımlanmalı
+    ERROR4: Tanınmayan ifade
diff --git a/system/languages/uk.yaml b/system/languages/uk.yaml
index d264fbadaf..8a138a483c 100644
--- a/system/languages/uk.yaml
+++ b/system/languages/uk.yaml
@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: рр.
     DEC_PLURAL: рр.
   FORM:
-    VALIDATION_FAIL: <b>Перевірка не вдалася:</b>
-    INVALID_INPUT: Невірне введення в
+    VALIDATION_FAIL: '<b>Перевірка не вдалася:</b>'
+    INVALID_INPUT: 'Невірне введення в'
     MISSING_REQUIRED_FIELD: 'Відсутнє обов''язкове поле:'
   MONTHS_OF_THE_YEAR:
     - 'Січень'
diff --git a/system/languages/vi.yaml b/system/languages/vi.yaml
index 0dc7e929f3..9e3a0f46bc 100644
--- a/system/languages/vi.yaml
+++ b/system/languages/vi.yaml
@@ -37,8 +37,8 @@ GRAV:
     YR_PLURAL: năm
     DEC_PLURAL: thập kỷ
   FORM:
-    VALIDATION_FAIL: <b>Xác nhận thất bại:</b>
-    INVALID_INPUT: Dữ liệu nhập không hợp lệ cho
+    VALIDATION_FAIL: '<b>Xác nhận thất bại:</b>'
+    INVALID_INPUT: 'Dữ liệu nhập không hợp lệ cho'
     MISSING_REQUIRED_FIELD: 'Thiếu trường bắt buộc:'
   MONTHS_OF_THE_YEAR:
     - 'Tháng 1'
diff --git a/system/languages/zh-cn.yaml b/system/languages/zh-cn.yaml
new file mode 100644
index 0000000000..334b0b41c9
--- /dev/null
+++ b/system/languages/zh-cn.yaml
@@ -0,0 +1,144 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\n标题: %1$s\n---\n\n# 错误：无效参数\n\n位置： `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - '装备'
+    - '信息'
+    - '大米'
+    - '钱'
+    - '物种'
+    - '系列'
+    - '鱼'
+    - '羊'
+  INFLECTOR_IRREGULAR:
+    'person': '人员'
+    'man': '男人'
+    'child': '儿童'
+    'sex': '性别'
+    'move': '移动'
+  INFLECTOR_ORDINALS:
+    'default': 'th'
+    'first': 'st'
+    'second': 'md'
+    'third': 'rd'
+  NICETIME:
+    NO_DATE_PROVIDED: 无日期信息
+    BAD_DATE: 无效日期
+    AGO: 前
+    FROM_NOW: 距今
+    JUST_NOW: 刚刚
+    SECOND: 秒
+    MINUTE: 分钟
+    HOUR: 小时
+    DAY: 天
+    WEEK: 周
+    MONTH: 月
+    YEAR: 年
+    DECADE: 十年
+    SEC: 秒
+    MIN: 分钟
+    HR: 小时
+    WK: 周
+    MO: 月
+    YR: 年
+    DEC: 年代
+    SECOND_PLURAL: 秒
+    MINUTE_PLURAL: 分
+    HOUR_PLURAL: 小时
+    DAY_PLURAL: 天
+    WEEK_PLURAL: 周
+    MONTH_PLURAL: 月
+    YEAR_PLURAL: 年
+    DECADE_PLURAL: 十年
+    SEC_PLURAL: 秒
+    MIN_PLURAL: 分
+    HR_PLURAL: 时
+    WK_PLURAL: 周
+    MO_PLURAL: 月
+    YR_PLURAL: 年
+    DEC_PLURAL: 年代
+  FORM:
+    VALIDATION_FAIL: '<b>验证失败：</b>'
+    INVALID_INPUT: '无效输入'
+    MISSING_REQUIRED_FIELD: '必填字段缺失：'
+  MONTHS_OF_THE_YEAR:
+    - '1月'
+    - '2月'
+    - '3月'
+    - '4月'
+    - '5月'
+    - '6月'
+    - '7月'
+    - '8月'
+    - '9月'
+    - '10月'
+    - '11月'
+    - '12月'
+  DAYS_OF_THE_WEEK:
+    - '星期一'
+    - '星期二'
+    - '星期三'
+    - '星期四'
+    - '星期五'
+    - '星期六'
+    - '星期日'
+  CRON:
+    EVERY: 每隔
+    EVERY_HOUR: 每小时
+    EVERY_MINUTE: 每分钟
+    EVERY_DAY_OF_WEEK: 一周中的每一天
+    EVERY_DAY_OF_MONTH: 月份中的每一天
+    EVERY_MONTH: 每月
+    TEXT_PERIOD: 所有 <b />
+    TEXT_MINS: ' 在 <b /> 小时过后的分钟'
+    TEXT_TIME: ' 在 <b />:<b />'
+    TEXT_DOW: ' on <b />'
+    TEXT_MONTH: ' of <b />'
+    TEXT_DOM: ' on <b />'
+    ERROR1: 不支持分享类型 %s
+    ERROR2: 无效数字
+    ERROR3: 请在 jqCron 设置中设定 jquery_element
+    ERROR4: 无法识别表达式
diff --git a/system/languages/zh-tw.yaml b/system/languages/zh-tw.yaml
index 6cb39c9ad9..fefbc3317b 100644
--- a/system/languages/zh-tw.yaml
+++ b/system/languages/zh-tw.yaml
@@ -38,7 +38,9 @@ GRAV:
     YR_PLURAL: 年
     DEC_PLURAL: 十年
   FORM:
-    MISSING_REQUIRED_FIELD: 遺漏必填欄位：
+    VALIDATION_FAIL: '<b>確驗證失敗：</b>'
+    INVALID_INPUT: '無效輸入：'
+    MISSING_REQUIRED_FIELD: '遺漏必填欄位：'
   MONTHS_OF_THE_YEAR:
     - '一月'
     - '二月'
@@ -60,3 +62,16 @@ GRAV:
     - '星期五'
     - '星期六'
     - '星期日'
+  CRON:
+    EVERY: 每
+    EVERY_HOUR: 每小時
+    EVERY_MINUTE: 每分鐘
+    EVERY_DAY_OF_WEEK: 每一天
+    EVERY_DAY_OF_MONTH: 每一天
+    EVERY_MONTH: 每個月
+    TEXT_PERIOD: 每 <b />
+    TEXT_MINS: ' 的 <b /> 分'
+    TEXT_TIME: ' <b />:<b />'
+    TEXT_DOW: ' 的 <b />'
+    TEXT_MONTH: ' 的 <b />'
+    TEXT_DOM: ' 的 <b />'
diff --git a/system/languages/zh.yaml b/system/languages/zh.yaml
index 4912aa9ed8..334b0b41c9 100644
--- a/system/languages/zh.yaml
+++ b/system/languages/zh.yaml
@@ -101,9 +101,9 @@ GRAV:
     YR_PLURAL: 年
     DEC_PLURAL: 年代
   FORM:
-    VALIDATION_FAIL: <b>验证失败：</b>
-    INVALID_INPUT: 无效输入
-    MISSING_REQUIRED_FIELD: 必填字段缺失：
+    VALIDATION_FAIL: '<b>验证失败：</b>'
+    INVALID_INPUT: '无效输入'
+    MISSING_REQUIRED_FIELD: '必填字段缺失：'
   MONTHS_OF_THE_YEAR:
     - '1月'
     - '2月'
diff --git a/system/pages/notfound.md b/system/pages/notfound.md
index ca7d3ded75..92286644a4 100644
--- a/system/pages/notfound.md
+++ b/system/pages/notfound.md
@@ -2,4 +2,5 @@
 title: Not Found
 routable: false
 notfound: true
+expires: 0
 ---
diff --git a/system/router.php b/system/router.php
index 5e3c477915..c19f814ba8 100644
--- a/system/router.php
+++ b/system/router.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,13 +13,31 @@
 
 $_SERVER['PHP_CLI_ROUTER'] = true;
 
-if (is_file($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $_SERVER['SCRIPT_NAME'])) {
-    return false;
+$root = $_SERVER['DOCUMENT_ROOT'];
+$path = $_SERVER['SCRIPT_NAME'];
+if ($path !== '/index.php' && is_file($root . $path)) {
+    if (!(
+        // Block all direct access to files and folders beginning with a dot
+        strpos($path, '/.') !== false
+        // Block all direct access for these folders
+        || preg_match('`^/(\.git|cache|bin|logs|backup|webserver-configs|tests)/`ui', $path)
+        // Block access to specific file types for these system folders
+        || preg_match('`^/(system|vendor)/(.*)\.(txt|xml|md|html|json|yaml|yml|php|pl|py|cgi|twig|sh|bat)$`ui', $path)
+        // Block access to specific file types for these user folders
+        || preg_match('`^/(user)/(.*)\.(txt|md|json|yaml|yml|php|pl|py|cgi|twig|sh|bat)$`ui', $path)
+        // Block all direct access to .md files
+        || preg_match('`\.md$`ui', $path)
+        // Block access to specific files in the root folder
+        || preg_match('`^/(LICENSE\.txt|composer\.lock|composer\.json|\.htaccess)$`ui', $path)
+    )) {
+        return false;
+    }
 }
 
 $grav_index = 'index.php';
 
 /* Check the GRAV_BASEDIR environment variable and use if set */
+
 $grav_basedir = getenv('GRAV_BASEDIR') ?: '';
 if ($grav_basedir) {
     $grav_index = ltrim($grav_basedir, '/') . DIRECTORY_SEPARATOR . $grav_index;
diff --git a/system/src/DOMLettersIterator.php b/system/src/DOMLettersIterator.php
new file mode 100644
index 0000000000..e3c2c4ad96
--- /dev/null
+++ b/system/src/DOMLettersIterator.php
@@ -0,0 +1,165 @@
+<?php
+
+/**
+ * Iterates individual characters (Unicode codepoints) of DOM text and CDATA nodes
+ * while keeping track of their position in the document.
+ *
+ * Example:
+ *
+ *  $doc = new DOMDocument();
+ *  $doc->load('example.xml');
+ *  foreach(new DOMLettersIterator($doc) as $letter) echo $letter;
+ *
+ * NB: If you only need characters without their position
+ *     in the document, use DOMNode->textContent instead.
+ *
+ * @author porneL http://pornel.net
+ * @license Public Domain
+ * @url https://github.com/antoligy/dom-string-iterators
+ *
+ * @implements Iterator<int,string>
+ */
+final class DOMLettersIterator implements Iterator
+{
+    /** @var DOMElement */
+    private $start;
+    /** @var DOMElement|null */
+    private $current;
+    /** @var int */
+    private $offset = -1;
+    /** @var int|null */
+    private $key;
+    /** @var array<int,string>|null */
+    private $letters;
+
+    /**
+     * expects DOMElement or DOMDocument (see DOMDocument::load and DOMDocument::loadHTML)
+     *
+     * @param DOMNode $el
+     */
+    public function __construct(DOMNode $el)
+    {
+        if ($el instanceof DOMDocument) {
+            $el = $el->documentElement;
+        }
+
+        if (!$el instanceof DOMElement) {
+            throw new InvalidArgumentException('Invalid arguments, expected DOMElement or DOMDocument');
+        }
+
+        $this->start = $el;
+    }
+
+    /**
+     * Returns position in text as DOMText node and character offset.
+     * (it's NOT a byte offset, you must use mb_substr() or similar to use this offset properly).
+     * node may be NULL if iterator has finished.
+     *
+     * @return array
+     */
+    public function currentTextPosition(): array
+    {
+        return [$this->current, $this->offset];
+    }
+
+    /**
+     * Returns DOMElement that is currently being iterated or NULL if iterator has finished.
+     *
+     * @return DOMElement|null
+     */
+    public function currentElement(): ?DOMElement
+    {
+        return $this->current ? $this->current->parentNode : null;
+    }
+
+    // Implementation of Iterator interface
+
+    /**
+     * @return int|null
+     */
+    public function key(): ?int
+    {
+        return $this->key;
+    }
+
+    /**
+     * @return void
+     */
+    public function next(): void
+    {
+        if (null === $this->current) {
+            return;
+        }
+
+        if ($this->current->nodeType === XML_TEXT_NODE || $this->current->nodeType === XML_CDATA_SECTION_NODE) {
+            if ($this->offset === -1) {
+                preg_match_all('/./us', $this->current->textContent, $m);
+                $this->letters = $m[0];
+            }
+
+            $this->offset++;
+            $this->key++;
+            if ($this->letters && $this->offset < count($this->letters)) {
+                return;
+            }
+
+            $this->offset = -1;
+        }
+
+        while ($this->current->nodeType === XML_ELEMENT_NODE && $this->current->firstChild) {
+            $this->current = $this->current->firstChild;
+            if ($this->current->nodeType === XML_TEXT_NODE || $this->current->nodeType === XML_CDATA_SECTION_NODE) {
+                $this->next();
+                return;
+            }
+        }
+
+        while (!$this->current->nextSibling && $this->current->parentNode) {
+            $this->current = $this->current->parentNode;
+            if ($this->current === $this->start) {
+                $this->current = null;
+                return;
+            }
+        }
+
+        $this->current = $this->current->nextSibling;
+
+        $this->next();
+    }
+
+    /**
+     * Return the current element
+     * @link https://php.net/manual/en/iterator.current.php
+     *
+     * @return string|null
+     */
+    public function current(): ?string
+    {
+        return $this->letters ? $this->letters[$this->offset] : null;
+    }
+
+    /**
+     * Checks if current position is valid
+     * @link https://php.net/manual/en/iterator.valid.php
+     *
+     * @return bool
+     */
+    public function valid(): bool
+    {
+        return (bool)$this->current;
+    }
+
+    /**
+     * @return void
+     */
+    public function rewind(): void
+    {
+        $this->current = $this->start;
+        $this->offset = -1;
+        $this->key = 0;
+        $this->letters = [];
+
+        $this->next();
+    }
+}
+
diff --git a/system/src/DOMWordsIterator.php b/system/src/DOMWordsIterator.php
new file mode 100644
index 0000000000..fb7c2e3748
--- /dev/null
+++ b/system/src/DOMWordsIterator.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * Iterates individual words of DOM text and CDATA nodes
+ * while keeping track of their position in the document.
+ *
+ * Example:
+ *
+ *  $doc = new DOMDocument();
+ *  $doc->load('example.xml');
+ *  foreach(new DOMWordsIterator($doc) as $word) echo $word;
+ *
+ * @author pjgalbraith http://www.pjgalbraith.com
+ * @author porneL http://pornel.net (based on DOMLettersIterator available at http://pornel.net/source/domlettersiterator.php)
+ * @license Public Domain
+ * @url https://github.com/antoligy/dom-string-iterators
+ *
+ * @implements Iterator<int,string>
+ */
+
+final class DOMWordsIterator implements Iterator
+{
+    /** @var DOMElement */
+    private $start;
+    /** @var DOMElement|null */
+    private $current;
+    /** @var int */
+    private $offset = -1;
+    /** @var int|null */
+    private $key;
+    /** @var array<int,array<int,int|string>>|null */
+    private $words;
+
+    /**
+     * expects DOMElement or DOMDocument (see DOMDocument::load and DOMDocument::loadHTML)
+     *
+     * @param DOMNode $el
+     */
+    public function __construct(DOMNode $el)
+    {
+        if ($el instanceof DOMDocument) {
+            $el = $el->documentElement;
+        }
+
+        if (!$el instanceof DOMElement) {
+            throw new InvalidArgumentException('Invalid arguments, expected DOMElement or DOMDocument');
+        }
+
+        $this->start = $el;
+    }
+
+    /**
+     * Returns position in text as DOMText node and character offset.
+     * (it's NOT a byte offset, you must use mb_substr() or similar to use this offset properly).
+     * node may be NULL if iterator has finished.
+     *
+     * @return array
+     */
+    public function currentWordPosition(): array
+    {
+        return [$this->current, $this->offset, $this->words];
+    }
+
+    /**
+     * Returns DOMElement that is currently being iterated or NULL if iterator has finished.
+     *
+     * @return DOMElement|null
+     */
+    public function currentElement(): ?DOMElement
+    {
+        return $this->current ? $this->current->parentNode : null;
+    }
+
+    // Implementation of Iterator interface
+
+    /**
+     * Return the key of the current element
+     * @link https://php.net/manual/en/iterator.key.php
+     * @return int|null
+     */
+    public function key(): ?int
+    {
+        return $this->key;
+    }
+
+    /**
+     * @return void
+     */
+    public function next(): void
+    {
+        if (null === $this->current) {
+            return;
+        }
+
+        if ($this->current->nodeType === XML_TEXT_NODE || $this->current->nodeType === XML_CDATA_SECTION_NODE) {
+            if ($this->offset === -1) {
+                $this->words = preg_split("/[\n\r\t ]+/", $this->current->textContent, -1, PREG_SPLIT_NO_EMPTY|PREG_SPLIT_OFFSET_CAPTURE) ?: [];
+            }
+            $this->offset++;
+
+            if ($this->words && $this->offset < count($this->words)) {
+                $this->key++;
+                return;
+            }
+            $this->offset = -1;
+        }
+
+        while ($this->current->nodeType === XML_ELEMENT_NODE && $this->current->firstChild) {
+            $this->current = $this->current->firstChild;
+            if ($this->current->nodeType === XML_TEXT_NODE || $this->current->nodeType === XML_CDATA_SECTION_NODE) {
+                $this->next();
+                return;
+            }
+        }
+
+        while (!$this->current->nextSibling && $this->current->parentNode) {
+            $this->current = $this->current->parentNode;
+            if ($this->current === $this->start) {
+                $this->current = null;
+                return;
+            }
+        }
+
+        $this->current = $this->current->nextSibling;
+
+        $this->next();
+    }
+
+    /**
+     * Return the current element
+     * @link https://php.net/manual/en/iterator.current.php
+     * @return string|null
+     */
+    public function current(): ?string
+    {
+        return $this->words ? (string)$this->words[$this->offset][0] : null;
+    }
+
+    /**
+     * Checks if current position is valid
+     * @link https://php.net/manual/en/iterator.valid.php
+     * @return bool
+     */
+    public function valid(): bool
+    {
+        return (bool)$this->current;
+    }
+
+    public function rewind(): void
+    {
+        $this->current = $this->start;
+        $this->offset = -1;
+        $this->key = 0;
+        $this->words = [];
+
+        $this->next();
+    }
+}
diff --git a/system/src/Grav/Common/Assets.php b/system/src/Grav/Common/Assets.php
index 74ba296d00..621a140410 100644
--- a/system/src/Grav/Common/Assets.php
+++ b/system/src/Grav/Common/Assets.php
@@ -3,30 +3,48 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use Closure;
 use Grav\Common\Assets\Pipeline;
 use Grav\Common\Assets\Traits\LegacyAssetsTrait;
 use Grav\Common\Assets\Traits\TestingAssetsTrait;
 use Grav\Common\Config\Config;
 use Grav\Framework\Object\PropertyObject;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function array_slice;
+use function call_user_func_array;
+use function func_get_args;
+use function is_array;
 
+/**
+ * Class Assets
+ * @package Grav\Common
+ */
 class Assets extends PropertyObject
 {
     use TestingAssetsTrait;
     use LegacyAssetsTrait;
 
+    const LINK = 'link';
+    const CSS = 'css';
+    const JS = 'js';
+    const JS_MODULE = 'js_module';
+    const LINK_COLLECTION = 'assets_link';
     const CSS_COLLECTION = 'assets_css';
     const JS_COLLECTION = 'assets_js';
-    const CSS_TYPE = 'Css';
-    const JS_TYPE = 'Js';
-    const INLINE_CSS_TYPE = 'InlineCss';
-    const INLINE_JS_TYPE = 'InlineJs';
+    const JS_MODULE_COLLECTION = 'assets_js_module';
+    const LINK_TYPE = Assets\Link::class;
+    const CSS_TYPE = Assets\Css::class;
+    const JS_TYPE = Assets\Js::class;
+    const JS_MODULE_TYPE = Assets\JsModule::class;
+    const INLINE_CSS_TYPE = Assets\InlineCss::class;
+    const INLINE_JS_TYPE = Assets\InlineJs::class;
+    const INLINE_JS_MODULE_TYPE = Assets\InlineJsModule::class;
 
     /** @const Regex to match CSS and JavaScript files */
     const DEFAULT_REGEX = '/.\.(css|js)$/i';
@@ -37,31 +55,64 @@ class Assets extends PropertyObject
     /** @const Regex to match JavaScript files */
     const JS_REGEX = '/.\.js$/i';
 
+    /** @const Regex to match JavaScriptModyle files */
+    const JS_MODULE_REGEX = '/.\.mjs$/i';
+
+    /** @var string */
     protected $assets_dir;
+    /** @var string */
     protected $assets_url;
 
+    /** @var array */
+    protected $assets_link = [];
+    /** @var array */
     protected $assets_css = [];
+    /** @var array */
     protected $assets_js = [];
+    /** @var array  */
+    protected $assets_js_module = [];
+
 
-    // Config Options
+
+    // Following variables come from the configuration:
+    /** @var bool */
     protected $css_pipeline;
+    /** @var bool */
     protected $css_pipeline_include_externals;
+    /** @var bool */
     protected $css_pipeline_before_excludes;
+    /** @var bool */
     protected $js_pipeline;
+    /** @var bool */
     protected $js_pipeline_include_externals;
+    /** @var bool */
     protected $js_pipeline_before_excludes;
+    /** @var bool */
+    protected $js_module_pipeline;
+    /** @var bool */
+    protected $js_module_pipeline_include_externals;
+    /** @var bool */
+    protected $js_module_pipeline_before_excludes;
+    /** @var array */
     protected $pipeline_options = [];
 
-
+    /** @var Closure|string */
     protected $fetch_command;
+    /** @var string */
     protected $autoload;
+    /** @var bool */
     protected $enable_asset_timestamp;
+    /** @var array|null */
     protected $collections;
+    /** @var string */
     protected $timestamp;
-
+    /** @var array Keeping track for order counts (for sorting) */
+    protected $order = [];
 
     /**
      * Initialization called in the Grav lifecycle to initialize the Assets with appropriate configuration
+     *
+     * @return void
      */
     public function init()
     {
@@ -73,7 +124,7 @@ public function init()
 
         /** @var UniformResourceLocator $locator */
         $locator = $grav['locator'];
-        $this->assets_dir = $locator->findResource('asset://') . DS;
+        $this->assets_dir = $locator->findResource('asset://');
         $this->assets_url = $locator->findResource('asset://', false);
 
         $this->config($asset_config);
@@ -92,7 +143,6 @@ public function init()
      * assets and/or collections that will be automatically added on startup.
      *
      * @param  array $config Configurable options.
-     *
      * @return $this
      */
     public function config(array $config)
@@ -119,35 +169,51 @@ public function config(array $config)
      * It automatically detects the asset type (JavaScript, CSS or collection).
      * You may add more than one asset passing an array as argument.
      *
-     * @param array|string $asset
+     * @param string|string[] $asset
      * @return $this
      */
     public function add($asset)
     {
-        $args = \func_get_args();
+        if (!$asset) {
+            return $this;
+        }
+
+        $args = func_get_args();
 
         // More than one asset
-        if (\is_array($asset)) {
-            foreach ($asset as $a) {
-                array_shift($args);
-                $args = array_merge([$a], $args);
-                \call_user_func_array([$this, 'add'], $args);
+        if (is_array($asset)) {
+            foreach ($asset as $index => $location) {
+                $params = array_slice($args, 1);
+                if (is_array($location)) {
+                    $params = array_shift($params);
+                    if (is_numeric($params)) {
+                        $params = [ 'priority' => $params ];
+                    }
+                    $params = [array_replace_recursive([], $location, $params)];
+                    $location = $index;
+                }
+
+                $params = array_merge([$location], $params);
+                call_user_func_array([$this, 'add'], $params);
             }
         } elseif (isset($this->collections[$asset])) {
             array_shift($args);
             $args = array_merge([$this->collections[$asset]], $args);
-            \call_user_func_array([$this, 'add'], $args);
+            call_user_func_array([$this, 'add'], $args);
         } else {
             // Get extension
-            $extension = pathinfo(parse_url($asset, PHP_URL_PATH), PATHINFO_EXTENSION);
+            $path = parse_url($asset, PHP_URL_PATH);
+            $extension = $path ? Utils::pathinfo($path, PATHINFO_EXTENSION) : '';
 
             // JavaScript or CSS
-            if (\strlen($extension) > 0) {
+            if ($extension !== '') {
                 $extension = strtolower($extension);
                 if ($extension === 'css') {
-                    \call_user_func_array([$this, 'addCss'], $args);
+                    call_user_func_array([$this, 'addCss'], $args);
                 } elseif ($extension === 'js') {
-                    \call_user_func_array([$this, 'addJs'], $args);
+                    call_user_func_array([$this, 'addJs'], $args);
+                } elseif ($extension === 'mjs') {
+                    call_user_func_array([$this, 'addJsModule'], $args);
                 }
             }
         }
@@ -155,16 +221,29 @@ public function add($asset)
         return $this;
     }
 
+    /**
+     * @param string $collection
+     * @param string $type
+     * @param string|string[] $asset
+     * @param array $options
+     * @return $this
+     */
     protected function addType($collection, $type, $asset, $options)
     {
-        if (\is_array($asset)) {
-            foreach ($asset as $a) {
-                $this->addType($collection, $type, $a, $options);
+        if (is_array($asset)) {
+            foreach ($asset as $index => $location) {
+                $assetOptions = $options;
+                if (is_array($location)) {
+                    $assetOptions = array_replace_recursive([], $options, $location);
+                    $location = $index;
+                }
+                $this->addType($collection, $type, $location, $assetOptions);
             }
+
             return $this;
         }
 
-        if (($type === $this::CSS_TYPE || $type === $this::JS_TYPE) && isset($this->collections[$asset])) {
+        if ($this->isValidType($type) && isset($this->collections[$asset])) {
             $this->addType($collection, $type, $this->collections[$asset], $options);
             return $this;
         }
@@ -172,7 +251,9 @@ protected function addType($collection, $type, $asset, $options)
         // If pipeline disabled, set to position if provided, else after
         if (isset($options['pipeline'])) {
             if ($options['pipeline'] === false) {
-                $exclude_type = ($type === $this::JS_TYPE || $type === $this::INLINE_JS_TYPE) ? $this::JS_TYPE : $this::CSS_TYPE;
+
+                $exclude_type = $this->getBaseType($type);
+
                 $excludes = strtolower($exclude_type . '_pipeline_before_excludes');
                 if ($this->{$excludes}) {
                     $default = 'after';
@@ -190,11 +271,18 @@ protected function addType($collection, $type, $asset, $options)
         $options['timestamp'] = $this->timestamp;
 
         // Set order
-        $options['order'] = \count($this->$collection);
+        $group = $options['group'] ?? 'head';
+        $position = $options['position'] ?? 'pipeline';
+
+        $orderKey = "{$type}|{$group}|{$position}";
+        if (!isset($this->order[$orderKey])) {
+           $this->order[$orderKey] = 0;
+        }
+
+        $options['order'] = $this->order[$orderKey]++;
 
         // Create asset of correct type
-        $asset_class = "\\Grav\\Common\\Assets\\{$type}";
-        $asset_object = new $asset_class();
+        $asset_object = new $type();
 
         // If exists
         if ($asset_object->init($asset, $options)) {
@@ -202,7 +290,16 @@ protected function addType($collection, $type, $asset, $options)
         }
 
         return $this;
+    }
 
+    /**
+     * Add a CSS asset or a collection of assets.
+     *
+     * @return $this
+     */
+    public function addLink($asset)
+    {
+        return $this->addType($this::LINK_COLLECTION, $this::LINK_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::LINK_TYPE));
     }
 
     /**
@@ -212,7 +309,7 @@ protected function addType($collection, $type, $asset, $options)
      */
     public function addCss($asset)
     {
-        return $this->addType(Assets::CSS_COLLECTION,Assets::CSS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::CSS_TYPE));
+        return $this->addType($this::CSS_COLLECTION, $this::CSS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::CSS_TYPE));
     }
 
     /**
@@ -222,7 +319,7 @@ public function addCss($asset)
      */
     public function addInlineCss($asset)
     {
-        return $this->addType(Assets::CSS_COLLECTION, Assets::INLINE_CSS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::INLINE_CSS_TYPE));
+        return $this->addType($this::CSS_COLLECTION, $this::INLINE_CSS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::INLINE_CSS_TYPE));
     }
 
     /**
@@ -232,7 +329,7 @@ public function addInlineCss($asset)
      */
     public function addJs($asset)
     {
-        return $this->addType(Assets::JS_COLLECTION, Assets::JS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::JS_TYPE));
+        return $this->addType($this::JS_COLLECTION, $this::JS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::JS_TYPE));
     }
 
     /**
@@ -242,20 +339,38 @@ public function addJs($asset)
      */
     public function addInlineJs($asset)
     {
-        return $this->addType(Assets::JS_COLLECTION, Assets::INLINE_JS_TYPE, $asset, $this->unifyLegacyArguments(\func_get_args(), Assets::INLINE_JS_TYPE));
+        return $this->addType($this::JS_COLLECTION, $this::INLINE_JS_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::INLINE_JS_TYPE));
     }
 
+        /**
+     * Add a JS asset or a collection of assets.
+     *
+     * @return $this
+     */
+    public function addJsModule($asset)
+    {
+        return $this->addType($this::JS_MODULE_COLLECTION, $this::JS_MODULE_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::JS_MODULE_TYPE));
+    }
+
+    /**
+     * Add an Inline JS asset or a collection of assets.
+     *
+     * @return $this
+     */
+    public function addInlineJsModule($asset)
+    {
+        return $this->addType($this::JS_MODULE_COLLECTION, $this::INLINE_JS_MODULE_TYPE, $asset, $this->unifyLegacyArguments(func_get_args(), $this::INLINE_JS_MODULE_TYPE));
+    }
 
     /**
      * Add/replace collection.
      *
-     * @param  string $collectionName
-     * @param  array  $assets
+     * @param string $collectionName
+     * @param array  $assets
      * @param bool    $overwrite
-     *
      * @return $this
      */
-    public function registerCollection($collectionName, Array $assets, $overwrite = false)
+    public function registerCollection($collectionName, array $assets, $overwrite = false)
     {
         if ($overwrite || !isset($this->collections[$collectionName])) {
             $this->collections[$collectionName] = $assets;
@@ -264,26 +379,33 @@ public function registerCollection($collectionName, Array $assets, $overwrite =
         return $this;
     }
 
+    /**
+     * @param array $assets
+     * @param string $key
+     * @param string $value
+     * @param bool $sort
+     * @return array|false
+     */
     protected function filterAssets($assets, $key, $value, $sort = false)
     {
-        $results = array_filter($assets, function($asset) use ($key, $value) {
+        $results = array_filter($assets, function ($asset) use ($key, $value) {
 
             if ($key === 'position' && $value === 'pipeline') {
-
                 $type = $asset->getType();
 
-                if ($asset->getRemote() && $this->{$type . '_pipeline_include_externals'} === false && $asset['position'] === 'pipeline' ) {
-                    if ($this->{$type . '_pipeline_before_excludes'}) {
+                if ($asset->getRemote() && $this->{strtolower($type) . '_pipeline_include_externals'} === false && $asset['position'] === 'pipeline') {
+                    if ($this->{strtolower($type) . '_pipeline_before_excludes'}) {
                         $asset->setPosition('after');
                     } else {
                         $asset->setPosition('before');
                     }
                     return false;
                 }
-
             }
 
-            if ($asset[$key] === $value) return true;
+            if ($asset[$key] === $value) {
+                return true;
+            }
             return false;
         });
 
@@ -295,17 +417,25 @@ protected function filterAssets($assets, $key, $value, $sort = false)
         return $results;
     }
 
+    /**
+     * @param array $assets
+     * @return array
+     */
     protected function sortAssets($assets)
     {
-        uasort ($assets, function($a, $b) {
-            if ($a['priority'] == $b['priority']) {
-                return $a['order'] - $b['order'];
-            }
-            return $b['priority'] - $a['priority'];
+        uasort($assets, static function ($a, $b) {
+            return $b['priority'] <=> $a['priority'] ?: $a['order'] <=> $b['order'];
         });
+
         return $assets;
     }
 
+    /**
+     * @param string $type
+     * @param string $group
+     * @param array $attributes
+     * @return string
+     */
     public function render($type, $group = 'head', $attributes = [])
     {
         $before_output = '';
@@ -322,7 +452,7 @@ public function render($type, $group = 'head', $attributes = [])
         $after_assets = $this->filterAssets($group_assets, 'position', 'after', true);
 
         // Pipeline
-        if ($this->{$pipeline_enabled}) {
+        if ($this->{$pipeline_enabled} ?? false) {
             $options = array_merge($this->pipeline_options, ['timestamp' => $this->timestamp]);
 
             $pipeline = new Pipeline($options);
@@ -352,12 +482,31 @@ public function render($type, $group = 'head', $attributes = [])
      *
      * @param  string $group name of the group
      * @param  array  $attributes
+     * @return string
+     */
+    public function css($group = 'head', $attributes = [], $include_link = true)
+    {
+        $output = '';
+
+        if ($include_link) {
+            $output = $this->link($group, $attributes);
+        }
+
+        $output .= $this->render(self::CSS, $group, $attributes);
+
+        return $output;
+    }
+
+    /**
+     * Build the CSS link tags.
      *
+     * @param  string $group name of the group
+     * @param  array  $attributes
      * @return string
      */
-    public function css($group = 'head', $attributes = [])
+    public function link($group = 'head', $attributes = [])
     {
-        return $this->render('css', $group, $attributes);
+        return $this->render(self::LINK, $group, $attributes);
     }
 
     /**
@@ -365,11 +514,73 @@ public function css($group = 'head', $attributes = [])
      *
      * @param  string $group name of the group
      * @param  array  $attributes
+     * @return string
+     */
+    public function js($group = 'head', $attributes = [], $include_js_module = true)
+    {
+        $output = $this->render(self::JS, $group, $attributes);
+
+        if ($include_js_module) {
+            $output .= $this->jsModule($group, $attributes);
+        }
+
+        return $output;
+    }
+
+    /**
+     * Build the Javascript Modules tags
      *
+     * @param string $group
+     * @param array $attributes
      * @return string
      */
-    public function js($group = 'head', $attributes = [])
+    public function jsModule($group = 'head', $attributes = [])
     {
-        return $this->render('js', $group, $attributes);
+        return $this->render(self::JS_MODULE, $group, $attributes);
+    }
+
+    /**
+     * @param string $group
+     * @param array $attributes
+     * @return string
+     */
+    public function all($group = 'head', $attributes = [])
+    {
+        $output = $this->css($group, $attributes, false);
+        $output .= $this->link($group, $attributes);
+        $output .= $this->js($group, $attributes, false);
+        $output .= $this->jsModule($group, $attributes);
+        return $output;
+    }
+
+    /**
+     * @param class-string $type
+     * @return bool
+     */
+    protected function isValidType($type)
+    {
+        return in_array($type, [self::CSS_TYPE, self::JS_TYPE, self::JS_MODULE_TYPE]);
+    }
+
+    /**
+     * @param class-string $type
+     * @return string
+     */
+    protected function getBaseType($type)
+    {
+        switch ($type) {
+            case $this::JS_TYPE:
+            case $this::INLINE_JS_TYPE:
+                $base_type = $this::JS;
+                break;
+            case $this::JS_MODULE_TYPE:
+            case $this::INLINE_JS_MODULE_TYPE:
+                $base_type = $this::JS_MODULE;
+                break;
+            default:
+                $base_type = $this::CSS;
+        }
+
+        return $base_type;
     }
 }
diff --git a/system/src/Grav/Common/Assets/BaseAsset.php b/system/src/Grav/Common/Assets/BaseAsset.php
index 49e38642ea..d062d759bf 100644
--- a/system/src/Grav/Common/Assets/BaseAsset.php
+++ b/system/src/Grav/Common/Assets/BaseAsset.php
@@ -3,52 +3,74 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Assets;
 
 use Grav\Common\Assets\Traits\AssetUtilsTrait;
+use Grav\Common\Config\Config;
 use Grav\Common\Grav;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
 use Grav\Framework\Object\PropertyObject;
+use RocketTheme\Toolbox\File\File;
+use SplFileInfo;
 
+/**
+ * Class BaseAsset
+ * @package Grav\Common\Assets
+ */
 abstract class BaseAsset extends PropertyObject
 {
     use AssetUtilsTrait;
 
-    protected const CSS_ASSET = true;
-    protected const JS_ASSET = false;
-
-    /** @const Regex to match CSS import content */
-    protected const CSS_IMPORT_REGEX = '{@import(.*?);}';
+    protected const CSS_ASSET = 1;
+    protected const JS_ASSET = 2;
+    protected const JS_MODULE_ASSET = 3;
 
+    /** @var string|false */
     protected $asset;
-
+    /** @var string */
     protected $asset_type;
+    /** @var int */
     protected $order;
+    /** @var string */
     protected $group;
+    /** @var string */
     protected $position;
+    /** @var int */
     protected $priority;
+    /** @var array */
     protected $attributes = [];
 
-
+    /** @var string */
     protected $timestamp;
+    /** @var int|false */
     protected $modified;
+    /** @var bool */
     protected $remote;
+    /** @var string */
     protected $query = '';
 
     // Private Bits
-    private $base_url;
-    private $fetch_command;
+    /** @var bool */
     private $css_rewrite = false;
+    /** @var bool */
     private $css_minify = false;
 
+    /**
+     * @return string
+     */
     abstract function render();
 
-    public function __construct(array $elements = [], $key = null)
+    /**
+     * BaseAsset constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
+    public function __construct(array $elements = [], ?string $key = null)
     {
         $base_config = [
             'group' => 'head',
@@ -64,8 +86,17 @@ public function __construct(array $elements = [], $key = null)
         parent::__construct($elements, $key);
     }
 
+    /**
+     * @param string|false $asset
+     * @param array $options
+     * @return $this|false
+     */
     public function init($asset, $options)
     {
+        if (!$asset) {
+            return false;
+        }
+
         $config = Grav::instance()['config'];
         $uri = Grav::instance()['uri'];
 
@@ -88,7 +119,6 @@ public function init($asset, $options)
 
             // Move this to render?
             if (!$this->remote) {
-
                 $asset_parts = parse_url($asset);
                 if (isset($asset_parts['query'])) {
                     $this->query = $asset_parts['query'];
@@ -101,7 +131,7 @@ public function init($asset, $options)
                 if ($locator->isStream($asset)) {
                     $path = $locator->findResource($asset, true);
                 } else {
-                    $path = GRAV_ROOT . $asset;
+                    $path = GRAV_WEBROOT . $asset;
                 }
 
                 // If local file is missing return
@@ -109,7 +139,7 @@ public function init($asset, $options)
                     return false;
                 }
 
-                $file = new \SplFileInfo($path);
+                $file = new SplFileInfo($path);
 
                 $asset = $this->buildLocalLink($file->getPathname());
 
@@ -122,22 +152,62 @@ public function init($asset, $options)
         return $this;
     }
 
+    /**
+     * @return string|false
+     */
     public function getAsset()
     {
         return $this->asset;
     }
 
+    /**
+     * @return bool
+     */
     public function getRemote()
     {
         return $this->remote;
     }
 
+    /**
+     * @param string $position
+     * @return $this
+     */
     public function setPosition($position)
     {
         $this->position = $position;
+
         return $this;
     }
 
+    /**
+     * Receive asset location and return the SRI integrity hash
+     *
+     * @param string $input
+     * @return string
+     */
+    public static function integrityHash($input)
+    {
+        $grav = Grav::instance();
+        $uri = $grav['uri'];
+
+        $assetsConfig = $grav['config']->get('system.assets');
+
+        if (!self::isRemoteLink($input) && !empty($assetsConfig['enable_asset_sri']) && $assetsConfig['enable_asset_sri']) {
+            $input = preg_replace('#^' . $uri->rootUrl() . '#', '', $input);
+            $asset = File::instance(GRAV_WEBROOT . $input);
+
+            if ($asset->exists()) {
+                $dataToHash = $asset->content();
+                $hash = hash('sha256', $dataToHash, true);
+                $hash_base64 = base64_encode($hash);
+
+                return ' integrity="sha256-' . $hash_base64 . '"';
+            }
+        }
+
+        return '';
+    }
+
 
     /**
      *
@@ -149,7 +219,7 @@ public function setPosition($position)
      */
 //    protected function getLastModificationTime($asset)
 //    {
-//        $file = GRAV_ROOT . $asset;
+//        $file = GRAV_WEBROOT . $asset;
 //        if (Grav::instance()['locator']->isStream($asset)) {
 //            $file = $this->buildLocalLink($asset, true);
 //        }
@@ -163,12 +233,12 @@ public function setPosition($position)
      *
      * @param  string $asset    the asset string reference
      *
-     * @return string           the final link url to the asset
+     * @return string|false     the final link url to the asset
      */
     protected function buildLocalLink($asset)
     {
         if ($asset) {
-            return $this->base_url . ltrim(Utils::replaceFirstOccurrence(GRAV_ROOT, '', $asset), '/');
+            return $this->base_url . ltrim(Utils::replaceFirstOccurrence(GRAV_WEBROOT, '', $asset), '/');
         }
         return false;
     }
@@ -179,6 +249,7 @@ protected function buildLocalLink($asset)
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return ['type' => $this->getType(), 'elements' => $this->getElements()];
@@ -190,9 +261,23 @@ public function jsonSerialize()
      * @param string $file
      * @param string $dir
      * @param bool $local
+     * @return string
      */
     protected function cssRewrite($file, $dir, $local)
     {
-        return;
+        return '';
+    }
+
+    /**
+     * Finds relative JS urls() and rewrites the URL with an absolute one
+     *
+     * @param string $file the css source file
+     * @param string $dir local relative path to the css file
+     * @param bool $local is this a local or remote asset
+     * @return string
+     */
+    protected function jsRewrite($file, $dir, $local)
+    {
+        return '';
     }
 }
diff --git a/system/src/Grav/Common/Assets/BlockAssets.php b/system/src/Grav/Common/Assets/BlockAssets.php
new file mode 100644
index 0000000000..7d97960908
--- /dev/null
+++ b/system/src/Grav/Common/Assets/BlockAssets.php
@@ -0,0 +1,207 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets;
+
+use Grav\Common\Assets;
+use Grav\Common\Config\Config;
+use Grav\Common\Grav;
+use Grav\Framework\ContentBlock\HtmlBlock;
+use function strlen;
+
+/**
+ * Register block assets into Grav.
+ */
+class BlockAssets
+{
+    /**
+     * @param HtmlBlock $block
+     * @return void
+     */
+    public static function registerAssets(HtmlBlock $block): void
+    {
+        $grav = Grav::instance();
+
+        /** @var Assets $assets */
+        $assets = $grav['assets'];
+
+        $types = $block->getAssets();
+        foreach ($types as $type => $groups) {
+            switch ($type) {
+                case 'frameworks':
+                    static::registerFrameworks($assets, $groups);
+                    break;
+                case 'styles':
+                    static::registerStyles($assets, $groups);
+                    break;
+                case 'scripts':
+                    static::registerScripts($assets, $groups);
+                    break;
+                case 'links':
+                    static::registerLinks($assets, $groups);
+                    break;
+                case 'html':
+                    static::registerHtml($assets, $groups);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * @param Assets $assets
+     * @param array $list
+     * @return void
+     */
+    protected static function registerFrameworks(Assets $assets, array $list): void
+    {
+        if ($list) {
+            throw new \RuntimeException('Not Implemented');
+        }
+    }
+
+    /**
+     * @param Assets $assets
+     * @param array $groups
+     * @return void
+     */
+    protected static function registerStyles(Assets $assets, array $groups): void
+    {
+        $grav = Grav::instance();
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
+        foreach ($groups as $group => $styles) {
+            foreach ($styles as $style) {
+                switch ($style[':type']) {
+                    case 'file':
+                        $options = [
+                            'priority' => $style[':priority'],
+                            'group' => $group,
+                            'type' => $style['type'],
+                            'media' => $style['media']
+                        ] + $style['element'];
+
+                        $assets->addCss(static::getRelativeUrl($style['href'], $config->get('system.assets.css_pipeline')), $options);
+                        break;
+                    case 'inline':
+                        $options = [
+                            'priority' => $style[':priority'],
+                            'group' => $group,
+                            'type' => $style['type'],
+                        ] + $style['element'];
+
+                        $assets->addInlineCss($style['content'], $options);
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * @param Assets $assets
+     * @param array $groups
+     * @return void
+     */
+    protected static function registerScripts(Assets $assets, array $groups): void
+    {
+        $grav = Grav::instance();
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
+        foreach ($groups as $group => $scripts) {
+            $group = $group === 'footer' ? 'bottom' : $group;
+
+            foreach ($scripts as $script) {
+                switch ($script[':type']) {
+                    case 'file':
+                        $options = [
+                            'group' => $group,
+                            'priority' => $script[':priority'],
+                            'src' => $script['src'],
+                            'type' => $script['type'],
+                            'loading' => $script['loading'],
+                            'defer' => $script['defer'],
+                            'async' => $script['async'],
+                            'handle' => $script['handle']
+                        ] + $script['element'];
+
+                        $assets->addJs(static::getRelativeUrl($script['src'], $config->get('system.assets.js_pipeline')), $options);
+                        break;
+                    case 'inline':
+                        $options = [
+                            'priority' => $script[':priority'],
+                            'group' => $group,
+                            'type' => $script['type'],
+                            'loading' => $script['loading']
+                        ] + $script['element'];
+
+                        $assets->addInlineJs($script['content'], $options);
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * @param Assets $assets
+     * @param array $groups
+     * @return void
+     */
+    protected static function registerLinks(Assets $assets, array $groups): void
+    {
+        foreach ($groups as $group => $links) {
+            foreach ($links as $link) {
+                $href = $link['href'];
+                $options = [
+                    'group' => $group,
+                    'priority' => $link[':priority'],
+                    'rel' => $link['rel'],
+                ] + $link['element'];
+
+                $assets->addLink($href, $options);
+            }
+        }
+    }
+
+    /**
+     * @param Assets $assets
+     * @param array $groups
+     * @return void
+     */
+    protected static function registerHtml(Assets $assets, array $groups): void
+    {
+        if ($groups) {
+            throw new \RuntimeException('Not Implemented');
+        }
+    }
+
+    /**
+     * @param string $url
+     * @param bool $pipeline
+     * @return string
+     */
+    protected static function getRelativeUrl($url, $pipeline)
+    {
+        $grav = Grav::instance();
+
+        $base = rtrim($grav['base_url'], '/') ?: '/';
+
+        if (strpos($url, $base) === 0) {
+            if ($pipeline) {
+                // Remove file timestamp if CSS pipeline has been enabled.
+                $url = preg_replace('|[?#].*|', '', $url);
+            }
+
+            return substr($url, strlen($base) - 1);
+        }
+        return $url;
+    }
+}
diff --git a/system/src/Grav/Common/Assets/Css.php b/system/src/Grav/Common/Assets/Css.php
index 405d8a3474..ea6b388fa9 100644
--- a/system/src/Grav/Common/Assets/Css.php
+++ b/system/src/Grav/Common/Assets/Css.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,9 +11,18 @@
 
 use Grav\Common\Utils;
 
+/**
+ * Class Css
+ * @package Grav\Common\Assets
+ */
 class Css extends BaseAsset
 {
-    public function __construct(array $elements = [], $key = null)
+    /**
+     * Css constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
+    public function __construct(array $elements = [], ?string $key = null)
     {
         $base_options = [
             'asset_type' => 'css',
@@ -28,13 +37,16 @@ public function __construct(array $elements = [], $key = null)
         parent::__construct($merged_attributes, $key);
     }
 
+    /**
+     * @return string
+     */
     public function render()
     {
         if (isset($this->attributes['loading']) && $this->attributes['loading'] === 'inline') {
-            $buffer = $this->gatherLinks( [$this], self::CSS_ASSET);
+            $buffer = $this->gatherLinks([$this], self::CSS_ASSET);
             return "<style>\n" . trim($buffer) . "\n</style>\n";
         }
 
-        return '<link href="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . ">\n";
+        return '<link href="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . $this->integrityHash($this->asset) . ">\n";
     }
 }
diff --git a/system/src/Grav/Common/Assets/InlineCss.php b/system/src/Grav/Common/Assets/InlineCss.php
index c48dc48c52..4984db4d14 100644
--- a/system/src/Grav/Common/Assets/InlineCss.php
+++ b/system/src/Grav/Common/Assets/InlineCss.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,9 +11,18 @@
 
 use Grav\Common\Utils;
 
+/**
+ * Class InlineCss
+ * @package Grav\Common\Assets
+ */
 class InlineCss extends BaseAsset
 {
-    public function __construct(array $elements = [], $key = null)
+    /**
+     * InlineCss constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
+    public function __construct(array $elements = [], ?string $key = null)
     {
         $base_options = [
             'asset_type' => 'css',
@@ -25,6 +34,9 @@ public function __construct(array $elements = [], $key = null)
         parent::__construct($merged_attributes, $key);
     }
 
+    /**
+     * @return string
+     */
     public function render()
     {
         return '<style' . $this->renderAttributes(). ">\n" . trim($this->asset) . "\n</style>\n";
diff --git a/system/src/Grav/Common/Assets/InlineJs.php b/system/src/Grav/Common/Assets/InlineJs.php
index 11e4442387..e38a51aee8 100644
--- a/system/src/Grav/Common/Assets/InlineJs.php
+++ b/system/src/Grav/Common/Assets/InlineJs.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,9 +11,18 @@
 
 use Grav\Common\Utils;
 
+/**
+ * Class InlineJs
+ * @package Grav\Common\Assets
+ */
 class InlineJs extends BaseAsset
 {
-    public function __construct(array $elements = [], $key = null)
+    /**
+     * InlineJs constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
+    public function __construct(array $elements = [], ?string $key = null)
     {
         $base_options = [
             'asset_type' => 'js',
@@ -25,6 +34,9 @@ public function __construct(array $elements = [], $key = null)
         parent::__construct($merged_attributes, $key);
     }
 
+    /**
+     * @return string
+     */
     public function render()
     {
         return '<script' . $this->renderAttributes(). ">\n" . trim($this->asset) . "\n</script>\n";
diff --git a/system/src/Grav/Common/Assets/InlineJsModule.php b/system/src/Grav/Common/Assets/InlineJsModule.php
new file mode 100644
index 0000000000..42ce6f14ab
--- /dev/null
+++ b/system/src/Grav/Common/Assets/InlineJsModule.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets;
+
+use Grav\Common\Utils;
+
+/**
+ * Class InlineJs
+ * @package Grav\Common\Assets
+ */
+class InlineJsModule extends BaseAsset
+{
+    /**
+     * InlineJs constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
+    public function __construct(array $elements = [], ?string $key = null)
+    {
+        $base_options = [
+            'asset_type' => 'js_module',
+            'attributes' => ['type' => 'module'],
+            'position' => 'after'
+        ];
+
+        $merged_attributes = Utils::arrayMergeRecursiveUnique($base_options, $elements);
+
+        parent::__construct($merged_attributes, $key);
+    }
+
+    /**
+     * @return string
+     */
+    public function render()
+    {
+        return '<script' . $this->renderAttributes(). ">\n" . trim($this->asset) . "\n</script>\n";
+    }
+
+}
diff --git a/system/src/Grav/Common/Assets/Js.php b/system/src/Grav/Common/Assets/Js.php
index cce86d9ea8..8687a86b13 100644
--- a/system/src/Grav/Common/Assets/Js.php
+++ b/system/src/Grav/Common/Assets/Js.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,9 +11,18 @@
 
 use Grav\Common\Utils;
 
+/**
+ * Class Js
+ * @package Grav\Common\Assets
+ */
 class Js extends BaseAsset
 {
-    public function __construct(array $elements = [], $key = null)
+    /**
+     * Js constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
+    public function __construct(array $elements = [], ?string $key = null)
     {
         $base_options = [
             'asset_type' => 'js',
@@ -24,13 +33,16 @@ public function __construct(array $elements = [], $key = null)
         parent::__construct($merged_attributes, $key);
     }
 
+    /**
+     * @return string
+     */
     public function render()
     {
         if (isset($this->attributes['loading']) && $this->attributes['loading'] === 'inline') {
-            $buffer = $this->gatherLinks( [$this], self::JS_ASSET);
+            $buffer = $this->gatherLinks([$this], self::JS_ASSET);
             return '<script' . $this->renderAttributes() . ">\n" . trim($buffer) . "\n</script>\n";
         }
 
-        return '<script src="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . "></script>\n";
+        return '<script src="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . $this->integrityHash($this->asset) . "></script>\n";
     }
 }
diff --git a/system/src/Grav/Common/Assets/JsModule.php b/system/src/Grav/Common/Assets/JsModule.php
new file mode 100644
index 0000000000..5c2a836c21
--- /dev/null
+++ b/system/src/Grav/Common/Assets/JsModule.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets;
+
+use Grav\Common\Utils;
+
+/**
+ * Class Js
+ * @package Grav\Common\Assets
+ */
+class JsModule extends BaseAsset
+{
+    /**
+     * Js constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
+    public function __construct(array $elements = [], ?string $key = null)
+    {
+        $base_options = [
+            'asset_type' => 'js_module',
+            'attributes' => ['type' => 'module']
+        ];
+
+        $merged_attributes = Utils::arrayMergeRecursiveUnique($base_options, $elements);
+
+        parent::__construct($merged_attributes, $key);
+    }
+
+        /**
+     * @return string
+     */
+    public function render()
+    {
+        if (isset($this->attributes['loading']) && $this->attributes['loading'] === 'inline') {
+            $buffer = $this->gatherLinks([$this], self::JS_MODULE_ASSET);
+            return '<script' . $this->renderAttributes() . ">\n" . trim($buffer) . "\n</script>\n";
+        }
+
+        return '<script src="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . $this->integrityHash($this->asset) . "></script>\n";
+    }
+}
diff --git a/system/src/Grav/Common/Assets/Link.php b/system/src/Grav/Common/Assets/Link.php
new file mode 100644
index 0000000000..ecafcea90f
--- /dev/null
+++ b/system/src/Grav/Common/Assets/Link.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets;
+
+use Grav\Common\Utils;
+
+/**
+ * Class Link
+ * @package Grav\Common\Assets
+ */
+class Link extends BaseAsset
+{
+    /**
+     * Css constructor.
+     * @param array $elements
+     * @param string|null $key
+     */
+    public function __construct(array $elements = [], ?string $key = null)
+    {
+        $base_options = [
+            'asset_type' => 'link',
+        ];
+
+        $merged_attributes = Utils::arrayMergeRecursiveUnique($base_options, $elements);
+
+        parent::__construct($merged_attributes, $key);
+    }
+
+    /**
+     * @return string
+     */
+    public function render()
+    {
+        return '<link href="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . $this->integrityHash($this->asset) . ">\n";
+    }
+}
diff --git a/system/src/Grav/Common/Assets/Pipeline.php b/system/src/Grav/Common/Assets/Pipeline.php
index b009585c8f..0010d7bd4d 100644
--- a/system/src/Grav/Common/Assets/Pipeline.php
+++ b/system/src/Grav/Common/Assets/Pipeline.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Assets
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,59 +11,73 @@
 
 use Grav\Common\Assets\Traits\AssetUtilsTrait;
 use Grav\Common\Config\Config;
+use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
 use Grav\Framework\Object\PropertyObject;
+use MatthiasMullie\Minify\CSS;
+use MatthiasMullie\Minify\JS;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function array_key_exists;
 
+/**
+ * Class Pipeline
+ * @package Grav\Common\Assets
+ */
 class Pipeline extends PropertyObject
 {
     use AssetUtilsTrait;
 
-    protected const CSS_ASSET = true;
-    protected const JS_ASSET = false;
+    protected const CSS_ASSET = 1;
+    protected const JS_ASSET = 2;
+    protected const JS_MODULE_ASSET = 3;
 
     /** @const Regex to match CSS urls */
     protected const CSS_URL_REGEX = '{url\(([\'\"]?)(.*?)\1\)}';
 
+    /** @const Regex to match JS imports */
+    protected const JS_IMPORT_REGEX = '{import.+from\s?[\'|\"](.+?)[\'|\"]}';
+
     /** @const Regex to match CSS sourcemap comments */
     protected const CSS_SOURCEMAP_REGEX = '{\/\*# (.*?) \*\/}';
 
-    /** @const Regex to match CSS import content */
-    protected const CSS_IMPORT_REGEX = '{@import(.*?);}';
-
     protected const FIRST_FORWARDSLASH_REGEX = '{^\/{1}\w}';
 
-    protected $css_minify;
-    protected $css_minify_windows;
-    protected $css_rewrite;
-
-    protected $js_minify;
-    protected $js_minify_windows;
-
-    protected $base_url;
+    // Following variables come from the configuration:
+    /** @var bool */
+    protected $css_minify = false;
+    /** @var bool */
+    protected $css_minify_windows = false;
+    /** @var bool */
+    protected $css_rewrite = false;
+    /** @var bool */
+    protected $css_pipeline_include_externals = true;
+    /** @var bool */
+    protected $js_minify = false;
+    /** @var bool */
+    protected $js_minify_windows = false;
+    /** @var bool */
+    protected $js_pipeline_include_externals = true;
+
+    /** @var string */
     protected $assets_dir;
+    /** @var string */
     protected $assets_url;
+    /** @var string */
     protected $timestamp;
+    /** @var array */
     protected $attributes;
-    protected $query;
+    /** @var string */
+    protected $query = '';
+    /** @var string */
     protected $asset;
 
     /**
-     * Closure used by the pipeline to fetch assets.
-     *
-     * Useful when file_get_contents() function is not available in your PHP
-     * installation or when you want to apply any kind of preprocessing to
-     * your assets before they get pipelined.
-     *
-     * The closure will receive as the only parameter a string with the path/URL of the asset and
-     * it should return the content of the asset file as a string.
-     *
-     * @var \Closure
+     * Pipeline constructor.
+     * @param array $elements
+     * @param string|null $key
      */
-    protected $fetch_command;
-
     public function __construct(array $elements = [], ?string $key = null)
     {
         parent::__construct($elements, $key);
@@ -78,7 +92,14 @@ public function __construct(array $elements = [], ?string $key = null)
         $uri = Grav::instance()['uri'];
 
         $this->base_url = rtrim($uri->rootUrl($config->get('system.absolute_urls')), '/') . '/';
-        $this->assets_dir = $locator->findResource('asset://') . DS;
+        $this->assets_dir = $locator->findResource('asset://');
+        if (!$this->assets_dir) {
+            // Attempt to create assets folder if it doesn't exist yet.
+            $this->assets_dir = $locator->findResource('asset://', true, true);
+            Folder::mkdir($this->assets_dir);
+            $locator->clearCache();
+        }
+
         $this->assets_url = $locator->findResource('asset://', false);
     }
 
@@ -88,7 +109,6 @@ public function __construct(array $elements = [], ?string $key = null)
      * @param array $assets
      * @param string $group
      * @param array $attributes
-     *
      * @return bool|string     URL or generated content if available, else false
      */
     public function renderCss($assets, $group, $attributes = [])
@@ -106,14 +126,13 @@ public function renderCss($assets, $group, $attributes = [])
 
         // Compute uid based on assets and timestamp
         $json_assets = json_encode($assets);
-        $uid = md5($json_assets . $this->css_minify . $this->css_rewrite . $group);
+        $uid = md5($json_assets . (int)$this->css_minify . (int)$this->css_rewrite . $group);
         $file = $uid . '.css';
         $relative_path = "{$this->base_url}{$this->assets_url}/{$file}";
 
-        $buffer = null;
-
-        if (file_exists($this->assets_dir . $file)) {
-            $buffer = file_get_contents($this->assets_dir . $file) . "\n";
+        $filepath = "{$this->assets_dir}/{$file}";
+        if (file_exists($filepath)) {
+            $buffer = file_get_contents($filepath) . "\n";
         } else {
             //if nothing found get out of here!
             if (empty($assets)) {
@@ -125,14 +144,14 @@ public function renderCss($assets, $group, $attributes = [])
 
             // Minify if required
             if ($this->shouldMinify('css')) {
-                $minifier = new \MatthiasMullie\Minify\CSS();
+                $minifier = new CSS();
                 $minifier->add($buffer);
                 $buffer = $minifier->minify();
             }
 
             // Write file
             if (trim($buffer) !== '') {
-                file_put_contents($this->assets_dir . $file, $buffer);
+                file_put_contents($filepath, $buffer);
             }
         }
 
@@ -140,7 +159,7 @@ public function renderCss($assets, $group, $attributes = [])
             $output = "<style>\n" . $buffer . "\n</style>\n";
         } else {
             $this->asset = $relative_path;
-            $output = '<link href="' . $relative_path . $this->renderQueryString() . '"' . $this->renderAttributes() . ">\n";
+            $output = '<link href="' . $relative_path . $this->renderQueryString() . '"' . $this->renderAttributes() . BaseAsset::integrityHash($this->asset) . ">\n";
         }
 
         return $output;
@@ -152,10 +171,9 @@ public function renderCss($assets, $group, $attributes = [])
      * @param array $assets
      * @param string $group
      * @param array $attributes
-     *
      * @return bool|string     URL or generated content if available, else false
      */
-    public function renderJs($assets, $group, $attributes = [])
+    public function renderJs($assets, $group, $attributes = [], $type = self::JS_ASSET)
     {
         // temporary list of assets to pipeline
         $inline_group = false;
@@ -174,10 +192,9 @@ public function renderJs($assets, $group, $attributes = [])
         $file = $uid . '.js';
         $relative_path = "{$this->base_url}{$this->assets_url}/{$file}";
 
-        $buffer = null;
-
-        if (file_exists($this->assets_dir . $file)) {
-            $buffer = file_get_contents($this->assets_dir . $file) . "\n";
+        $filepath = "{$this->assets_dir}/{$file}";
+        if (file_exists($filepath)) {
+            $buffer = file_get_contents($filepath) . "\n";
         } else {
             //if nothing found get out of here!
             if (empty($assets)) {
@@ -185,18 +202,18 @@ public function renderJs($assets, $group, $attributes = [])
             }
 
             // Concatenate files
-            $buffer = $this->gatherLinks($assets, self::JS_ASSET);
+            $buffer = $this->gatherLinks($assets, $type);
 
             // Minify if required
             if ($this->shouldMinify('js')) {
-                $minifier = new \MatthiasMullie\Minify\JS();
+                $minifier = new JS();
                 $minifier->add($buffer);
                 $buffer = $minifier->minify();
             }
 
             // Write file
             if (trim($buffer) !== '') {
-                file_put_contents($this->assets_dir . $file, $buffer);
+                file_put_contents($filepath, $buffer);
             }
         }
 
@@ -204,12 +221,25 @@ public function renderJs($assets, $group, $attributes = [])
             $output = '<script' . $this->renderAttributes(). ">\n" . $buffer . "\n</script>\n";
         } else {
             $this->asset = $relative_path;
-            $output = '<script src="' . $relative_path . $this->renderQueryString() . '"' . $this->renderAttributes() . "></script>\n";
+            $output = '<script src="' . $relative_path . $this->renderQueryString() . '"' . $this->renderAttributes() . BaseAsset::integrityHash($this->asset) . "></script>\n";
         }
 
         return $output;
     }
 
+        /**
+     * Minify and concatenate JS files.
+     *
+     * @param array $assets
+     * @param string $group
+     * @param array $attributes
+     * @return bool|string     URL or generated content if available, else false
+     */
+    public function renderJs_Module($assets, $group, $attributes = [])
+    {
+        $attributes['type'] = 'module';
+        return $this->renderJs($assets, $group, $attributes, self::JS_MODULE_ASSET);
+    }
 
     /**
      * Finds relative CSS urls() and rewrites the URL with an absolute one
@@ -217,8 +247,7 @@ public function renderJs($assets, $group, $attributes = [])
      * @param string $file the css source file
      * @param string $dir , $local relative path to the css file
      * @param bool $local is this a local or remote asset
-     *
-     * @return mixed
+     * @return string
      */
     protected function cssRewrite($file, $dir, $local)
     {
@@ -242,18 +271,54 @@ protected function cssRewrite($file, $dir, $local)
                 $old_url = ltrim($old_url, '/');
             }
 
-            $new_url = ($local ? $this->base_url: '') . $old_url;
+            $new_url = ($local ? $this->base_url : '') . $old_url;
 
-            $fixed = str_replace($matches[2], $new_url, $matches[0]);
-
-            return $fixed;
+            return str_replace($matches[2], $new_url, $matches[0]);
         }, $file);
 
         return $file;
     }
 
+    /**
+     * Finds relative JS urls() and rewrites the URL with an absolute one
+     *
+     * @param string $file the css source file
+     * @param string $dir local relative path to the css file
+     * @param bool $local is this a local or remote asset
+     * @return string
+     */
+    protected function jsRewrite($file, $dir, $local)
+    {
+        // Find any js import elements, grab the URLs and calculate an absolute path
+        // Then replace the old url with the new one
+        $file = (string)preg_replace_callback(self::JS_IMPORT_REGEX, function ($matches) use ($dir, $local) {
+
+            $old_url = $matches[1];
+
+            // Ensure link is not rooted to web server, a data URL, or to a remote host
+            if (preg_match(self::FIRST_FORWARDSLASH_REGEX, $old_url) || $this->isRemoteLink($old_url)) {
+                return $matches[0];
+            }
+
+            // clean leading /
+            $old_url = Utils::normalizePath($dir . '/' . $old_url);
+            $old_url = str_replace('/./', '/', $old_url);
+            if (preg_match(self::FIRST_FORWARDSLASH_REGEX, $old_url)) {
+                $old_url = ltrim($old_url, '/');
+            }
 
+            $new_url = ($local ? $this->base_url : '') . $old_url;
 
+            return str_replace($matches[1], $new_url, $matches[0]);
+        }, $file);
+
+        return $file;
+    }
+
+    /**
+     * @param string $type
+     * @return bool
+     */
     private function shouldMinify($type = 'css')
     {
         $check = $type . '_minify';
diff --git a/system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php b/system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php
index 0a1d149de6..0e3f392aff 100644
--- a/system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php
+++ b/system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php
@@ -3,17 +3,42 @@
 /**
  * @package    Grav\Common\Assets\Traits
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Assets\Traits;
 
+use Closure;
 use Grav\Common\Grav;
 use Grav\Common\Utils;
+use function dirname;
+use function in_array;
+use function is_array;
 
+/**
+ * Trait AssetUtilsTrait
+ * @package Grav\Common\Assets\Traits
+ */
 trait AssetUtilsTrait
 {
+    /**
+     * @var Closure|null
+     *
+     * Closure used by the pipeline to fetch assets.
+     *
+     * Useful when file_get_contents() function is not available in your PHP
+     * installation or when you want to apply any kind of preprocessing to
+     * your assets before they get pipelined.
+     *
+     * The closure will receive as the only parameter a string with the path/URL of the asset and
+     * it should return the content of the asset file as a string.
+     */
+    protected $fetch_command;
+
+    /** @var string */
+    protected $base_url;
+
     /**
      * Determine whether a link is local or remote.
      * Understands both "http://" and "https://" as well as protocol agnostic links "//"
@@ -37,16 +62,13 @@ public static function isRemoteLink($link)
      * Download and concatenate the content of several links.
      *
      * @param  array $assets
-     * @param  bool $css
-     *
+     * @param  int $type
      * @return string
      */
-    protected function gatherLinks(array $assets, $css = true)
+    protected function gatherLinks(array $assets, int $type = self::CSS_ASSET): string
     {
         $buffer = '';
-
-
-        foreach ($assets as $id => $asset) {
+        foreach ($assets as $asset) {
             $local = true;
 
             $link = $asset->getAsset();
@@ -57,7 +79,7 @@ protected function gatherLinks(array $assets, $css = true)
                 if (0 === strpos($link, '//')) {
                     $link = 'http:' . $link;
                 }
-                $relative_dir = \dirname($relative_path);
+                $relative_dir = dirname($relative_path);
             } else {
                 // Fix to remove relative dir if grav is in one
                 if (($this->base_url !== '/') && Utils::startsWith($relative_path, $this->base_url)) {
@@ -65,11 +87,12 @@ protected function gatherLinks(array $assets, $css = true)
                     $relative_path = ltrim(preg_replace($base_url, '/', $link, 1), '/');
                 }
 
-                $relative_dir = \dirname($relative_path);
-                $link = ROOT_DIR . $relative_path;
+                $relative_dir = dirname($relative_path);
+                $link = GRAV_ROOT . '/' . $relative_path;
             }
 
-            $file = ($this->fetch_command instanceof \Closure) ? @$this->fetch_command->__invoke($link) : @file_get_contents($link);
+            // TODO: looks like this is not being used.
+            $file = $this->fetch_command instanceof Closure ? @$this->fetch_command->__invoke($link) : @file_get_contents($link);
 
             // No file found, skip it...
             if ($file === false) {
@@ -77,21 +100,25 @@ protected function gatherLinks(array $assets, $css = true)
             }
 
             // Double check last character being
-            if (!$css) {
+            if ($type === self::JS_ASSET || $type === self::JS_MODULE_ASSET) {
                 $file = rtrim($file, ' ;') . ';';
             }
 
             // If this is CSS + the file is local + rewrite enabled
-            if ($css && $this->css_rewrite) {
+            if ($type === self::CSS_ASSET && $this->css_rewrite) {
                 $file = $this->cssRewrite($file, $relative_dir, $local);
             }
 
+            if ($type === self::JS_MODULE_ASSET) {
+                $file = $this->jsRewrite($file, $relative_dir, $local);
+            }
+
             $file = rtrim($file) . PHP_EOL;
             $buffer .= $file;
         }
 
         // Pull out @imports and move to top
-        if ($css) {
+        if ($type === self::CSS_ASSET) {
             $buffer = $this->moveImports($buffer);
         }
 
@@ -102,14 +129,15 @@ protected function gatherLinks(array $assets, $css = true)
      * Moves @import statements to the top of the file per the CSS specification
      *
      * @param  string $file the file containing the combined CSS files
-     *
      * @return string       the modified file with any @imports at the top of the file
      */
     protected function moveImports($file)
     {
+        $regex = '{@import.*?["\']([^"\']+)["\'].*?;}';
+
         $imports = [];
 
-        $file = (string)preg_replace_callback(self::CSS_IMPORT_REGEX, function ($matches) use (&$imports) {
+        $file = (string)preg_replace_callback($regex, static function ($matches) use (&$imports) {
             $imports[] = $matches[0];
 
             return '';
@@ -130,14 +158,18 @@ protected function renderAttributes()
         $no_key = ['loading'];
 
         foreach ($this->attributes as $key => $value) {
+            if ($value === null) {
+                continue;
+            }
+
             if (is_numeric($key)) {
                 $key = $value;
             }
-            if (\is_array($value)) {
+            if (is_array($value)) {
                 $value = implode(' ', $value);
             }
 
-            if (\in_array($key, $no_key, true)) {
+            if (in_array($key, $no_key, true)) {
                 $element = htmlentities($value, ENT_QUOTES, 'UTF-8', false);
             } else {
                 $element = $key . '="' . htmlentities($value, ENT_QUOTES, 'UTF-8', false) . '"';
@@ -152,7 +184,7 @@ protected function renderAttributes()
     /**
      * Render Querystring
      *
-     * @param string $asset
+     * @param string|null $asset
      * @return string
      */
     protected function renderQueryString($asset = null)
@@ -170,7 +202,7 @@ protected function renderQueryString($asset = null)
         }
 
         if ($this->timestamp) {
-            if (Utils::contains($asset, '?') || $querystring) {
+            if ($querystring || Utils::contains($asset, '?')) {
                 $querystring .=  '&' . $this->timestamp;
             } else {
                 $querystring .= '?' . $this->timestamp;
diff --git a/system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php b/system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php
index 229c2abae7..c1ef0a3c35 100644
--- a/system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php
+++ b/system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php
@@ -3,17 +3,23 @@
 /**
  * @package    Grav\Common\Assets\Traits
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Assets\Traits;
 
 use Grav\Common\Assets;
+use function count;
+use function is_array;
+use function is_int;
 
+/**
+ * Trait LegacyAssetsTrait
+ * @package Grav\Common\Assets\Traits
+ */
 trait LegacyAssetsTrait
 {
-
     /**
      * @param array $args
      * @param string $type
@@ -39,31 +45,35 @@ protected function unifyLegacyArguments($args, $type = Assets::CSS_TYPE)
         }
 
         switch ($type) {
-            case(Assets::JS_TYPE):
+            case (Assets::JS_TYPE):
                 $defaults = ['priority' => null, 'pipeline' => true, 'loading' => null, 'group' => null];
                 $arguments = $this->createArgumentsFromLegacy($args, $defaults);
                 break;
 
-            case(Assets::INLINE_JS_TYPE):
+            case (Assets::INLINE_JS_TYPE):
                 $defaults = ['priority' => null, 'group' => null, 'attributes' => null];
                 $arguments = $this->createArgumentsFromLegacy($args, $defaults);
 
                 // special case to handle old attributes being passed in
                 if (isset($arguments['attributes'])) {
                     $old_attributes = $arguments['attributes'];
-                    $arguments = array_merge($arguments, $old_attributes);
+                    if (is_array($old_attributes)) {
+                        $arguments = array_merge($arguments, $old_attributes);
+                    } else {
+                        $arguments['type'] = $old_attributes;
+                    }
                 }
                 unset($arguments['attributes']);
 
                 break;
 
-            case(Assets::INLINE_CSS_TYPE):
+            case (Assets::INLINE_CSS_TYPE):
                 $defaults = ['priority' => null, 'group' => null];
                 $arguments = $this->createArgumentsFromLegacy($args, $defaults);
                 break;
 
             default:
-            case(Assets::CSS_TYPE):
+            case (Assets::CSS_TYPE):
                 $defaults = ['priority' => null, 'pipeline' => true, 'group' => null, 'loading' => null];
                 $arguments = $this->createArgumentsFromLegacy($args, $defaults);
         }
@@ -71,6 +81,11 @@ protected function unifyLegacyArguments($args, $type = Assets::CSS_TYPE)
         return $arguments;
     }
 
+    /**
+     * @param array $args
+     * @param array $defaults
+     * @return array
+     */
     protected function createArgumentsFromLegacy(array $args, array $defaults)
     {
         // Remove arguments with old default values.
@@ -93,8 +108,7 @@ protected function createArgumentsFromLegacy(array $args, array $defaults)
      * @param int           $priority
      * @param bool          $pipeline
      * @param string        $group name of the group
-     *
-     * @return \Grav\Common\Assets
+     * @return Assets
      * @deprecated Please use dynamic method with ['loading' => 'async'].
      */
     public function addAsyncJs($asset, $priority = 10, $pipeline = true, $group = 'head')
@@ -111,8 +125,7 @@ public function addAsyncJs($asset, $priority = 10, $pipeline = true, $group = 'h
      * @param int           $priority
      * @param bool          $pipeline
      * @param string        $group name of the group
-     *
-     * @return \Grav\Common\Assets
+     * @return Assets
      * @deprecated Please use dynamic method with ['loading' => 'defer'].
      */
     public function addDeferJs($asset, $priority = 10, $pipeline = true, $group = 'head')
@@ -121,5 +134,4 @@ public function addDeferJs($asset, $priority = 10, $pipeline = true, $group = 'h
 
         return $this->addJs($asset, $priority, $pipeline, 'defer', $group);
     }
-
 }
diff --git a/system/src/Grav/Common/Assets/Traits/TestingAssetsTrait.php b/system/src/Grav/Common/Assets/Traits/TestingAssetsTrait.php
index 84b83e304f..b11b439b62 100644
--- a/system/src/Grav/Common/Assets/Traits/TestingAssetsTrait.php
+++ b/system/src/Grav/Common/Assets/Traits/TestingAssetsTrait.php
@@ -3,21 +3,29 @@
 /**
  * @package    Grav\Common\Assets\Traits
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Assets\Traits;
 
+use FilesystemIterator;
 use Grav\Common\Grav;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use RegexIterator;
+use function strlen;
 
+/**
+ * Trait TestingAssetsTrait
+ * @package Grav\Common\Assets\Traits
+ */
 trait TestingAssetsTrait
 {
     /**
      * Determines if an asset exists as a collection, CSS or JS reference
      *
      * @param string $asset
-     *
      * @return bool
      */
     public function exists($asset)
@@ -39,7 +47,6 @@ public function getCollections()
      * Set the array of collections explicitly
      *
      * @param array $collections
-     *
      * @return $this
      */
     public function setCollection($collections)
@@ -54,7 +61,7 @@ public function setCollection($collections)
      * If a $key is provided, it will try to return only that asset
      * else it will return null
      *
-     * @param null|string $key the asset key
+     * @param string|null $key the asset key
      * @return array
      */
     public function getCss($key = null)
@@ -73,7 +80,7 @@ public function getCss($key = null)
      * If a $key is provided, it will try to return only that asset
      * else it will return null
      *
-     * @param null|string $key the asset key
+     * @param string|null $key the asset key
      * @return array
      */
     public function getJs($key = null)
@@ -91,7 +98,6 @@ public function getJs($key = null)
      * Set the whole array of CSS assets
      *
      * @param array $css
-     *
      * @return $this
      */
     public function setCss($css)
@@ -105,7 +111,6 @@ public function setCss($css)
      * Set the whole array of JS assets
      *
      * @param array $js
-     *
      * @return $this
      */
     public function setJs($js)
@@ -119,7 +124,6 @@ public function setJs($js)
      * Removes an item from the CSS array if set
      *
      * @param string $key  The asset key
-     *
      * @return $this
      */
     public function removeCss($key)
@@ -136,7 +140,6 @@ public function removeCss($key)
      * Removes an item from the JS array if set
      *
      * @param string $key  The asset key
-     *
      * @return $this
      */
     public function removeJs($key)
@@ -153,7 +156,6 @@ public function removeJs($key)
      * Sets the state of CSS Pipeline
      *
      * @param bool $value
-     *
      * @return $this
      */
     public function setCssPipeline($value)
@@ -167,7 +169,6 @@ public function setCssPipeline($value)
      * Sets the state of JS Pipeline
      *
      * @param bool $value
-     *
      * @return $this
      */
     public function setJsPipeline($value)
@@ -188,6 +189,7 @@ public function reset()
         $this->resetJs();
         $this->setCssPipeline(false);
         $this->setJsPipeline(false);
+        $this->order = [];
 
         return $this;
     }
@@ -230,7 +232,7 @@ public function setTimestamp($value)
      * Get the timestamp for assets
      *
      * @param  bool  $include_join
-     * @return string
+     * @return string|null
      */
     public function getTimestamp($include_join = true)
     {
@@ -246,12 +248,11 @@ public function getTimestamp($include_join = true)
      *
      * @param  string $directory Relative to the Grav root path, or a stream identifier
      * @param  string $pattern   (regex)
-     *
      * @return $this
      */
     public function addDir($directory, $pattern = self::DEFAULT_REGEX)
     {
-        $root_dir = rtrim(ROOT_DIR, '/');
+        $root_dir = GRAV_ROOT;
 
         // Check if $directory is a stream.
         if (strpos($directory, '://')) {
@@ -284,6 +285,15 @@ public function addDir($directory, $pattern = self::DEFAULT_REGEX)
             return $this;
         }
 
+        // Add JavaScript Module files
+        if ($pattern === self::JS_MODULE_REGEX) {
+            foreach ($files as $file) {
+                $this->addJsModule($file);
+            }
+
+            return $this;
+        }
+
         // Unknown pattern.
         foreach ($files as $asset) {
             $this->add($asset);
@@ -296,7 +306,6 @@ public function addDir($directory, $pattern = self::DEFAULT_REGEX)
      * Add all JavaScript assets within $directory
      *
      * @param  string $directory Relative to the Grav root path, or a stream identifier
-     *
      * @return $this
      */
     public function addDirJs($directory)
@@ -308,7 +317,6 @@ public function addDirJs($directory)
      * Add all CSS assets within $directory
      *
      * @param  string $directory Relative to the Grav root path, or a stream identifier
-     *
      * @return $this
      */
     public function addDirCss($directory)
@@ -321,15 +329,16 @@ public function addDirCss($directory)
      *
      * @param  string $directory
      * @param  string $pattern (regex)
-     * @param  string $ltrim   Will be trimmed from the left of the file path
-     *
+     * @param  string|null $ltrim   Will be trimmed from the left of the file path
      * @return array
      */
     protected function rglob($directory, $pattern, $ltrim = null)
     {
-        $iterator = new \RegexIterator(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory,
-            \FilesystemIterator::SKIP_DOTS)), $pattern);
-        $offset = \strlen($ltrim);
+        $iterator = new RegexIterator(new RecursiveIteratorIterator(new RecursiveDirectoryIterator(
+            $directory,
+            FilesystemIterator::SKIP_DOTS
+        )), $pattern);
+        $offset = strlen($ltrim);
         $files = [];
 
         foreach ($iterator as $file) {
@@ -338,6 +347,4 @@ protected function rglob($directory, $pattern, $ltrim = null)
 
         return $files;
     }
-
-
 }
diff --git a/system/src/Grav/Common/Backup/Backups.php b/system/src/Grav/Common/Backup/Backups.php
index 9582b9e620..ff4789d86b 100644
--- a/system/src/Grav/Common/Backup/Backups.php
+++ b/system/src/Grav/Common/Backup/Backups.php
@@ -3,12 +3,16 @@
 /**
  * @package    Grav\Common\Backup
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Backup;
 
+use DateTime;
+use Exception;
+use FilesystemIterator;
+use GlobIterator;
 use Grav\Common\Filesystem\Archiver;
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\Inflector;
@@ -17,107 +21,156 @@
 use Grav\Common\Utils;
 use Grav\Common\Grav;
 use RocketTheme\Toolbox\Event\Event;
-use RocketTheme\Toolbox\Event\EventDispatcher;
 use RocketTheme\Toolbox\File\JsonFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use SplFileInfo;
+use stdClass;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use function count;
 
+/**
+ * Class Backups
+ * @package Grav\Common\Backup
+ */
 class Backups
 {
     protected const BACKUP_FILENAME_REGEXZ = "#(.*)--(\d*).zip#";
 
     protected const BACKUP_DATE_FORMAT = 'YmdHis';
 
+    /** @var string */
     protected static $backup_dir;
 
-    protected static $backups = null;
+    /** @var array|null */
+    protected static $backups;
 
+    /**
+     * @return void
+     */
     public function init()
     {
+        $grav = Grav::instance();
+
         /** @var EventDispatcher $dispatcher */
-        $dispatcher = Grav::instance()['events'];
+        $dispatcher = $grav['events'];
         $dispatcher->addListener('onSchedulerInitialized', [$this, 'onSchedulerInitialized']);
-        Grav::instance()->fireEvent('onBackupsInitialized', new Event(['backups' => $this]));
+
+        $grav->fireEvent('onBackupsInitialized', new Event(['backups' => $this]));
     }
 
+    /**
+     * @return void
+     */
     public function setup()
     {
         if (null === static::$backup_dir) {
-            static::$backup_dir = Grav::instance()['locator']->findResource('backup://', true, true);
+            $grav = Grav::instance();
+            static::$backup_dir = $grav['locator']->findResource('backup://', true, true);
             Folder::create(static::$backup_dir);
         }
     }
 
+    /**
+     * @param Event $event
+     * @return void
+     */
     public function onSchedulerInitialized(Event $event)
     {
+        $grav = Grav::instance();
+
         /** @var Scheduler $scheduler */
         $scheduler = $event['scheduler'];
 
         /** @var Inflector $inflector */
-        $inflector = Grav::instance()['inflector'];
+        $inflector = $grav['inflector'];
 
         foreach (static::getBackupProfiles() as $id => $profile) {
             $at = $profile['schedule_at'];
             $name = $inflector::hyphenize($profile['name']);
             $logs = 'logs/backup-' . $name . '.out';
             /** @var Job $job */
-            $job = $scheduler->addFunction('Grav\Common\Backup\Backups::backup', [$id], $name );
+            $job = $scheduler->addFunction('Grav\Common\Backup\Backups::backup', [$id], $name);
             $job->at($at);
             $job->output($logs);
             $job->backlink('/tools/backups');
         }
     }
 
+    /**
+     * @param string $backup
+     * @param string $base_url
+     * @return string
+     */
     public function getBackupDownloadUrl($backup, $base_url)
     {
-        $param_sep = $param_sep = Grav::instance()['config']->get('system.param_sep', ':');
-        $download = urlencode(base64_encode($backup));
-        $url      = rtrim(Grav::instance()['uri']->rootUrl(true), '/') . '/' . trim($base_url,
-                '/') . '/task' . $param_sep . 'backup/download' . $param_sep . $download . '/admin-nonce' . $param_sep . Utils::getNonce('admin-form');
+        $param_sep = Grav::instance()['config']->get('system.param_sep', ':');
+        $download = urlencode(base64_encode(Utils::basename($backup)));
+        $url      = rtrim(Grav::instance()['uri']->rootUrl(true), '/') . '/' . trim(
+            $base_url,
+            '/'
+        ) . '/task' . $param_sep . 'backup/download' . $param_sep . $download . '/admin-nonce' . $param_sep . Utils::getNonce('admin-form');
 
         return $url;
     }
 
+    /**
+     * @return array
+     */
     public static function getBackupProfiles()
     {
         return Grav::instance()['config']->get('backups.profiles');
     }
 
+    /**
+     * @return array
+     */
     public static function getPurgeConfig()
     {
         return Grav::instance()['config']->get('backups.purge');
     }
 
+    /**
+     * @return array
+     */
     public function getBackupNames()
     {
         return array_column(static::getBackupProfiles(), 'name');
     }
 
+    /**
+     * @return float|int
+     */
     public static function getTotalBackupsSize()
     {
         $backups = static::getAvailableBackups();
-        $size = array_sum(array_column($backups, 'size'));
 
-        return $size ?? 0;
+        return $backups ? array_sum(array_column($backups, 'size')) : 0;
     }
 
+    /**
+     * @param bool $force
+     * @return array
+     */
     public static function getAvailableBackups($force = false)
     {
         if ($force || null === static::$backups) {
             static::$backups = [];
-            $backups_itr = new \GlobIterator(static::$backup_dir . '/*.zip', \FilesystemIterator::KEY_AS_FILENAME);
-            $inflector = Grav::instance()['inflector'];
+
+            $grav = Grav::instance();
+            $backups_itr = new GlobIterator(static::$backup_dir . '/*.zip', FilesystemIterator::KEY_AS_FILENAME);
+            $inflector = $grav['inflector'];
             $long_date_format = DATE_RFC2822;
 
             /**
              * @var string $name
-             * @var \SplFileInfo $file
+             * @var SplFileInfo $file
              */
             foreach ($backups_itr as $name => $file) {
-
                 if (preg_match(static::BACKUP_FILENAME_REGEXZ, $name, $matches)) {
-                    $date = \DateTime::createFromFormat(static::BACKUP_DATE_FORMAT, $matches[2]);
+                    $date = DateTime::createFromFormat(static::BACKUP_DATE_FORMAT, $matches[2]);
                     $timestamp = $date->getTimestamp();
-                    $backup = new \stdClass();
+                    $backup = new stdClass();
                     $backup->title = $inflector->titleize($matches[1]);
                     $backup->time = $date;
                     $backup->date = $date->format($long_date_format);
@@ -137,28 +190,29 @@ public static function getAvailableBackups($force = false)
     /**
      * Backup
      *
-     * @param int   $id
+     * @param int $id
      * @param callable|null $status
-     *
-     * @return null|string
+     * @return string|null
      */
     public static function backup($id = 0, callable $status = null)
     {
+        $grav = Grav::instance();
+
         $profiles = static::getBackupProfiles();
         /** @var UniformResourceLocator $locator */
-        $locator = Grav::instance()['locator'];
+        $locator = $grav['locator'];
 
         if (isset($profiles[$id])) {
             $backup = (object) $profiles[$id];
         } else {
-            throw new \RuntimeException('No backups defined...');
+            throw new RuntimeException('No backups defined...');
         }
 
-        $name = Grav::instance()['inflector']->underscorize($backup->name);
+        $name = $grav['inflector']->underscorize($backup->name);
         $date = date(static::BACKUP_DATE_FORMAT, time());
         $filename = trim($name, '_') . '--' . $date . '.zip';
         $destination = static::$backup_dir . DS . $filename;
-        $max_execution_time = ini_set('max_execution_time', 600);
+        $max_execution_time = ini_set('max_execution_time', '600');
         $backup_root = $backup->root;
 
         if ($locator->isStream($backup_root)) {
@@ -167,8 +221,8 @@ public static function backup($id = 0, callable $status = null)
             $backup_root = rtrim(GRAV_ROOT . $backup_root, '/');
         }
 
-        if (!file_exists($backup_root)) {
-            throw new \RuntimeException("Backup location: {$backup_root} does not exist...");
+        if (!$backup_root || !file_exists($backup_root)) {
+            throw new RuntimeException("Backup location: {$backup_root} does not exist...");
         }
 
         $options = [
@@ -176,7 +230,6 @@ public static function backup($id = 0, callable $status = null)
             'exclude_paths' => static::convertExclude($backup->exclude_paths ?? ''),
         ];
 
-        /** @var Archiver $archiver */
         $archiver = Archiver::create('zip');
         $archiver->setArchive($destination)->setOptions($options)->compress($backup_root, $status)->addEmptyFolders($options['exclude_paths'], $status);
 
@@ -195,16 +248,16 @@ public static function backup($id = 0, callable $status = null)
         }
 
         // Log the backup
-        Grav::instance()['log']->notice('Backup Created: ' . $destination);
+        $grav['log']->notice('Backup Created: ' . $destination);
 
         // Fire Finished event
-        Grav::instance()->fireEvent('onBackupFinished', new Event(['backup' => $destination]));
+        $grav->fireEvent('onBackupFinished', new Event(['backup' => $destination]));
 
         // Purge anything required
         static::purge();
 
         // Log
-        $log = JsonFile::instance(Grav::instance()['locator']->findResource("log://backup.log", true, true));
+        $log = JsonFile::instance($locator->findResource("log://backup.log", true, true));
         $log->content([
             'time'     => time(),
             'location' => $destination
@@ -214,26 +267,29 @@ public static function backup($id = 0, callable $status = null)
         return $destination;
     }
 
+    /**
+     * @return void
+     * @throws Exception
+     */
     public static function purge()
     {
         $purge_config = static::getPurgeConfig();
         $trigger = $purge_config['trigger'];
         $backups = static::getAvailableBackups(true);
 
-        switch ($trigger)
-        {
+        switch ($trigger) {
             case 'number':
                 $backups_count = count($backups);
                 if ($backups_count > $purge_config['max_backups_count']) {
                     $last = end($backups);
-                    unlink ($last->path);
+                    unlink($last->path);
                     static::purge();
                 }
                 break;
 
             case 'time':
                 $last = end($backups);
-                $now = new \DateTime();
+                $now = new DateTime();
                 $interval = $now->diff($last->time);
                 if ($interval->days > $purge_config['max_backups_time']) {
                     unlink($last->path);
@@ -253,9 +309,14 @@ public static function purge()
         }
     }
 
+    /**
+     * @param string $exclude
+     * @return array
+     */
     protected static function convertExclude($exclude)
     {
         $lines = preg_split("/[\s,]+/", $exclude);
-        return array_map('trim', $lines, array_fill(0, \count($lines), '/'));
+
+        return array_map('trim', $lines, array_fill(0, count($lines), '/'));
     }
 }
diff --git a/system/src/Grav/Common/Browser.php b/system/src/Grav/Common/Browser.php
index 037d454e28..ffc8da3138 100644
--- a/system/src/Grav/Common/Browser.php
+++ b/system/src/Grav/Common/Browser.php
@@ -3,17 +3,21 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use InvalidArgumentException;
+use function donatj\UserAgent\parse_user_agent;
+
 /**
  * Internally uses the PhpUserAgent package https://github.com/donatj/PhpUserAgent
  */
 class Browser
 {
+    /** @var string[] */
     protected $useragent = [];
 
     /**
@@ -23,7 +27,7 @@ public function __construct()
     {
         try {
             $this->useragent = parse_user_agent();
-        } catch (\InvalidArgumentException $e) {
+        } catch (InvalidArgumentException $e) {
             $this->useragent = parse_user_agent("Mozilla/5.0 (compatible; Unknown;)");
         }
     }
@@ -108,7 +112,7 @@ public function getLongVersion()
     /**
      * Get the current major version identifier
      *
-     * @return string the browser major version identifier
+     * @return int the browser major version identifier
      */
     public function getVersion()
     {
@@ -135,7 +139,7 @@ public function isHuman()
 
         return true;
     }
-    
+
     /**
      * Determine if “Do Not Track” is set by browser
      * @see https://www.w3.org/TR/tracking-dnt/
diff --git a/system/src/Grav/Common/Cache.php b/system/src/Grav/Common/Cache.php
index 94eae595e7..ed40a085fb 100644
--- a/system/src/Grav/Common/Cache.php
+++ b/system/src/Grav/Common/Cache.php
@@ -3,19 +3,27 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use DirectoryIterator;
 use \Doctrine\Common\Cache as DoctrineCache;
+use Exception;
 use Grav\Common\Config\Config;
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\Scheduler\Scheduler;
+use LogicException;
 use Psr\SimpleCache\CacheInterface;
 use RocketTheme\Toolbox\Event\Event;
-use RocketTheme\Toolbox\Event\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use function dirname;
+use function extension_loaded;
+use function function_exists;
+use function in_array;
+use function is_array;
 
 /**
  * The GravCache object is used throughout Grav to store and retrieve cached data.
@@ -29,42 +37,41 @@
  */
 class Cache extends Getters
 {
-    /**
-     * @var string Cache key.
-     */
+    /** @var string Cache key. */
     protected $key;
 
+    /** @var int */
     protected $lifetime;
+
+    /** @var int */
     protected $now;
 
     /** @var Config $config */
     protected $config;
 
-    /**
-     * @var DoctrineCache\CacheProvider
-     */
+    /** @var DoctrineCache\CacheProvider */
     protected $driver;
 
-    /**
-     * @var CacheInterface
-     */
+    /** @var CacheInterface */
     protected $simpleCache;
 
+    /** @var string */
     protected $driver_name;
 
+    /** @var string */
     protected $driver_setting;
 
-    /**
-     * @var bool
-     */
+    /** @var bool */
     protected $enabled;
 
+    /** @var string */
     protected $cache_dir;
 
     protected static $standard_remove = [
         'cache://twig/',
         'cache://doctrine/',
         'cache://compiled/',
+        'cache://clockwork/',
         'cache://validated-',
         'cache://images',
         'asset://',
@@ -74,6 +81,7 @@ class Cache extends Getters
         'cache://twig/',
         'cache://doctrine/',
         'cache://compiled/',
+        'cache://clockwork/',
         'cache://validated-',
         'asset://',
     ];
@@ -115,12 +123,10 @@ public function __construct(Grav $grav)
      * Initialization that sets a base key and the driver based on configuration settings
      *
      * @param  Grav $grav
-     *
      * @return void
      */
     public function init(Grav $grav)
     {
-        /** @var Config $config */
         $this->config = $grav['config'];
         $this->now = time();
 
@@ -135,7 +141,7 @@ public function init(Grav $grav)
         $uniqueness = substr(md5($uri->rootUrl(true) . $this->config->key() . GRAV_VERSION), 2, 8);
 
         // Cache key allows us to invalidate all cache on configuration changes.
-        $this->key = ($prefix ? $prefix : 'g') . '-' . $uniqueness;
+        $this->key = ($prefix ?: 'g') . '-' . $uniqueness;
         $this->cache_dir = $grav['locator']->findResource('cache://doctrine/' . $uniqueness, true, true);
         $this->driver_setting = $this->config->get('system.cache.driver');
         $this->driver = $this->getCacheDriver();
@@ -171,10 +177,10 @@ public function getSimpleCache()
     public function purgeOldCache()
     {
         $cache_dir = dirname($this->cache_dir);
-        $current = basename($this->cache_dir);
+        $current = Utils::basename($this->cache_dir);
         $count = 0;
 
-        foreach (new \DirectoryIterator($cache_dir) as $file) {
+        foreach (new DirectoryIterator($cache_dir) as $file) {
             $dir = $file->getBasename();
             if ($dir === $current || $file->isDot() || $file->isFile()) {
                 continue;
@@ -191,6 +197,7 @@ public function purgeOldCache()
      * Public accessor to set the enabled state of the cache
      *
      * @param bool|int $enabled
+     * @return void
      */
     public function setEnabled($enabled)
     {
@@ -260,24 +267,28 @@ public function getCacheDriver()
             case 'memcache':
                 if (extension_loaded('memcache')) {
                     $memcache = new \Memcache();
-                    $memcache->connect($this->config->get('system.cache.memcache.server', 'localhost'),
-                        $this->config->get('system.cache.memcache.port', 11211));
+                    $memcache->connect(
+                        $this->config->get('system.cache.memcache.server', 'localhost'),
+                        $this->config->get('system.cache.memcache.port', 11211)
+                    );
                     $driver = new DoctrineCache\MemcacheCache();
                     $driver->setMemcache($memcache);
                 } else {
-                    throw new \LogicException('Memcache PHP extension has not been installed');
+                    throw new LogicException('Memcache PHP extension has not been installed');
                 }
                 break;
 
             case 'memcached':
                 if (extension_loaded('memcached')) {
                     $memcached = new \Memcached();
-                    $memcached->addServer($this->config->get('system.cache.memcached.server', 'localhost'),
-                        $this->config->get('system.cache.memcached.port', 11211));
+                    $memcached->addServer(
+                        $this->config->get('system.cache.memcached.server', 'localhost'),
+                        $this->config->get('system.cache.memcached.port', 11211)
+                    );
                     $driver = new DoctrineCache\MemcachedCache();
                     $driver->setMemcached($memcached);
                 } else {
-                    throw new \LogicException('Memcached PHP extension has not been installed');
+                    throw new LogicException('Memcached PHP extension has not been installed');
                 }
                 break;
 
@@ -286,12 +297,15 @@ public function getCacheDriver()
                     $redis = new \Redis();
                     $socket = $this->config->get('system.cache.redis.socket', false);
                     $password = $this->config->get('system.cache.redis.password', false);
+                    $databaseId = $this->config->get('system.cache.redis.database', 0);
 
                     if ($socket) {
                         $redis->connect($socket);
                     } else {
-                        $redis->connect($this->config->get('system.cache.redis.server', 'localhost'),
-                            $this->config->get('system.cache.redis.port', 6379));
+                        $redis->connect(
+                            $this->config->get('system.cache.redis.server', 'localhost'),
+                            $this->config->get('system.cache.redis.port', 6379)
+                        );
                     }
 
                     // Authenticate with password if set
@@ -299,10 +313,15 @@ public function getCacheDriver()
                         throw new \RedisException('Redis authentication failed');
                     }
 
+                    // Select alternate ( !=0 ) database ID if set
+                    if ($databaseId && !$redis->select($databaseId)) {
+                        throw new \RedisException('Could not select alternate Redis database ID');
+                    }
+
                     $driver = new DoctrineCache\RedisCache();
                     $driver->setRedis($redis);
                 } else {
-                    throw new \LogicException('Redis PHP extension has not been installed');
+                    throw new LogicException('Redis PHP extension has not been installed');
                 }
                 break;
 
@@ -318,8 +337,7 @@ public function getCacheDriver()
      * Gets a cached entry if it exists based on an id. If it does not exist, it returns false
      *
      * @param  string $id the id of the cached entry
-     *
-     * @return object|bool     returns the cached entry, can be any type, or false if doesn't exist
+     * @return mixed|bool     returns the cached entry, can be any type, or false if doesn't exist
      */
     public function fetch($id)
     {
@@ -334,8 +352,8 @@ public function fetch($id)
      * Stores a new cached entry.
      *
      * @param  string       $id       the id of the cached entry
-     * @param  array|object $data     the data for the cached entry to store
-     * @param  int          $lifetime the lifetime to store the entry in seconds
+     * @param  array|object|int $data     the data for the cached entry to store
+     * @param  int|null     $lifetime the lifetime to store the entry in seconds
      */
     public function save($id, $data, $lifetime = null)
     {
@@ -393,6 +411,8 @@ public function contains($id)
 
     /**
      * Getter method to get the cache key
+     *
+     * @return string
      */
     public function getKey()
     {
@@ -401,6 +421,9 @@ public function getKey()
 
     /**
      * Setter method to set key (Advanced)
+     *
+     * @param string $key
+     * @return void
      */
     public function setKey($key)
     {
@@ -412,7 +435,6 @@ public function setKey($key)
      * Helper method to clear all Grav caches
      *
      * @param string $remove standard|all|assets-only|images-only|cache-only
-     *
      * @return array
      */
     public static function clearCache($remove = 'standard')
@@ -446,7 +468,6 @@ public static function clearCache($remove = 'standard')
                 } else {
                     $remove_paths = self::$standard_remove_no_images;
                 }
-
         }
 
         // Delete entries in the doctrine cache if required
@@ -459,11 +480,12 @@ public static function clearCache($remove = 'standard')
         Grav::instance()->fireEvent('onBeforeCacheClear', new Event(['remove' => $remove, 'paths' => &$remove_paths]));
 
         foreach ($remove_paths as $stream) {
-
             // Convert stream to a real path
             try {
                 $path = $locator->findResource($stream, true, true);
-                if($path === false) continue;
+                if ($path === false) {
+                    continue;
+                }
 
                 $anything = false;
                 $files = glob($path . '/*');
@@ -477,7 +499,7 @@ public static function clearCache($remove = 'standard')
                                 $anything = true;
                             }
                         } elseif (is_dir($file)) {
-                            if (Folder::delete($file)) {
+                            if (Folder::delete($file, false)) {
                                 $anything = true;
                             }
                         }
@@ -487,7 +509,7 @@ public static function clearCache($remove = 'standard')
                 if ($anything) {
                     $output[] = '<red>Cleared:  </red>' . $path . '/*';
                 }
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 // stream not found or another error while deleting files.
                 $output[] = '<red>ERROR: </red>' . $e->getMessage();
             }
@@ -510,9 +532,14 @@ public static function clearCache($remove = 'standard')
             @opcache_reset();
         }
 
+        Grav::instance()->fireEvent('onAfterCacheClear', new Event(['remove' => $remove, 'output' => &$output]));
+
         return $output;
     }
 
+    /**
+     * @return void
+     */
     public static function invalidateCache()
     {
         $user_config = USER_DIR . 'config/system.yaml';
@@ -528,13 +555,13 @@ public static function invalidateCache()
         if (function_exists('opcache_reset')) {
             @opcache_reset();
         }
-
     }
 
     /**
      * Set the cache lifetime programmatically
      *
      * @param int $future timestamp
+     * @return void
      */
     public function setLifetime($future)
     {
@@ -552,7 +579,7 @@ public function setLifetime($future)
     /**
      * Retrieve the cache lifetime (in seconds)
      *
-     * @return mixed
+     * @return int
      */
     public function getLifetime()
     {
@@ -566,7 +593,7 @@ public function getLifetime()
     /**
      * Returns the current driver name
      *
-     * @return mixed
+     * @return string
      */
     public function getDriverName()
     {
@@ -576,7 +603,7 @@ public function getDriverName()
     /**
      * Returns the current driver setting
      *
-     * @return mixed
+     * @return string
      */
     public function getDriverSetting()
     {
@@ -591,29 +618,35 @@ public function getDriverSetting()
      */
     public function isVolatileDriver($setting)
     {
-        if (in_array($setting, ['apc', 'apcu', 'xcache', 'wincache'])) {
-            return true;
-        }
-
-        return false;
+        return in_array($setting, ['apc', 'apcu', 'xcache', 'wincache'], true);
     }
 
     /**
      * Static function to call as a scheduled Job to purge old Doctrine files
+     *
+     * @param bool $echo
+     *
+     * @return string|void
      */
-    public static function purgeJob()
+    public static function purgeJob($echo = false)
     {
         /** @var Cache $cache */
         $cache = Grav::instance()['cache'];
         $deleted_folders = $cache->purgeOldCache();
+        $msg = 'Purged ' . $deleted_folders . ' old cache folders...';
 
-        echo 'Purged ' . $deleted_folders . ' old cache folders...';
+        if ($echo) {
+            echo $msg;
+        } else {
+            return $msg;
+        }
     }
 
     /**
      * Static function to call as a scheduled Job to clear Grav cache
      *
      * @param string $type
+     * @return void
      */
     public static function clearJob($type)
     {
@@ -623,6 +656,10 @@ public static function clearJob($type)
         echo strip_tags(implode("\n", $result));
     }
 
+    /**
+     * @param Event $event
+     * @return void
+     */
     public function onSchedulerInitialized(Event $event)
     {
         /** @var Scheduler $scheduler */
@@ -634,7 +671,7 @@ public function onSchedulerInitialized(Event $event)
         $name = 'cache-purge';
         $logs = 'logs/' . $name . '.out';
 
-        $job = $scheduler->addFunction('Grav\Common\Cache::purgeJob', [], $name );
+        $job = $scheduler->addFunction('Grav\Common\Cache::purgeJob', [true], $name);
         $job->at($at);
         $job->output($logs);
         $job->backlink('/config/system#caching');
@@ -645,12 +682,9 @@ public function onSchedulerInitialized(Event $event)
         $name = 'cache-clear';
         $logs = 'logs/' . $name . '.out';
 
-        $job = $scheduler->addFunction('Grav\Common\Cache::clearJob', [$clear_type], $name );
+        $job = $scheduler->addFunction('Grav\Common\Cache::clearJob', [$clear_type], $name);
         $job->at($at);
         $job->output($logs);
         $job->backlink('/config/system#caching');
-
     }
-
-
 }
diff --git a/system/src/Grav/Common/Composer.php b/system/src/Grav/Common/Composer.php
index c6abb2c6ca..667edf25c4 100644
--- a/system/src/Grav/Common/Composer.php
+++ b/system/src/Grav/Common/Composer.php
@@ -3,12 +3,18 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use function function_exists;
+
+/**
+ * Class Composer
+ * @package Grav\Common
+ */
 class Composer
 {
     /** @const Default composer location */
@@ -21,12 +27,12 @@ class Composer
      */
     public static function getComposerLocation()
     {
-        if (!\function_exists('shell_exec') || stripos(PHP_OS, 'win') === 0) {
+        if (!function_exists('shell_exec') || stripos(PHP_OS, 'win') === 0) {
             return self::DEFAULT_PATH;
         }
 
         // check for global composer install
-        $path = trim(shell_exec('command -v composer'));
+        $path = trim((string)shell_exec('command -v composer'));
 
         // fall back to grav bundled composer
         if (!$path || !preg_match('/(composer|composer\.phar)$/', $path)) {
diff --git a/system/src/Grav/Common/Config/CompiledBase.php b/system/src/Grav/Common/Config/CompiledBase.php
index 3e2022f0de..b462b4cfd9 100644
--- a/system/src/Grav/Common/Config/CompiledBase.php
+++ b/system/src/Grav/Common/Config/CompiledBase.php
@@ -3,78 +3,70 @@
 /**
  * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Config;
 
+use BadMethodCallException;
+use Exception;
 use RocketTheme\Toolbox\File\PhpFile;
+use RuntimeException;
+use function get_class;
+use function is_array;
 
+/**
+ * Class CompiledBase
+ * @package Grav\Common\Config
+ */
 abstract class CompiledBase
 {
-    /**
-     * @var int Version number for the compiled file.
-     */
+    /** @var int Version number for the compiled file. */
     public $version = 1;
 
-    /**
-     * @var string  Filename (base name) of the compiled configuration.
-     */
+    /** @var string  Filename (base name) of the compiled configuration. */
     public $name;
 
-    /**
-     * @var string|bool  Configuration checksum.
-     */
+    /** @var string|bool  Configuration checksum. */
     public $checksum;
 
-    /**
-     * @var string  Timestamp of compiled configuration
-     */
-    public $timestamp;
+    /** @var int  Timestamp of compiled configuration */
+    public $timestamp = 0;
 
-    /**
-     * @var string Cache folder to be used.
-     */
+    /** @var string Cache folder to be used. */
     protected $cacheFolder;
 
-    /**
-     * @var array  List of files to load.
-     */
+    /** @var array  List of files to load. */
     protected $files;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $path;
 
-    /**
-     * @var mixed  Configuration object.
-     */
+    /** @var mixed  Configuration object. */
     protected $object;
 
     /**
      * @param  string $cacheFolder  Cache folder to be used.
      * @param  array  $files  List of files as returned from ConfigFileFinder class.
      * @param string $path  Base path for the file list.
-     * @throws \BadMethodCallException
+     * @throws BadMethodCallException
      */
     public function __construct($cacheFolder, array $files, $path)
     {
         if (!$cacheFolder) {
-            throw new \BadMethodCallException('Cache folder not defined.');
+            throw new BadMethodCallException('Cache folder not defined.');
         }
 
         $this->path = $path ? rtrim($path, '\\/') . '/' : '';
         $this->cacheFolder = $cacheFolder;
         $this->files = $files;
-        $this->timestamp = 0;
     }
 
     /**
      * Get filename for the compiled PHP file.
      *
-     * @param string $name
+     * @param string|null $name
      * @return $this
      */
     public function name($name = null)
@@ -88,8 +80,12 @@ public function name($name = null)
 
     /**
      * Function gets called when cached configuration is saved.
+     *
+     * @return void
      */
-    public function modified() {}
+    public function modified()
+    {
+    }
 
     /**
      * Get timestamp of compiled configuration
@@ -136,6 +132,9 @@ public function checksum()
         return $this->checksum;
     }
 
+    /**
+     * @return string
+     */
     protected function createFilename()
     {
         return "{$this->cacheFolder}/{$this->name()->name}.php";
@@ -145,11 +144,14 @@ protected function createFilename()
      * Create configuration object.
      *
      * @param  array  $data
+     * @return void
      */
     abstract protected function createObject(array $data = []);
 
     /**
      * Finalize configuration object.
+     *
+     * @return void
      */
     abstract protected function finalizeObject();
 
@@ -157,7 +159,8 @@ abstract protected function finalizeObject();
      * Load single configuration file and append it to the correct position.
      *
      * @param  string  $name  Name of the position.
-     * @param  string  $filename  File to be loaded.
+     * @param  string|string[]  $filename  File(s) to be loaded.
+     * @return void
      */
     abstract protected function loadFile($name, $filename);
 
@@ -197,10 +200,9 @@ protected function loadCompiledFile($filename)
         }
 
         $cache = include $filename;
-        if (
-            !\is_array($cache)
+        if (!is_array($cache)
             || !isset($cache['checksum'], $cache['data'], $cache['@class'])
-            || $cache['@class'] !== \get_class($this)
+            || $cache['@class'] !== get_class($this)
         ) {
             return false;
         }
@@ -222,7 +224,8 @@ protected function loadCompiledFile($filename)
      * Save compiled file.
      *
      * @param  string  $filename
-     * @throws \RuntimeException
+     * @return void
+     * @throws RuntimeException
      * @internal
      */
     protected function saveCompiledFile($filename)
@@ -232,7 +235,7 @@ protected function saveCompiledFile($filename)
         // Attempt to lock the file for writing.
         try {
             $file->lock(false);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             // Another process has locked the file; we will check this in a bit.
         }
 
@@ -242,7 +245,7 @@ protected function saveCompiledFile($filename)
         }
 
         $cache = [
-            '@class' => \get_class($this),
+            '@class' => get_class($this),
             'timestamp' => time(),
             'checksum' => $this->checksum(),
             'files' => $this->files,
@@ -256,6 +259,9 @@ protected function saveCompiledFile($filename)
         $this->modified();
     }
 
+    /**
+     * @return array
+     */
     protected function getState()
     {
         return $this->object->toArray();
diff --git a/system/src/Grav/Common/Config/CompiledBlueprints.php b/system/src/Grav/Common/Config/CompiledBlueprints.php
index 9ad7be6f0b..e838591449 100644
--- a/system/src/Grav/Common/Config/CompiledBlueprints.php
+++ b/system/src/Grav/Common/Config/CompiledBlueprints.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -19,6 +19,12 @@
  */
 class CompiledBlueprints extends CompiledBase
 {
+    /**
+     * CompiledBlueprints constructor.
+     * @param string $cacheFolder
+     * @param array $files
+     * @param string $path
+     */
     public function __construct($cacheFolder, array $files, $path)
     {
         parent::__construct($cacheFolder, $files, $path);
@@ -45,7 +51,7 @@ public function checksum()
     /**
      * Create configuration object.
      *
-     * @param array  $data
+     * @param array $data
      */
     protected function createObject(array $data = [])
     {
@@ -64,6 +70,8 @@ protected function getTypes()
 
     /**
      * Finalize configuration object.
+     *
+     * @return void
      */
     protected function finalizeObject()
     {
@@ -74,6 +82,7 @@ protected function finalizeObject()
      *
      * @param  string  $name  Name of the position.
      * @param  array   $files  Files to be loaded.
+     * @return void
      */
     protected function loadFile($name, $files)
     {
@@ -112,6 +121,9 @@ protected function loadFiles()
         return true;
     }
 
+    /**
+     * @return array
+     */
     protected function getState()
     {
         return $this->object->getState();
diff --git a/system/src/Grav/Common/Config/CompiledConfig.php b/system/src/Grav/Common/Config/CompiledConfig.php
index 1c92edd9a2..2db6de5a6b 100644
--- a/system/src/Grav/Common/Config/CompiledConfig.php
+++ b/system/src/Grav/Common/Config/CompiledConfig.php
@@ -3,26 +3,33 @@
 /**
  * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
+use function is_callable;
 
+/**
+ * Class CompiledConfig
+ * @package Grav\Common\Config
+ */
 class CompiledConfig extends CompiledBase
 {
-    /**
-     * @var callable  Blueprints loader.
-     */
+    /** @var callable  Blueprints loader. */
     protected $callable;
 
+    /** @var bool */
+    protected $withDefaults = false;
+
     /**
-     * @var bool
+     * CompiledConfig constructor.
+     * @param string $cacheFolder
+     * @param array $files
+     * @param string $path
      */
-    protected $withDefaults;
-
     public function __construct($cacheFolder, array $files, $path)
     {
         parent::__construct($cacheFolder, $files, $path);
@@ -58,10 +65,11 @@ public function load($withDefaults = false)
      * Create configuration object.
      *
      * @param  array  $data
+     * @return void
      */
     protected function createObject(array $data = [])
     {
-        if ($this->withDefaults && empty($data) && \is_callable($this->callable)) {
+        if ($this->withDefaults && empty($data) && is_callable($this->callable)) {
             $blueprints = $this->callable;
             $data = $blueprints()->getDefaults();
         }
@@ -71,6 +79,8 @@ protected function createObject(array $data = [])
 
     /**
      * Finalize configuration object.
+     *
+     * @return void
      */
     protected function finalizeObject()
     {
@@ -80,6 +90,8 @@ protected function finalizeObject()
 
     /**
      * Function gets called when cached configuration is saved.
+     *
+     * @return void
      */
     public function modified()
     {
@@ -91,6 +103,7 @@ public function modified()
      *
      * @param  string  $name  Name of the position.
      * @param  string  $filename  File to be loaded.
+     * @return void
      */
     protected function loadFile($name, $filename)
     {
diff --git a/system/src/Grav/Common/Config/CompiledLanguages.php b/system/src/Grav/Common/Config/CompiledLanguages.php
index ef18145c8d..0a2668638b 100644
--- a/system/src/Grav/Common/Config/CompiledLanguages.php
+++ b/system/src/Grav/Common/Config/CompiledLanguages.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,8 +11,18 @@
 
 use Grav\Common\File\CompiledYamlFile;
 
+/**
+ * Class CompiledLanguages
+ * @package Grav\Common\Config
+ */
 class CompiledLanguages extends CompiledBase
 {
+    /**
+     * CompiledLanguages constructor.
+     * @param string $cacheFolder
+     * @param array $files
+     * @param string $path
+     */
     public function __construct($cacheFolder, array $files, $path)
     {
         parent::__construct($cacheFolder, $files, $path);
@@ -24,6 +34,7 @@ public function __construct($cacheFolder, array $files, $path)
      * Create configuration object.
      *
      * @param  array  $data
+     * @return void
      */
     protected function createObject(array $data = [])
     {
@@ -32,6 +43,8 @@ protected function createObject(array $data = [])
 
     /**
      * Finalize configuration object.
+     *
+     * @return void
      */
     protected function finalizeObject()
     {
@@ -42,6 +55,8 @@ protected function finalizeObject()
 
     /**
      * Function gets called when cached configuration is saved.
+     *
+     * @return void
      */
     public function modified()
     {
@@ -53,6 +68,7 @@ public function modified()
      *
      * @param  string  $name  Name of the position.
      * @param  string  $filename  File to be loaded.
+     * @return void
      */
     protected function loadFile($name, $filename)
     {
diff --git a/system/src/Grav/Common/Config/Config.php b/system/src/Grav/Common/Config/Config.php
index 7b808463b1..ca027bf46b 100644
--- a/system/src/Grav/Common/Config/Config.php
+++ b/system/src/Grav/Common/Config/Config.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,9 +14,15 @@
 use Grav\Common\Data\Data;
 use Grav\Common\Service\ConfigServiceProvider;
 use Grav\Common\Utils;
+use function is_array;
 
+/**
+ * Class Config
+ * @package Grav\Common\Config
+ */
 class Config extends Data
 {
+    /** @var string */
     public $environment;
 
     /** @var string */
@@ -28,6 +34,9 @@ class Config extends Data
     /** @var bool */
     protected $modified = false;
 
+    /**
+     * @return string
+     */
     public function key()
     {
         if (null === $this->key) {
@@ -37,6 +46,10 @@ public function key()
         return $this->key;
     }
 
+    /**
+     * @param string|null $checksum
+     * @return string|null
+     */
     public function checksum($checksum = null)
     {
         if ($checksum !== null) {
@@ -46,6 +59,10 @@ public function checksum($checksum = null)
         return $this->checksum;
     }
 
+    /**
+     * @param bool|null $modified
+     * @return bool
+     */
     public function modified($modified = null)
     {
         if ($modified !== null) {
@@ -55,6 +72,10 @@ public function modified($modified = null)
         return $this->modified;
     }
 
+    /**
+     * @param int|null $timestamp
+     * @return int
+     */
     public function timestamp($timestamp = null)
     {
         if ($timestamp !== null) {
@@ -64,6 +85,9 @@ public function timestamp($timestamp = null)
         return $this->timestamp;
     }
 
+    /**
+     * @return $this
+     */
     public function reload()
     {
         $grav = Grav::instance();
@@ -86,6 +110,9 @@ public function reload()
         return $this;
     }
 
+    /**
+     * @return void
+     */
     public function debug()
     {
         /** @var Debugger $debugger */
@@ -97,11 +124,14 @@ public function debug()
         }
     }
 
+    /**
+     * @return void
+     */
     public function init()
     {
         $setup = Grav::instance()['setup']->toArray();
         foreach ($setup as $key => $value) {
-            if ($key === 'streams' || !\is_array($value)) {
+            if ($key === 'streams' || !is_array($value)) {
                 // Optimized as streams and simple values are fully defined in setup.
                 $this->items[$key] = $value;
             } else {
diff --git a/system/src/Grav/Common/Config/ConfigFileFinder.php b/system/src/Grav/Common/Config/ConfigFileFinder.php
index 1e7adca59a..28f9dc11a2 100644
--- a/system/src/Grav/Common/Config/ConfigFileFinder.php
+++ b/system/src/Grav/Common/Config/ConfigFileFinder.php
@@ -3,16 +3,23 @@
 /**
  * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Config;
 
+use DirectoryIterator;
 use Grav\Common\Filesystem\Folder;
+use RecursiveDirectoryIterator;
 
+/**
+ * Class ConfigFileFinder
+ * @package Grav\Common\Config
+ */
 class ConfigFileFinder
 {
+    /** @var string */
     protected $base = '';
 
     /**
@@ -40,6 +47,7 @@ public function locateFiles(array $paths, $pattern = '|\.yaml$|', $levels = -1)
         foreach ($paths as $folder) {
             $list += $this->detectRecursive($folder, $pattern, $levels);
         }
+
         return $list;
     }
 
@@ -61,6 +69,7 @@ public function getFiles(array $paths, $pattern = '|\.yaml$|', $levels = -1)
 
             $list += $files[trim($path, '/')];
         }
+
         return $list;
     }
 
@@ -78,6 +87,7 @@ public function listFiles(array $paths, $pattern = '|\.yaml$|', $levels = -1)
         foreach ($paths as $folder) {
             $list = array_merge_recursive($list, $this->detectAll($folder, $pattern, $levels));
         }
+
         return $list;
     }
 
@@ -96,6 +106,7 @@ public function locateFileInFolder($filename, array $folders)
         foreach ($folders as $folder) {
             $list += $this->detectInFolder($folder, $filename);
         }
+
         return $list;
     }
 
@@ -103,7 +114,7 @@ public function locateFileInFolder($filename, array $folders)
      * Find filename from a list of folders.
      *
      * @param array $folders
-     * @param string $filename
+     * @param string|null $filename
      * @return array
      */
     public function locateInFolders(array $folders, $filename = null)
@@ -113,6 +124,7 @@ public function locateInFolders(array $folders, $filename = null)
             $path = trim(Folder::getRelativePath($folder), '/');
             $list[$path] = $this->detectInFolder($folder, $filename);
         }
+
         return $list;
     }
 
@@ -166,7 +178,7 @@ protected function detectRecursive($folder, $pattern, $levels)
                 'filters' => [
                     'pre-key' => $this->base,
                     'key' => $pattern,
-                    'value' => function (\RecursiveDirectoryIterator $file) use ($path) {
+                    'value' => function (RecursiveDirectoryIterator $file) use ($path) {
                         return ['file' => "{$path}/{$file->getSubPathname()}", 'modified' => $file->getMTime()];
                     }
                 ],
@@ -187,7 +199,7 @@ protected function detectRecursive($folder, $pattern, $levels)
      * Detects all directories with the lookup file and returns them with last modification time.
      *
      * @param  string $folder Location to look up from.
-     * @param  string $lookup Filename to be located (defaults to directory name).
+     * @param  string|null $lookup Filename to be located (defaults to directory name).
      * @return array
      * @internal
      */
@@ -200,9 +212,7 @@ protected function detectInFolder($folder, $lookup = null)
         $list = [];
 
         if (is_dir($folder)) {
-            $iterator = new \DirectoryIterator($folder);
-
-            /** @var \DirectoryIterator $directory */
+            $iterator = new DirectoryIterator($folder);
             foreach ($iterator as $directory) {
                 if (!$directory->isDir() || $directory->isDot()) {
                     continue;
@@ -244,7 +254,7 @@ protected function detectAll($folder, $pattern, $levels)
                 'filters' => [
                     'pre-key' => $this->base,
                     'key' => $pattern,
-                    'value' => function (\RecursiveDirectoryIterator $file) use ($path) {
+                    'value' => function (RecursiveDirectoryIterator $file) use ($path) {
                         return ["{$path}/{$file->getSubPathname()}" => $file->getMTime()];
                     }
                 ],
diff --git a/system/src/Grav/Common/Config/Languages.php b/system/src/Grav/Common/Config/Languages.php
index 9c76dc562a..05798c5739 100644
--- a/system/src/Grav/Common/Config/Languages.php
+++ b/system/src/Grav/Common/Config/Languages.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,24 +12,25 @@
 use Grav\Common\Data\Data;
 use Grav\Common\Utils;
 
+/**
+ * Class Languages
+ * @package Grav\Common\Config
+ */
 class Languages extends Data
 {
-    /**
-     * @var string|null
-     */
+    /** @var string|null */
     protected $checksum;
 
-    /**
-     * @var string|null
-     */
-    protected $modified;
+    /** @var bool */
+    protected $modified = false;
+
+    /** @var int */
+    protected $timestamp = 0;
 
     /**
-     * @var string|null
+     * @param string|null $checksum
+     * @return string|null
      */
-    protected $timestamp;
-
-
     public function checksum($checksum = null)
     {
         if ($checksum !== null) {
@@ -39,6 +40,10 @@ public function checksum($checksum = null)
         return $this->checksum;
     }
 
+    /**
+     * @param bool|null $modified
+     * @return bool
+     */
     public function modified($modified = null)
     {
         if ($modified !== null) {
@@ -48,6 +53,10 @@ public function modified($modified = null)
         return $this->modified;
     }
 
+    /**
+     * @param int|null $timestamp
+     * @return int
+     */
     public function timestamp($timestamp = null)
     {
         if ($timestamp !== null) {
@@ -57,6 +66,9 @@ public function timestamp($timestamp = null)
         return $this->timestamp;
     }
 
+    /**
+     * @return void
+     */
     public function reformat()
     {
         if (isset($this->items['plugins'])) {
@@ -65,17 +77,29 @@ public function reformat()
         }
     }
 
+    /**
+     * @param array $data
+     * @return void
+     */
     public function mergeRecursive(array $data)
     {
         $this->items = Utils::arrayMergeRecursiveUnique($this->items, $data);
     }
 
+    /**
+     * @param string $lang
+     * @return array
+     */
     public function flattenByLang($lang)
     {
         $language = $this->items[$lang];
         return Utils::arrayFlattenDotNotation($language);
     }
 
+    /**
+     * @param array $array
+     * @return array
+     */
     public function unflatten($array)
     {
         return Utils::arrayUnflattenDotNotation($array);
diff --git a/system/src/Grav/Common/Config/Setup.php b/system/src/Grav/Common/Config/Setup.php
index 6a4d336bbe..b8c121a1c5 100644
--- a/system/src/Grav/Common/Config/Setup.php
+++ b/system/src/Grav/Common/Config/Setup.php
@@ -3,19 +3,28 @@
 /**
  * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Config;
 
+use BadMethodCallException;
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Data\Data;
 use Grav\Common\Utils;
+use InvalidArgumentException;
 use Pimple\Container;
 use Psr\Http\Message\ServerRequestInterface;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use function defined;
+use function is_array;
 
+/**
+ * Class Setup
+ * @package Grav\Common\Config
+ */
 class Setup extends Data
 {
     /**
@@ -28,28 +37,61 @@ class Setup extends Data
     ];
 
     /**
-     * @var string Current environment normalized to lower case.
+     * @var string|null Current environment normalized to lower case.
      */
     public static $environment;
 
+    /** @var string */
+    public static $securityFile = 'config://security.yaml';
+
+    /** @var array */
     protected $streams = [
-        'system' => [
+        'user' => [
             'type' => 'ReadOnlyStream',
+            'force' => true,
             'prefixes' => [
-                '' => ['system'],
+                '' => [] // Set in constructor
             ]
         ],
-        'user' => [
-            'type' => 'ReadOnlyStream',
+        'cache' => [
+            'type' => 'Stream',
+            'force' => true,
+            'prefixes' => [
+                '' => [], // Set in constructor
+                'images' => ['images']
+            ]
+        ],
+        'log' => [
+            'type' => 'Stream',
+            'force' => true,
+            'prefixes' => [
+                '' => [] // Set in constructor
+            ]
+        ],
+        'tmp' => [
+            'type' => 'Stream',
+            'force' => true,
+            'prefixes' => [
+                '' => [] // Set in constructor
+            ]
+        ],
+        'backup' => [
+            'type' => 'Stream',
             'force' => true,
             'prefixes' => [
-                '' => ['user'],
+                '' => [] // Set in constructor
             ]
         ],
         'environment' => [
             'type' => 'ReadOnlyStream'
             // If not defined, environment will be set up in the constructor.
         ],
+        'system' => [
+            'type' => 'ReadOnlyStream',
+            'prefixes' => [
+                '' => ['system'],
+            ]
+        ],
         'asset' => [
             'type' => 'Stream',
             'prefixes' => [
@@ -59,13 +101,13 @@ class Setup extends Data
         'blueprints' => [
             'type' => 'ReadOnlyStream',
             'prefixes' => [
-                '' => ['environment://blueprints', 'user://blueprints', 'system/blueprints'],
+                '' => ['environment://blueprints', 'user://blueprints', 'system://blueprints'],
             ]
         ],
         'config' => [
             'type' => 'ReadOnlyStream',
             'prefixes' => [
-                '' => ['environment://config', 'user://config', 'system/config'],
+                '' => ['environment://config', 'user://config', 'system://config'],
             ]
         ],
         'plugins' => [
@@ -89,36 +131,7 @@ class Setup extends Data
         'languages' => [
             'type' => 'ReadOnlyStream',
             'prefixes' => [
-                '' => ['environment://languages', 'user://languages', 'system/languages'],
-            ]
-        ],
-        'cache' => [
-            'type' => 'Stream',
-            'force' => true,
-            'prefixes' => [
-                '' => ['cache'],
-                'images' => ['images']
-            ]
-        ],
-        'log' => [
-            'type' => 'Stream',
-            'force' => true,
-            'prefixes' => [
-                '' => ['logs']
-            ]
-        ],
-        'backup' => [
-            'type' => 'Stream',
-            'force' => true,
-            'prefixes' => [
-                '' => ['backup']
-            ]
-        ],
-        'tmp' => [
-            'type' => 'Stream',
-            'force' => true,
-            'prefixes' => [
-                '' => ['tmp']
+                '' => ['environment://languages', 'user://languages', 'system://languages'],
             ]
         ],
         'image' => [
@@ -153,27 +166,59 @@ class Setup extends Data
      */
     public function __construct($container)
     {
+        // Configure main streams.
+        $abs = str_starts_with(GRAV_SYSTEM_PATH, '/');
+        $this->streams['system']['prefixes'][''] = $abs ? ['system', GRAV_SYSTEM_PATH] : ['system'];
+        $this->streams['user']['prefixes'][''] = [GRAV_USER_PATH];
+        $this->streams['cache']['prefixes'][''] = [GRAV_CACHE_PATH];
+        $this->streams['log']['prefixes'][''] = [GRAV_LOG_PATH];
+        $this->streams['tmp']['prefixes'][''] = [GRAV_TMP_PATH];
+        $this->streams['backup']['prefixes'][''] = [GRAV_BACKUP_PATH];
+
+        // If environment is not set, look for the environment variable and then the constant.
+        $environment = static::$environment ??
+            (defined('GRAV_ENVIRONMENT') ? GRAV_ENVIRONMENT : (getenv('GRAV_ENVIRONMENT') ?: null));
+
         // If no environment is set, make sure we get one (CLI or hostname).
-        if (!static::$environment) {
-            if (\defined('GRAV_CLI')) {
-                static::$environment = 'cli';
+        if (null === $environment) {
+            if (defined('GRAV_CLI')) {
+                $request = null;
+                $uri = null;
+                $environment = 'cli';
             } else {
                 /** @var ServerRequestInterface $request */
                 $request = $container['request'];
-                $host = $request->getUri()->getHost();
-
-                static::$environment = Utils::substrToString($host, ':');
+                $uri = $request->getUri();
+                $environment = $uri->getHost();
             }
         }
 
         // Resolve server aliases to the proper environment.
-        $environment = $this->environments[static::$environment] ?? static::$environment;
+        static::$environment = static::$environments[$environment] ?? $environment;
 
         // Pre-load setup.php which contains our initial configuration.
         // Configuration may contain dynamic parts, which is why we need to always load it.
-        // If "GRAV_SETUP_PATH" has been defined, use it, otherwise use defaults.
-        $file = \defined('GRAV_SETUP_PATH') ? GRAV_SETUP_PATH :  GRAV_ROOT . '/setup.php';
-        $setup = is_file($file) ? (array) include $file : [];
+        // If GRAV_SETUP_PATH has been defined, use it, otherwise use defaults.
+        $setupFile = defined('GRAV_SETUP_PATH') ? GRAV_SETUP_PATH : (getenv('GRAV_SETUP_PATH') ?: null);
+        if (null !== $setupFile) {
+            // Make sure that the custom setup file exists. Terminates the script if not.
+            if (!str_starts_with($setupFile, '/')) {
+                $setupFile = GRAV_WEBROOT . '/' . $setupFile;
+            }
+            if (!is_file($setupFile)) {
+                echo 'GRAV_SETUP_PATH is defined but does not point to existing setup file.';
+                exit(1);
+            }
+        } else {
+            $setupFile = GRAV_WEBROOT . '/setup.php';
+            if (!is_file($setupFile)) {
+                $setupFile = GRAV_WEBROOT . '/' . GRAV_USER_PATH . '/setup.php';
+            }
+            if (!is_file($setupFile)) {
+                $setupFile = null;
+            }
+        }
+        $setup = $setupFile ? (array) include $setupFile : [];
 
         // Add default streams defined in beginning of the class.
         if (!isset($setup['streams']['schemes'])) {
@@ -184,19 +229,41 @@ public function __construct($container)
         // Initialize class.
         parent::__construct($setup);
 
+        $this->def('environment', static::$environment);
+
+        // Figure out path for the current environment.
+        $envPath = defined('GRAV_ENVIRONMENT_PATH') ? GRAV_ENVIRONMENT_PATH : (getenv('GRAV_ENVIRONMENT_PATH') ?: null);
+        if (null === $envPath) {
+            // Find common path for all environments and append current environment into it.
+            $envPath = defined('GRAV_ENVIRONMENTS_PATH') ? GRAV_ENVIRONMENTS_PATH : (getenv('GRAV_ENVIRONMENTS_PATH') ?: null);
+            if (null !== $envPath) {
+                $envPath .= '/';
+            } else {
+                // Use default location. Start with Grav 1.7 default.
+                $envPath = GRAV_WEBROOT. '/' . GRAV_USER_PATH . '/env';
+                if (is_dir($envPath)) {
+                    $envPath = 'user://env/';
+                } else {
+                    // Fallback to Grav 1.6 default.
+                    $envPath = 'user://';
+                }
+            }
+            $envPath .= $this->get('environment');
+        }
+
         // Set up environment.
-        $this->def('environment', $environment);
-        $this->def('streams.schemes.environment.prefixes', ['' => ["user://{$this->get('environment')}"]]);
+        $this->def('environment', static::$environment);
+        $this->def('streams.schemes.environment.prefixes', ['' => [$envPath]]);
     }
 
     /**
      * @return $this
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
+     * @throws RuntimeException
+     * @throws InvalidArgumentException
      */
     public function init()
     {
-        $locator = new UniformResourceLocator(GRAV_ROOT);
+        $locator = new UniformResourceLocator(GRAV_WEBROOT);
         $files = [];
 
         $guard = 5;
@@ -220,7 +287,7 @@ public function init()
         } while (--$guard);
 
         if (!$guard) {
-            throw new \RuntimeException('Setup: Configuration reload loop detected!');
+            throw new RuntimeException('Setup: Configuration reload loop detected!');
         }
 
         // Make sure we have valid setup.
@@ -233,7 +300,8 @@ public function init()
      * Initialize resource locator by using the configuration.
      *
      * @param UniformResourceLocator $locator
-     * @throws \BadMethodCallException
+     * @return void
+     * @throws BadMethodCallException
      */
     public function initializeLocator(UniformResourceLocator $locator)
     {
@@ -279,32 +347,66 @@ public function getStreams()
 
     /**
      * @param UniformResourceLocator $locator
-     * @throws \InvalidArgumentException
-     * @throws \BadMethodCallException
-     * @throws \RuntimeException
+     * @return void
+     * @throws InvalidArgumentException
+     * @throws BadMethodCallException
+     * @throws RuntimeException
      */
     protected function check(UniformResourceLocator $locator)
     {
         $streams = $this->items['streams']['schemes'] ?? null;
-        if (!\is_array($streams)) {
-            throw new \InvalidArgumentException('Configuration is missing streams.schemes!');
+        if (!is_array($streams)) {
+            throw new InvalidArgumentException('Configuration is missing streams.schemes!');
         }
         $diff = array_keys(array_diff_key($this->streams, $streams));
         if ($diff) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 sprintf('Configuration is missing keys %s from streams.schemes!', implode(', ', $diff))
             );
         }
 
         try {
+            // If environment is found, remove all missing override locations (B/C compatibility).
+            if ($locator->findResource('environment://', true)) {
+                $force = $this->get('streams.schemes.environment.force', false);
+                if (!$force) {
+                    $prefixes = $this->get('streams.schemes.environment.prefixes.');
+                    $update = false;
+                    foreach ($prefixes as $i => $prefix) {
+                        if ($locator->isStream($prefix)) {
+                            if ($locator->findResource($prefix, true)) {
+                                break;
+                            }
+                        } elseif (file_exists($prefix)) {
+                            break;
+                        }
+
+                        unset($prefixes[$i]);
+                        $update = true;
+                    }
+
+                    if ($update) {
+                        $this->set('streams.schemes.environment.prefixes', ['' => array_values($prefixes)]);
+                        $this->initializeLocator($locator);
+                    }
+                }
+            }
+
             if (!$locator->findResource('environment://config', true)) {
                 // If environment does not have its own directory, remove it from the lookup.
-                $this->set('streams.schemes.environment.prefixes', ['config' => []]);
+                $prefixes = $this->get('streams.schemes.environment.prefixes');
+                $prefixes['config'] = [];
+
+                $this->set('streams.schemes.environment.prefixes', $prefixes);
                 $this->initializeLocator($locator);
             }
 
-            // Create security.yaml if it doesn't exist.
-            $filename = $locator->findResource('config://security.yaml', true, true);
+            // Create security.yaml salt if it doesn't exist into existing configuration environment if possible.
+            $securityFile = Utils::basename(static::$securityFile);
+            $securityFolder = substr(static::$securityFile, 0, -\strlen($securityFile));
+            $securityFolder = $locator->findResource($securityFolder, true) ?: $locator->findResource($securityFolder, true, true);
+            $filename = "{$securityFolder}/{$securityFile}";
+
             $security_file = CompiledYamlFile::instance($filename);
             $security_content = (array)$security_file->content();
 
@@ -314,8 +416,8 @@ protected function check(UniformResourceLocator $locator)
                 $security_file->save();
                 $security_file->free();
             }
-        } catch (\RuntimeException $e) {
-            throw new \RuntimeException(sprintf('Grav failed to initialize: %s', $e->getMessage()), 500, $e);
+        } catch (RuntimeException $e) {
+            throw new RuntimeException(sprintf('Grav failed to initialize: %s', $e->getMessage()), 500, $e);
         }
     }
 }
diff --git a/system/src/Grav/Common/Data/Blueprint.php b/system/src/Grav/Common/Data/Blueprint.php
index e7037774f6..906fd79176 100644
--- a/system/src/Grav/Common/Data/Blueprint.php
+++ b/system/src/Grav/Common/Data/Blueprint.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,34 +14,69 @@
 use Grav\Common\User\Interfaces\UserInterface;
 use RocketTheme\Toolbox\Blueprints\BlueprintForm;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use function call_user_func_array;
+use function count;
+use function function_exists;
+use function in_array;
+use function is_array;
+use function is_int;
+use function is_object;
+use function is_string;
+use function strlen;
 
+/**
+ * Class Blueprint
+ * @package Grav\Common\Data
+ */
 class Blueprint extends BlueprintForm
 {
     /** @var string */
     protected $context = 'blueprints://';
 
+    /** @var string|null */
     protected $scope;
 
-    /** @var BlueprintSchema */
+    /** @var BlueprintSchema|null */
     protected $blueprintSchema;
 
-    /** @var array */
+    /** @var object|null */
+    protected $object;
+
+    /** @var array|null */
     protected $defaults;
 
+    /** @var array */
     protected $handlers = [];
 
+    /**
+     * Clone blueprint.
+     */
     public function __clone()
     {
-        if ($this->blueprintSchema) {
+        if (null !== $this->blueprintSchema) {
             $this->blueprintSchema = clone $this->blueprintSchema;
         }
     }
 
+    /**
+     * @param string $scope
+     * @return void
+     */
     public function setScope($scope)
     {
         $this->scope = $scope;
     }
 
+    /**
+     * @param object $object
+     * @return void
+     */
+    public function setObject($object)
+    {
+        $this->object = $object;
+    }
+
     /**
      * Set default values for field types.
      *
@@ -57,6 +92,29 @@ public function setTypes(array $types)
         return $this;
     }
 
+    /**
+     * @param string $name
+     * @return array|mixed|null
+     * @since 1.7
+     */
+    public function getDefaultValue(string $name)
+    {
+        $path = explode('.', $name);
+        $current = $this->getDefaults();
+
+        foreach ($path as $field) {
+            if (is_object($current) && isset($current->{$field})) {
+                $current = $current->{$field};
+            } elseif (is_array($current) && isset($current[$field])) {
+                $current = $current[$field];
+            } else {
+                return null;
+            }
+        }
+
+        return $current;
+    }
+
     /**
      * Get nested structure containing default values defined in the blueprints.
      *
@@ -88,7 +146,7 @@ public function init()
             $current = &$this->items;
 
             foreach ($path as $field) {
-                if (\is_object($current)) {
+                if (is_object($current)) {
                     // Handle objects.
                     if (!isset($current->{$field})) {
                         $current->{$field} = [];
@@ -97,7 +155,7 @@ public function init()
                     $current = &$current->{$field};
                 } else {
                     // Handle arrays and scalars.
-                    if (!\is_array($current)) {
+                    if (!is_array($current)) {
                         $current = [$field => []];
                     } elseif (!isset($current[$field])) {
                         $current[$field] = [];
@@ -111,6 +169,7 @@ public function init()
             foreach ($data as $property => $call) {
                 $action = $call['action'];
                 $method = 'dynamic' . ucfirst($action);
+                $call['object'] = $this->object;
 
                 if (isset($this->handlers[$action])) {
                     $callable = $this->handlers[$action];
@@ -124,12 +183,44 @@ public function init()
         return $this;
     }
 
+    /**
+     * Extend blueprint with another blueprint.
+     *
+     * @param BlueprintForm|array $extends
+     * @param bool $append
+     * @return $this
+     */
+    public function extend($extends, $append = false)
+    {
+        parent::extend($extends, $append);
+
+        $this->deepInit($this->items);
+
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @param string $separator
+     * @param bool $append
+     * @return $this
+     */
+    public function embed($name, $value, $separator = '/', $append = false)
+    {
+        parent::embed($name, $value, $separator, $append);
+
+        $this->deepInit($this->items);
+
+        return $this;
+    }
+
     /**
      * Merge two arrays by using blueprints.
      *
      * @param  array $data1
      * @param  array $data2
-     * @param  string $name         Optional
+     * @param  string|null $name         Optional
      * @param  string $separator    Optional
      * @return array
      */
@@ -172,13 +263,15 @@ public function extra(array $data, $prefix = '')
      * Validate data against blueprints.
      *
      * @param  array $data
-     * @throws \RuntimeException
+     * @param  array $options
+     * @return void
+     * @throws RuntimeException
      */
-    public function validate(array $data)
+    public function validate(array $data, array $options = [])
     {
         $this->initInternals();
 
-        $this->blueprintSchema->validate($data);
+        $this->blueprintSchema->validate($data, $options);
     }
 
     /**
@@ -193,21 +286,23 @@ public function filter(array $data, bool $missingValuesAsNull = false, bool $kee
     {
         $this->initInternals();
 
-        return $this->blueprintSchema->filter($data, $missingValuesAsNull, $keepEmptyValues);
+        return $this->blueprintSchema->filter($data, $missingValuesAsNull, $keepEmptyValues) ?? [];
     }
 
 
     /**
      * Flatten data by using blueprints.
      *
-     * @param  array $data
+     * @param array $data       Data to be flattened.
+     * @param bool $includeAll  True if undefined properties should also be included.
+     * @param string $name      Property which will be flattened, useful for flattening repeating data.
      * @return array
      */
-    public function flattenData(array $data)
+    public function flattenData(array $data, bool $includeAll = false, string $name = '')
     {
         $this->initInternals();
 
-        return $this->blueprintSchema->flattenData($data);
+        return $this->blueprintSchema->flattenData($data, $includeAll, $name);
     }
 
 
@@ -223,6 +318,11 @@ public function schema()
         return $this->blueprintSchema;
     }
 
+    /**
+     * @param string $name
+     * @param callable $callable
+     * @return void
+     */
     public function addDynamicHandler(string $name, callable $callable): void
     {
         $this->handlers[$name] = $callable;
@@ -230,6 +330,8 @@ public function addDynamicHandler(string $name, callable $callable): void
 
     /**
      * Initialize validator.
+     *
+     * @return void
      */
     protected function initInternals()
     {
@@ -250,12 +352,12 @@ protected function initInternals()
 
     /**
      * @param string $filename
-     * @return string
+     * @return array
      */
     protected function loadFile($filename)
     {
         $file = CompiledYamlFile::instance($filename);
-        $content = $file->content();
+        $content = (array)$file->content();
         $file->free();
 
         return $content;
@@ -263,7 +365,7 @@ protected function loadFile($filename)
 
     /**
      * @param string|array $path
-     * @param string $context
+     * @param string|null $context
      * @return array
      */
     protected function getFiles($path, $context = null)
@@ -271,16 +373,24 @@ protected function getFiles($path, $context = null)
         /** @var UniformResourceLocator $locator */
         $locator = Grav::instance()['locator'];
 
-        if (\is_string($path) && !$locator->isStream($path)) {
+        if (is_string($path) && !$locator->isStream($path)) {
+            if (is_file($path)) {
+                return [$path];
+            }
+
             // Find path overrides.
-            $paths = (array) ($this->overrides[$path] ?? null);
+            if (null === $context) {
+                $paths = (array) ($this->overrides[$path] ?? null);
+            } else {
+                $paths = [];
+            }
 
             // Add path pointing to default context.
             if ($context === null) {
                 $context = $this->context;
             }
 
-            if ($context && $context[\strlen($context)-1] !== '/') {
+            if ($context && $context[strlen($context)-1] !== '/') {
                 $context .= '/';
             }
 
@@ -297,7 +407,7 @@ protected function getFiles($path, $context = null)
 
         $files = [];
         foreach ($paths as $lookup) {
-            if (\is_string($lookup) && strpos($lookup, '://')) {
+            if (is_string($lookup) && strpos($lookup, '://')) {
                 $files = array_merge($files, $locator->findResources($lookup));
             } else {
                 $files[] = $lookup;
@@ -311,12 +421,13 @@ protected function getFiles($path, $context = null)
      * @param array $field
      * @param string $property
      * @param array $call
+     * @return void
      */
     protected function dynamicData(array &$field, $property, array &$call)
     {
         $params = $call['params'];
 
-        if (\is_array($params)) {
+        if (is_array($params)) {
             $function = array_shift($params);
         } else {
             $function = $params;
@@ -327,18 +438,18 @@ protected function dynamicData(array &$field, $property, array &$call)
 
         $data = null;
         if (!$f) {
-            if (\function_exists($o)) {
-                $data = \call_user_func_array($o, $params);
+            if (function_exists($o)) {
+                $data = call_user_func_array($o, $params);
             }
         } else {
             if (method_exists($o, $f)) {
-                $data = \call_user_func_array([$o, $f], $params);
+                $data = call_user_func_array([$o, $f], $params);
             }
         }
 
         // If function returns a value,
         if (null !== $data) {
-            if (\is_array($data) && isset($field[$property]) && \is_array($field[$property])) {
+            if (is_array($data) && isset($field[$property]) && is_array($field[$property])) {
                 // Combine field and @data-field together.
                 $field[$property] += $data;
             } else {
@@ -352,15 +463,33 @@ protected function dynamicData(array &$field, $property, array &$call)
      * @param array $field
      * @param string $property
      * @param array $call
+     * @return void
      */
     protected function dynamicConfig(array &$field, $property, array &$call)
     {
-        $value = $call['params'];
+        $params = $call['params'];
+        if (is_array($params)) {
+            $value = array_shift($params);
+            $params = array_shift($params);
+        } else {
+            $value = $params;
+            $params = [];
+        }
+
         $default = $field[$property] ?? null;
         $config = Grav::instance()['config']->get($value, $default);
+        if (!empty($field['value_only'])) {
+            $config = array_combine($config, $config);
+        }
 
         if (null !== $config) {
-            $field[$property] = $config;
+            if (!empty($params['append']) && is_array($config) && isset($field[$property]) && is_array($field[$property])) {
+                // Combine field and @config-field together.
+                $field[$property] += $config;
+            } else {
+                // Or create/replace field with @config-field.
+                $field[$property] = $config;
+            }
         }
     }
 
@@ -368,6 +497,7 @@ protected function dynamicConfig(array &$field, $property, array &$call)
      * @param array $field
      * @param string $property
      * @param array $call
+     * @return void
      */
     protected function dynamicSecurity(array &$field, $property, array &$call)
     {
@@ -380,18 +510,48 @@ protected function dynamicSecurity(array &$field, $property, array &$call)
 
         /** @var UserInterface|null $user */
         $user = $grav['user'] ?? null;
-        foreach ($actions as $action) {
-            if (!$user || !$user->authorize($action)) {
-                $this->addPropertyRecursive($field, 'validate', ['ignore' => true]);
-                return;
+        $success = null !== $user;
+        if ($success) {
+            $success = $this->resolveActions($user, $actions);
+        }
+        if (!$success) {
+            static::addPropertyRecursive($field, 'validate', ['ignore' => true]);
+        }
+    }
+
+    /**
+     * @param UserInterface|null $user
+     * @param array $actions
+     * @param string $op
+     * @return bool
+     */
+    protected function resolveActions(?UserInterface $user, array $actions, string $op = 'and')
+    {
+        if (null === $user) {
+            return false;
+        }
+
+        $c = $i = count($actions);
+        foreach ($actions as $key => $action) {
+            if (!is_int($key) && is_array($actions)) {
+                $i -= $this->resolveActions($user, $action, $key);
+            } elseif ($user->authorize($action)) {
+                $i--;
             }
         }
+
+        if ($op === 'and') {
+            return $i === 0;
+        }
+
+        return $c !== $i;
     }
 
     /**
      * @param array $field
      * @param string $property
      * @param array $call
+     * @return void
      */
     protected function dynamicScope(array &$field, $property, array &$call)
     {
@@ -400,20 +560,26 @@ protected function dynamicScope(array &$field, $property, array &$call)
         }
 
         $scopes = (array)$call['params'];
-        $matches = \in_array($this->scope, $scopes, true);
+        $matches = in_array($this->scope, $scopes, true);
         if ($this->scope && $property !== 'ignore') {
             $matches = !$matches;
         }
 
         if ($matches) {
-            $this->addPropertyRecursive($field, 'validate', ['ignore' => true]);
+            static::addPropertyRecursive($field, 'validate', ['ignore' => true]);
             return;
         }
     }
 
-    protected function addPropertyRecursive(array &$field, $property, $value)
+    /**
+     * @param array $field
+     * @param string $property
+     * @param mixed $value
+     * @return void
+     */
+    public static function addPropertyRecursive(array &$field, $property, $value)
     {
-        if (\is_array($value) && isset($field[$property]) && \is_array($field[$property])) {
+        if (is_array($value) && isset($field[$property]) && is_array($field[$property])) {
             $field[$property] = array_merge_recursive($field[$property], $value);
         } else {
             $field[$property] = $value;
@@ -421,7 +587,7 @@ protected function addPropertyRecursive(array &$field, $property, $value)
 
         if (!empty($field['fields'])) {
             foreach ($field['fields'] as $key => &$child) {
-                $this->addPropertyRecursive($child, $property, $value);
+                static::addPropertyRecursive($child, $property, $value);
             }
         }
     }
diff --git a/system/src/Grav/Common/Data/BlueprintSchema.php b/system/src/Grav/Common/Data/BlueprintSchema.php
index 898450d28f..8cc63036ed 100644
--- a/system/src/Grav/Common/Data/BlueprintSchema.php
+++ b/system/src/Grav/Common/Data/BlueprintSchema.php
@@ -3,21 +3,33 @@
 /**
  * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Data;
 
+use Grav\Common\Config\Config;
 use Grav\Common\Grav;
 use RocketTheme\Toolbox\ArrayTraits\Export;
 use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
 use RocketTheme\Toolbox\Blueprints\BlueprintSchema as BlueprintSchemaBase;
+use RuntimeException;
+use function is_array;
+use function is_string;
 
+/**
+ * Class BlueprintSchema
+ * @package Grav\Common\Data
+ */
 class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
 {
     use Export;
 
+    /** @var array */
+    protected $filter = ['validation' => true, 'xss_check' => true];
+
+    /** @var array */
     protected $ignoreFormKeys = [
         'title' => true,
         'help' => true,
@@ -44,23 +56,34 @@ public function getType($name)
         return $this->types[$name] ?? [];
     }
 
+    /**
+     * @param string $name
+     * @return array|null
+     */
+    public function getNestedRules(string $name)
+    {
+        return $this->getNested($name);
+    }
+
     /**
      * Validate data against blueprints.
      *
      * @param  array $data
-     * @throws \RuntimeException
+     * @param  array $options
+     * @return void
+     * @throws RuntimeException
      */
-    public function validate(array $data)
+    public function validate(array $data, array $options = [])
     {
         try {
-            $messages = $this->validateArray($data, $this->nested);
-
-        } catch (\RuntimeException $e) {
+            $validation = $this->items['']['form']['validation'] ?? 'loose';
+            $messages = $this->validateArray($data, $this->nested, $validation === 'strict', $options['xss_check'] ?? true);
+        } catch (RuntimeException $e) {
             throw (new ValidationException($e->getMessage(), $e->getCode(), $e))->setMessages();
         }
 
         if (!empty($messages)) {
-            throw (new ValidationException())->setMessages($messages);
+            throw (new ValidationException('', 400))->setMessages($messages);
         }
     }
 
@@ -71,7 +94,7 @@ public function validate(array $data)
      */
     public function processForm(array $data, array $toggles = [])
     {
-        return $this->processFormRecursive($data, $toggles, $this->nested);
+        return $this->processFormRecursive($data, $toggles, $this->nested) ?? [];
     }
 
     /**
@@ -84,18 +107,37 @@ public function processForm(array $data, array $toggles = [])
      */
     public function filter(array $data, $missingValuesAsNull = false, $keepEmptyValues = false)
     {
-        return $this->filterArray($data, $this->nested, $missingValuesAsNull, $keepEmptyValues);
+        $this->buildIgnoreNested($this->nested);
+
+        return $this->filterArray($data, $this->nested, '', $missingValuesAsNull, $keepEmptyValues) ?? [];
     }
 
     /**
      * Flatten data by using blueprints.
      *
-     * @param  array $data                  Data to be flattened.
+     * @param array $data       Data to be flattened.
+     * @param bool $includeAll  True if undefined properties should also be included.
+     * @param string $name      Property which will be flattened, useful for flattening repeating data.
      * @return array
      */
-    public function flattenData(array $data)
+    public function flattenData(array $data, bool $includeAll = false, string $name = '')
     {
-        return $this->flattenArray($data, $this->nested, '');
+        $prefix = $name !== '' ? $name . '.' : '';
+
+        $list = [];
+        if ($includeAll) {
+            $items = $name !== '' ? $this->getProperty($name)['fields'] ?? [] : $this->items;
+            foreach ($items as $key => $rules) {
+                $type = $rules['type'] ?? '';
+                if (!str_starts_with($type, '_') && !str_contains($key, '*')) {
+                    $list[$prefix . $key] = null;
+                }
+            }
+        }
+
+        $nested = $this->getNestedRules($name);
+
+        return array_replace($list, $this->flattenArray($data, $nested, $prefix));
     }
 
     /**
@@ -123,22 +165,26 @@ protected function flattenArray(array $data, array $rules, string $prefix)
                 $array[$prefix.$key] = $field;
             }
         }
+
         return $array;
     }
 
     /**
      * @param array $data
      * @param array $rules
+     * @param bool $strict
+     * @param bool $xss
      * @return array
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
-    protected function validateArray(array $data, array $rules)
+    protected function validateArray(array $data, array $rules, bool $strict, bool $xss = true)
     {
         $messages = $this->checkRequired($data, $rules);
 
-        foreach ($data as $key => $field) {
+        foreach ($data as $key => $child) {
             $val = $rules[$key] ?? $rules['*'] ?? null;
-            $rule = \is_string($val) ? $this->items[$val] : null;
+            $rule = is_string($val) ? $this->items[$val] : null;
+            $checkXss = $xss;
 
             if ($rule) {
                 // Item has been defined in blueprints.
@@ -147,13 +193,26 @@ protected function validateArray(array $data, array $rules)
                     continue;
                 }
 
-                $messages += Validation::validate($field, $rule);
-            } elseif (\is_array($field) && \is_array($val)) {
+                $messages += Validation::validate($child, $rule);
+
+            } elseif (is_array($child) && is_array($val)) {
                 // Array has been defined in blueprints.
-                $messages += $this->validateArray($field, $val);
-            } elseif (isset($rules['validation']) && $rules['validation'] === 'strict') {
-                // Undefined/extra item.
-                throw new \RuntimeException(sprintf('%s is not defined in blueprints', $key));
+                $messages += $this->validateArray($child, $val, $strict);
+                $checkXss = false;
+
+            } elseif ($strict) {
+                // Undefined/extra item in strict mode.
+                /** @var Config $config */
+                $config = Grav::instance()['config'];
+                if (!$config->get('system.strict_mode.blueprint_strict_compat', true)) {
+                    throw new RuntimeException(sprintf('%s is not defined in blueprints', $key), 400);
+                }
+
+                user_error(sprintf('Having extra key %s in your data is deprecated with blueprint having \'validation: strict\'', $key), E_USER_DEPRECATED);
+            }
+
+            if ($checkXss) {
+                $messages += Validation::checkSafety($child, $rule ?: ['name' => $key]);
             }
         }
 
@@ -163,51 +222,55 @@ protected function validateArray(array $data, array $rules)
     /**
      * @param array $data
      * @param array $rules
+     * @param string $parent
      * @param bool  $missingValuesAsNull
      * @param bool $keepEmptyValues
-     * @return array
+     * @return array|null
      */
-    protected function filterArray(array $data, array $rules, $missingValuesAsNull, $keepEmptyValues)
+    protected function filterArray(array $data, array $rules, string $parent, bool $missingValuesAsNull, bool $keepEmptyValues)
     {
         $results = [];
 
-        if ($missingValuesAsNull) {
-            // First pass is to fill up all the fields with null. This is done to lock the ordering of the fields.
-            foreach ($rules as $key => $rule) {
-                if ($key && !isset($results[$key])) {
-                    $val = $rules[$key] ?? $rules['*'] ?? null;
-                    $rule = \is_string($val) ? $this->items[$val] : null;
-
-                    if (empty($rule['disabled']) && empty($rule['validate']['ignore'])) {
-                        continue;
-                    }
-                }
-            }
-        }
-
         foreach ($data as $key => $field) {
             $val = $rules[$key] ?? $rules['*'] ?? null;
-            $rule = \is_string($val) ? $this->items[$val] : null;
+            $rule = is_string($val) ? $this->items[$val] : $this->items[$parent . $key] ?? null;
 
-            if ($rule) {
-                // Item has been defined in blueprints.
-                if (!empty($rule['disabled']) || !empty($rule['validate']['ignore'])) {
-                    // Skip any data in the ignored field.
+            if (!empty($rule['disabled']) || !empty($rule['validate']['ignore'])) {
+                // Skip any data in the ignored field.
+                unset($results[$key]);
+                continue;
+            }
+
+            if (null === $field) {
+                if ($missingValuesAsNull) {
+                    $results[$key] = null;
+                } else {
                     unset($results[$key]);
-                    continue;
                 }
+                continue;
+            }
 
+            $isParent = isset($val['*']);
+            $type = $rule['type'] ?? null;
+
+            if (!$isParent && $type && $type !== '_parent') {
                 $field = Validation::filter($field, $rule);
-            } elseif (\is_array($field) && \is_array($val)) {
+            } elseif (is_array($field) && is_array($val)) {
                 // Array has been defined in blueprints.
-                $field = $this->filterArray($field, $val, $missingValuesAsNull, $keepEmptyValues);
+                $k = $isParent ? '*' : $key;
+                $field = $this->filterArray($field, $val, $parent . $k . '.', $missingValuesAsNull, $keepEmptyValues);
 
+                if (null === $field) {
+                    // Nested parent has no values.
+                    unset($results[$key]);
+                    continue;
+                }
             } elseif (isset($rules['validation']) && $rules['validation'] === 'strict') {
                 // Skip any extra data.
                 continue;
             }
 
-            if ($keepEmptyValues || (null !== $field && (!\is_array($field) || !empty($field)))) {
+            if ($keepEmptyValues || (null !== $field && (!is_array($field) || !empty($field)))) {
                 $results[$key] = $field;
             }
         }
@@ -215,6 +278,31 @@ protected function filterArray(array $data, array $rules, $missingValuesAsNull,
         return $results ?: null;
     }
 
+    /**
+     * @param array $nested
+     * @param string $parent
+     * @return bool
+     */
+    protected function buildIgnoreNested(array $nested, $parent = '')
+    {
+        $ignore = true;
+        foreach ($nested as $key => $val) {
+            $key = $parent . $key;
+            if (is_array($val)) {
+                $ignore = $this->buildIgnoreNested($val, $key . '.') && $ignore; // Keep the order!
+            } else {
+                $child = $this->items[$key] ?? null;
+                $ignore = $ignore && (!$child || !empty($child['disabled']) || !empty($child['validate']['ignore']));
+            }
+        }
+        if ($ignore) {
+            $key = trim($parent, '.');
+            $this->items[$key]['validate']['ignore'] = true;
+        }
+
+        return $ignore;
+    }
+
     /**
      * @param array|null $data
      * @param array $toggles
@@ -232,8 +320,23 @@ protected function processFormRecursive(?array $data, array $toggles, array $nes
                 continue;
             }
             if (is_array($value)) {
+                // Special toggle handling for all the nested data.
+                $toggle = $toggles[$key] ?? [];
+                if (!is_array($toggle)) {
+                    if (!$toggle) {
+                        $data[$key] = null;
+
+                        continue;
+                    }
+
+                    $toggle = [];
+                }
                 // Recursively fetch the items.
-                $data[$key] = $this->processFormRecursive($data[$key] ?? null, $toggles[$key] ?? [], $value);
+                $childData = $data[$key] ?? null;
+                if (null !== $childData && !is_array($childData)) {
+                    throw new \RuntimeException(sprintf("Bad form data for field collection '%s': %s used instead of an array", $key, gettype($childData)));
+                }
+                $data[$key] = $this->processFormRecursive($data[$key] ?? null, $toggle, $value);
             } else {
                 $field = $this->get($value);
                 // Do not add the field if:
@@ -244,8 +347,8 @@ protected function processFormRecursive(?array $data, array $toggles, array $nes
                     || !empty($field['disabled'])
                     // Field validation is set to be ignored
                     || !empty($field['validate']['ignore'])
-                    // Field is toggleable and the toggle is turned off
-                    || (!empty($field['toggleable']) && empty($toggles[$key]))
+                    // Field is overridable and the toggle is turned off
+                    || (!empty($field['overridable']) && empty($toggles[$key]))
                 ) {
                     continue;
                 }
@@ -268,7 +371,7 @@ protected function checkRequired(array $data, array $fields)
         $messages = [];
 
         foreach ($fields as $name => $field) {
-            if (!\is_string($field)) {
+            if (!is_string($field)) {
                 continue;
             }
 
@@ -279,10 +382,15 @@ protected function checkRequired(array $data, array $fields)
                 continue;
             }
 
+            // Skip overridable fields without value.
+            // TODO: We need better overridable support, which is not just ignoring required values but also looking if defaults are good.
+            if (!empty($field['overridable']) && !isset($data[$name])) {
+                continue;
+            }
+
             // Check if required.
             if (isset($field['validate']['required'])
                 && $field['validate']['required'] === true) {
-
                 if (isset($data[$name])) {
                     continue;
                 }
@@ -304,6 +412,7 @@ protected function checkRequired(array $data, array $fields)
      * @param array $field
      * @param string $property
      * @param array $call
+     * @return void
      */
     protected function dynamicConfig(array &$field, $property, array &$call)
     {
diff --git a/system/src/Grav/Common/Data/Blueprints.php b/system/src/Grav/Common/Data/Blueprints.php
index 1d0fcc689c..dfdd46f726 100644
--- a/system/src/Grav/Common/Data/Blueprints.php
+++ b/system/src/Grav/Common/Data/Blueprints.php
@@ -3,15 +3,23 @@
 /**
  * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Data;
 
+use DirectoryIterator;
 use Grav\Common\Grav;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use function is_array;
+use function is_object;
 
+/**
+ * Class Blueprints
+ * @package Grav\Common\Data
+ */
 class Blueprints
 {
     /** @var array|string */
@@ -34,7 +42,7 @@ public function __construct($search = 'blueprints://')
      *
      * @param  string  $type  Blueprint type.
      * @return Blueprint
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function get($type)
     {
@@ -65,10 +73,9 @@ public function types()
             if ($locator->isStream($this->search)) {
                 $iterator = $locator->getIterator($this->search);
             } else {
-                $iterator = new \DirectoryIterator($this->search);
+                $iterator = new DirectoryIterator($this->search);
             }
 
-            /** @var \DirectoryIterator $file */
             foreach ($iterator as $file) {
                 if (!$file->isFile() || '.' . $file->getExtension() !== YAML_EXT) {
                     continue;
@@ -92,7 +99,7 @@ protected function loadFile($name)
     {
         $blueprint = new Blueprint($name);
 
-        if (\is_array($this->search) || \is_object($this->search)) {
+        if (is_array($this->search) || is_object($this->search)) {
             // Page types.
             $blueprint->setOverrides($this->search);
             $blueprint->setContext('blueprints://pages');
@@ -102,7 +109,7 @@ protected function loadFile($name)
 
         try {
             $blueprint->load()->init();
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             $log = Grav::instance()['log'];
             $log->error(sprintf('Blueprint %s cannot be loaded: %s', $name, $e->getMessage()));
 
diff --git a/system/src/Grav/Common/Data/Data.php b/system/src/Grav/Common/Data/Data.php
index bfae2dae84..0f09b2d26c 100644
--- a/system/src/Grav/Common/Data/Data.php
+++ b/system/src/Grav/Common/Data/Data.php
@@ -3,43 +3,80 @@
 /**
  * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Data;
 
+use ArrayAccess;
+use Exception;
+use JsonSerializable;
 use RocketTheme\Toolbox\ArrayTraits\Countable;
 use RocketTheme\Toolbox\ArrayTraits\Export;
 use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
 use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccessWithGetters;
-use RocketTheme\Toolbox\File\File;
 use RocketTheme\Toolbox\File\FileInterface;
+use RuntimeException;
+use function func_get_args;
+use function is_array;
+use function is_callable;
+use function is_object;
 
-class Data implements DataInterface, \ArrayAccess, \Countable, \JsonSerializable, ExportInterface
+/**
+ * Class Data
+ * @package Grav\Common\Data
+ */
+class Data implements DataInterface, ArrayAccess, \Countable, JsonSerializable, ExportInterface
 {
     use NestedArrayAccessWithGetters, Countable, Export;
 
     /** @var string */
     protected $gettersVariable = 'items';
-
     /** @var array */
     protected $items;
-
-    /** @var Blueprint */
+    /** @var Blueprint|callable|null */
     protected $blueprints;
-
-    /** @var File */
+    /** @var FileInterface|null */
     protected $storage;
 
+    /** @var bool */
+    private $missingValuesAsNull = false;
+    /** @var bool */
+    private $keepEmptyValues = true;
+
     /**
      * @param array $items
-     * @param Blueprint|callable $blueprints
+     * @param Blueprint|callable|null $blueprints
      */
     public function __construct(array $items = [], $blueprints = null)
     {
         $this->items = $items;
-        $this->blueprints = $blueprints;
+        if (null !== $blueprints) {
+            $this->blueprints = $blueprints;
+        }
+    }
+
+    /**
+     * @param bool $value
+     * @return $this
+     */
+    public function setKeepEmptyValues(bool $value)
+    {
+        $this->keepEmptyValues = $value;
+
+        return $this;
+    }
+
+    /**
+     * @param bool $value
+     * @return $this
+     */
+    public function setMissingValuesAsNull(bool $value)
+    {
+        $this->missingValuesAsNull = $value;
+
+        return $this;
     }
 
     /**
@@ -64,20 +101,20 @@ public function value($name, $default = null, $separator = '.')
      * @param mixed   $value      Value to be joined.
      * @param string  $separator  Separator, defaults to '.'
      * @return $this
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function join($name, $value, $separator = '.')
     {
         $old = $this->get($name, null, $separator);
         if ($old !== null) {
-            if (!\is_array($old)) {
-                throw new \RuntimeException('Value ' . $old);
+            if (!is_array($old)) {
+                throw new RuntimeException('Value ' . $old);
             }
 
-            if (\is_object($value)) {
+            if (is_object($value)) {
                 $value = (array) $value;
-            } elseif (!\is_array($value)) {
-                throw new \RuntimeException('Value ' . $value);
+            } elseif (!is_array($value)) {
+                throw new RuntimeException('Value ' . $value);
             }
 
             $value = $this->blueprints()->mergeData($old, $value, $name, $separator);
@@ -110,7 +147,7 @@ public function getDefaults()
      */
     public function joinDefaults($name, $value, $separator = '.')
     {
-        if (\is_object($value)) {
+        if (is_object($value)) {
             $value = (array) $value;
         }
 
@@ -131,14 +168,14 @@ public function joinDefaults($name, $value, $separator = '.')
      * @param array|object $value      Value to be joined.
      * @param string  $separator  Separator, defaults to '.'
      * @return array
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function getJoined($name, $value, $separator = '.')
     {
-        if (\is_object($value)) {
+        if (is_object($value)) {
             $value = (array) $value;
-        } elseif (!\is_array($value)) {
-            throw new \RuntimeException('Value ' . $value);
+        } elseif (!is_array($value)) {
+            throw new RuntimeException('Value ' . $value);
         }
 
         $old = $this->get($name, null, $separator);
@@ -148,8 +185,8 @@ public function getJoined($name, $value, $separator = '.')
             return $value;
         }
 
-        if (!\is_array($old)) {
-            throw new \RuntimeException('Value ' . $old);
+        if (!is_array($old)) {
+            throw new RuntimeException('Value ' . $old);
         }
 
         // Return joined data.
@@ -187,7 +224,7 @@ public function setDefaults(array $data)
      * Validate by blueprints.
      *
      * @return $this
-     * @throws \Exception
+     * @throws Exception
      */
     public function validate()
     {
@@ -202,8 +239,8 @@ public function validate()
     public function filter()
     {
         $args = func_get_args();
-        $missingValuesAsNull = (bool)(array_shift($args) ?: false);
-        $keepEmptyValues = (bool)(array_shift($args) ?: false);
+        $missingValuesAsNull = (bool)(array_shift($args) ?? $this->missingValuesAsNull);
+        $keepEmptyValues = (bool)(array_shift($args) ?? $this->keepEmptyValues);
 
         $this->items = $this->blueprints()->filter($this->items, $missingValuesAsNull, $keepEmptyValues);
 
@@ -227,19 +264,22 @@ public function extra()
      */
     public function blueprints()
     {
-        if (!$this->blueprints){
-            $this->blueprints = new Blueprint;
-        } elseif (\is_callable($this->blueprints)) {
+        if (null === $this->blueprints) {
+            $this->blueprints = new Blueprint();
+        } elseif (is_callable($this->blueprints)) {
             // Lazy load blueprints.
             $blueprints = $this->blueprints;
             $this->blueprints = $blueprints();
         }
+
         return $this->blueprints;
     }
 
     /**
      * Save data if storage has been defined.
-     * @throws \RuntimeException
+     *
+     * @return void
+     * @throws RuntimeException
      */
     public function save()
     {
@@ -280,8 +320,8 @@ public function raw()
     /**
      * Set or get the data storage.
      *
-     * @param FileInterface $storage Optionally enter a new storage.
-     * @return FileInterface
+     * @param FileInterface|null $storage Optionally enter a new storage.
+     * @return FileInterface|null
      */
     public function file(FileInterface $storage = null)
     {
@@ -292,6 +332,10 @@ public function file(FileInterface $storage = null)
         return $this->storage;
     }
 
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->items;
diff --git a/system/src/Grav/Common/Data/DataInterface.php b/system/src/Grav/Common/Data/DataInterface.php
index 91279b28ea..a4bc2140d1 100644
--- a/system/src/Grav/Common/Data/DataInterface.php
+++ b/system/src/Grav/Common/Data/DataInterface.php
@@ -3,14 +3,19 @@
 /**
  * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Data;
 
+use Exception;
 use RocketTheme\Toolbox\File\FileInterface;
 
+/**
+ * Interface DataInterface
+ * @package Grav\Common\Data
+ */
 interface DataInterface
 {
     /**
@@ -35,35 +40,44 @@ public function merge(array $data);
 
     /**
      * Return blueprints.
+     *
+     * @return Blueprint
      */
     public function blueprints();
 
     /**
      * Validate by blueprints.
      *
-     * @throws \Exception
+     * @return $this
+     * @throws Exception
      */
     public function validate();
 
     /**
      * Filter all items by using blueprints.
+     *
+     * @return $this
      */
     public function filter();
 
     /**
      * Get extra items which haven't been defined in blueprints.
+     *
+     * @return array
      */
     public function extra();
 
     /**
      * Save data into the file.
+     *
+     * @return void
      */
     public function save();
 
     /**
      * Set or get the data storage.
      *
-     * @param FileInterface $storage Optionally enter a new storage.
+     * @param FileInterface|null $storage Optionally enter a new storage.
      * @return FileInterface
      */
     public function file(FileInterface $storage = null);
diff --git a/system/src/Grav/Common/Data/Validation.php b/system/src/Grav/Common/Data/Validation.php
index 7779b1c27a..4b2bbf776a 100644
--- a/system/src/Grav/Common/Data/Validation.php
+++ b/system/src/Grav/Common/Data/Validation.php
@@ -3,16 +3,35 @@
 /**
  * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Data;
 
+use ArrayAccess;
+use Countable;
+use DateTime;
+use Grav\Common\Config\Config;
 use Grav\Common\Grav;
+use Grav\Common\Language\Language;
+use Grav\Common\Security;
+use Grav\Common\User\Interfaces\UserInterface;
 use Grav\Common\Utils;
 use Grav\Common\Yaml;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use Traversable;
+use function count;
+use function is_array;
+use function is_bool;
+use function is_float;
+use function is_int;
+use function is_string;
 
+/**
+ * Class Validation
+ * @package Grav\Common\Data
+ */
 class Validation
 {
     /**
@@ -44,7 +63,7 @@ public static function validate($value, array $field)
         $name = ucfirst($field['label'] ?? $field['name']);
         $message = (string) isset($field['validate']['message'])
             ? $language->translate($field['validate']['message'])
-            : $language->translate('GRAV.FORM.INVALID_INPUT', null, true) . ' "' . $language->translate($name) . '"';
+            : $language->translate('GRAV.FORM.INVALID_INPUT') . ' "' . $language->translate($name) . '"';
 
 
         // Validate type with fallback type text.
@@ -78,6 +97,92 @@ public static function validate($value, array $field)
         return $messages;
     }
 
+    /**
+     * @param mixed $value
+     * @param array $field
+     * @return array
+     */
+    public static function checkSafety($value, array $field)
+    {
+        $messages = [];
+
+        $type = $field['validate']['type'] ?? $field['type'] ?? 'text';
+        $options = $field['xss_check'] ?? [];
+        if ($options === false || $type === 'unset') {
+            return $messages;
+        }
+        if (!is_array($options)) {
+            $options = [];
+        }
+
+        $name = ucfirst($field['label'] ?? $field['name'] ?? 'UNKNOWN');
+
+        /** @var UserInterface $user */
+        $user = Grav::instance()['user'] ?? null;
+        /** @var Config $config */
+        $config = Grav::instance()['config'];
+
+        $xss_whitelist = $config->get('security.xss_whitelist', 'admin.super');
+
+        // Get language class.
+        /** @var Language $language */
+        $language = Grav::instance()['language'];
+
+        if (!static::authorize($xss_whitelist, $user)) {
+            $defaults = Security::getXssDefaults();
+            $options += $defaults;
+            $options['enabled_rules'] += $defaults['enabled_rules'];
+            if (!empty($options['safe_protocols'])) {
+                $options['invalid_protocols'] = array_diff($options['invalid_protocols'], $options['safe_protocols']);
+            }
+            if (!empty($options['safe_tags'])) {
+                $options['dangerous_tags'] = array_diff($options['dangerous_tags'], $options['safe_tags']);
+            }
+
+            if (is_string($value)) {
+                $violation = Security::detectXss($value, $options);
+                if ($violation) {
+                    $messages[$name][] = $language->translate(['GRAV.FORM.XSS_ISSUES', $language->translate($name)], null, true);
+                }
+            } elseif (is_array($value)) {
+                $violations = Security::detectXssFromArray($value, "{$name}.", $options);
+                if ($violations) {
+                    $messages[$name][] = $language->translate(['GRAV.FORM.XSS_ISSUES', $language->translate($name)], null, true);
+                }
+            }
+        }
+
+        return $messages;
+    }
+
+    /**
+     * Checks user authorisation to the action.
+     *
+     * @param  string|string[] $action
+     * @param  UserInterface|null $user
+     * @return bool
+     */
+    public static function authorize($action, UserInterface $user = null)
+    {
+        if (!$user) {
+            return false;
+        }
+
+        $action = (array)$action;
+        foreach ($action as $a) {
+            // Ignore 'admin.super' if it's not the only value to be checked.
+            if ($a === 'admin.super' && count($action) > 1 && $user instanceof FlexObjectInterface) {
+                continue;
+            }
+
+            if ($user->authorize($a)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Filter value against a blueprint field definition.
      *
@@ -123,7 +228,7 @@ public static function filter($value, array $field)
      */
     public static function typeText($value, array $params, array $field)
     {
-        if (!\is_string($value) && !is_numeric($value)) {
+        if (!is_string($value) && !is_numeric($value)) {
             return false;
         }
 
@@ -133,62 +238,123 @@ public static function typeText($value, array $params, array $field)
             $value = trim($value);
         }
 
-        if (isset($params['min']) && \strlen($value) < $params['min']) {
+        $value = preg_replace("/\r\n|\r/um", "\n", $value);
+        $len = mb_strlen($value);
+
+        $min = (int)($params['min'] ?? 0);
+        if ($min && $len < $min) {
             return false;
         }
 
-        if (isset($params['max']) && \strlen($value) > $params['max']) {
+        $multiline = isset($params['multiline']) && $params['multiline'];
+
+        $max = (int)($params['max'] ?? ($multiline ? 65536 : 2048));
+        if ($max && $len > $max) {
             return false;
         }
 
-        $min = $params['min'] ?? 0;
-        if (isset($params['step']) && (\strlen($value) - $min) % $params['step'] === 0) {
+        $step = (int)($params['step'] ?? 0);
+        if ($step && ($len - $min) % $step === 0) {
             return false;
         }
 
-        if ((!isset($params['multiline']) || !$params['multiline']) && preg_match('/\R/um', $value)) {
+        if (!$multiline && preg_match('/\R/um', $value)) {
             return false;
         }
 
         return true;
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return string
+     */
     protected static function filterText($value, array $params, array $field)
     {
-        if (!\is_string($value) && !is_numeric($value)) {
+        if (!is_string($value) && !is_numeric($value)) {
             return '';
         }
 
+        $value = (string)$value;
+
         if (!empty($params['trim'])) {
             $value = trim($value);
         }
 
-        return (string) $value;
+        return preg_replace("/\r\n|\r/um", "\n", $value);
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return string|null
+     */
     protected static function filterCheckbox($value, array $params, array $field)
     {
-        return (bool) $value;
+        $value = (string)$value;
+        $field_value = (string)($field['value'] ?? '1');
+
+        return $value === $field_value ? $value : null;
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return array|array[]|false|string[]
+     */
     protected static function filterCommaList($value, array $params, array $field)
     {
-        return \is_array($value) ? $value : preg_split('/\s*,\s*/', $value, -1, PREG_SPLIT_NO_EMPTY);
+        return is_array($value) ? $value : preg_split('/\s*,\s*/', $value, -1, PREG_SPLIT_NO_EMPTY);
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return bool
+     */
     public static function typeCommaList($value, array $params, array $field)
     {
-        return \is_array($value) ? true : self::typeText($value, $params, $field);
+        if (!isset($params['max'])) {
+            $params['max'] = 2048;
+        }
+
+        return is_array($value) ? true : self::typeText($value, $params, $field);
+    }
+
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return array|array[]|false|string[]
+     */
+    protected static function filterLines($value, array $params, array $field)
+    {
+        return is_array($value) ? $value : preg_split('/\s*[\r\n]+\s*/', $value, -1, PREG_SPLIT_NO_EMPTY);
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @return string
+     */
     protected static function filterLower($value, array $params)
     {
-        return strtolower($value);
+        return mb_strtolower($value);
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @return string
+     */
     protected static function filterUpper($value, array $params)
     {
-        return strtoupper($value);
+        return mb_strtoupper($value);
     }
 
 
@@ -219,6 +385,10 @@ public static function typeTextarea($value, array $params, array $field)
      */
     public static function typePassword($value, array $params, array $field)
     {
+        if (!isset($params['max'])) {
+            $params['max'] = 256;
+        }
+
         return self::typeText($value, $params, $field);
     }
 
@@ -251,6 +421,12 @@ public static function typeCheckboxes($value, array $params, array $field)
         return self::typeArray((array) $value, $params, $field);
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return array|null
+     */
     protected static function filterCheckboxes($value, array $params, array $field)
     {
         return self::filterArray($value, $params, $field);
@@ -295,7 +471,7 @@ public static function typeRadio($value, array $params, array $field)
      */
     public static function typeToggle($value, array $params, array $field)
     {
-        if (\is_bool($value)) {
+        if (is_bool($value)) {
             $value = (int)$value;
         }
 
@@ -315,6 +491,12 @@ public static function typeFile($value, array $params, array $field)
         return self::typeArray((array)$value, $params, $field);
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return array
+     */
     protected static function filterFile($value, array $params, array $field)
     {
         return (array)$value;
@@ -347,35 +529,61 @@ public static function typeNumber($value, array $params, array $field)
             return false;
         }
 
-        if (isset($params['min']) && $value < $params['min']) {
-            return false;
+        $value = (float)$value;
+
+        $min = 0;
+        if (isset($params['min'])) {
+            $min = (float)$params['min'];
+            if ($value < $min) {
+                return false;
+            }
         }
 
-        if (isset($params['max']) && $value > $params['max']) {
-            return false;
+        if (isset($params['max'])) {
+            $max = (float)$params['max'];
+            if ($value > $max) {
+                return false;
+            }
         }
 
-        $min = $params['min'] ?? 0;
+        if (isset($params['step'])) {
+            $step = (float)$params['step'];
+            // Count of how many steps we are above/below the minimum value.
+            $pos = ($value - $min) / $step;
 
-        return !(isset($params['step']) && fmod($value - $min, $params['step']) === 0);
+            return is_int(static::filterNumber($pos, $params, $field));
+        }
+
+        return true;
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return float|int
+     */
     protected static function filterNumber($value, array $params, array $field)
     {
-        return (string)(int)$value !== (string)(float)$value ? (float) $value : (int) $value;
+        return (string)(int)$value !== (string)(float)$value ? (float)$value : (int)$value;
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return string
+     */
     protected static function filterDateTime($value, array $params, array $field)
     {
         $format = Grav::instance()['config']->get('system.pages.dateformat.default');
         if ($format) {
-            $converted = new \DateTime($value);
+            $converted = new DateTime($value);
             return $converted->format($format);
         }
         return $value;
     }
 
-
     /**
      * HTML5 input: range
      *
@@ -389,6 +597,12 @@ public static function typeRange($value, array $params, array $field)
         return self::typeNumber($value, $params, $field);
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return float|int
+     */
     protected static function filterRange($value, array $params, array $field)
     {
         return self::filterNumber($value, $params, $field);
@@ -404,7 +618,7 @@ protected static function filterRange($value, array $params, array $field)
      */
     public static function typeColor($value, array $params, array $field)
     {
-        return preg_match('/^\#[0-9a-fA-F]{3}[0-9a-fA-F]{3}?$/u', $value);
+        return (bool)preg_match('/^\#[0-9a-fA-F]{3}[0-9a-fA-F]{3}?$/u', $value);
     }
 
     /**
@@ -417,7 +631,11 @@ public static function typeColor($value, array $params, array $field)
      */
     public static function typeEmail($value, array $params, array $field)
     {
-        $values = !\is_array($value) ? explode(',', preg_replace('/\s+/', '', $value)) : $value;
+        if (!isset($params['max'])) {
+            $params['max'] = 320;
+        }
+
+        $values = !is_array($value) ? explode(',', preg_replace('/\s+/', '', $value)) : $value;
 
         foreach ($values as $val) {
             if (!(self::typeText($val, $params, $field) && filter_var($val, FILTER_VALIDATE_EMAIL))) {
@@ -436,9 +654,12 @@ public static function typeEmail($value, array $params, array $field)
      * @param  array  $field   Blueprint for the field.
      * @return bool   True if validation succeeded.
      */
-
     public static function typeUrl($value, array $params, array $field)
     {
+        if (!isset($params['max'])) {
+            $params['max'] = 2048;
+        }
+
         return self::typeText($value, $params, $field) && filter_var($value, FILTER_VALIDATE_URL);
     }
 
@@ -452,17 +673,17 @@ public static function typeUrl($value, array $params, array $field)
      */
     public static function typeDatetime($value, array $params, array $field)
     {
-        if ($value instanceof \DateTime) {
+        if ($value instanceof DateTime) {
             return true;
         }
-        if (!\is_string($value)) {
+        if (!is_string($value)) {
             return false;
         }
         if (!isset($params['format'])) {
             return false !== strtotime($value);
         }
 
-        $dateFromFormat = \DateTime::createFromFormat($params['format'], $value);
+        $dateFromFormat = DateTime::createFromFormat($params['format'], $value);
 
         return $dateFromFormat && $value === date($params['format'], $dateFromFormat->getTimestamp());
     }
@@ -558,34 +779,42 @@ public static function typeWeek($value, array $params, array $field)
      */
     public static function typeArray($value, array $params, array $field)
     {
-        if (!\is_array($value)) {
+        if (!is_array($value)) {
             return false;
         }
 
         if (isset($field['multiple'])) {
-            if (isset($params['min']) && \count($value) < $params['min']) {
+            if (isset($params['min']) && count($value) < $params['min']) {
                 return false;
             }
 
-            if (isset($params['max']) && \count($value) > $params['max']) {
+            if (isset($params['max']) && count($value) > $params['max']) {
                 return false;
             }
 
             $min = $params['min'] ?? 0;
-            if (isset($params['step']) && (\count($value) - $min) % $params['step'] === 0) {
+            if (isset($params['step']) && (count($value) - $min) % $params['step'] === 0) {
                 return false;
             }
         }
 
         // If creating new values is allowed, no further checks are needed.
-        if (!empty($field['selectize']['create'])) {
+        $validateOptions = $field['validate']['options'] ?? null;
+        if (!empty($field['selectize']['create']) || $validateOptions === 'ignore') {
             return true;
         }
 
         $options = $field['options'] ?? [];
         $use = $field['use'] ?? 'values';
 
-        if (empty($field['selectize']) || empty($field['multiple'])) {
+        if ($validateOptions) {
+            // Use custom options structure.
+            foreach ($options as &$option) {
+                $option = $option[$validateOptions] ?? null;
+            }
+            unset($option);
+            $options = array_values($options);
+        } elseif (empty($field['selectize']) || empty($field['multiple'])) {
             $options = array_keys($options);
         }
         if ($use === 'keys') {
@@ -595,13 +824,32 @@ public static function typeArray($value, array $params, array $field)
         return !($options && array_diff($value, $options));
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return array|null
+     */
+    protected static function filterFlatten_array($value, $params, $field)
+    {
+        $value = static::filterArray($value, $params, $field);
+
+        return is_array($value) ? Utils::arrayUnflattenDotNotation($value) : null;
+    }
+
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return array|null
+     */
     protected static function filterArray($value, $params, $field)
     {
         $values = (array) $value;
         $options = isset($field['options']) ? array_keys($field['options']) : [];
         $multi = $field['multiple'] ?? false;
 
-        if (\count($values) === 1 && isset($values[0]) && $values[0] === '') {
+        if (count($values) === 1 && isset($values[0]) && $values[0] === '') {
             return null;
         }
 
@@ -615,7 +863,7 @@ protected static function filterArray($value, $params, $field)
 
         if ($multi) {
             foreach ($values as $key => $val) {
-                if (\is_array($val)) {
+                if (is_array($val)) {
                     $val = implode(',', $val);
                     $values[$key] =  array_map('trim', explode(',', $val));
                 } else {
@@ -624,28 +872,90 @@ protected static function filterArray($value, $params, $field)
             }
         }
 
-        if (isset($field['ignore_empty']) && Utils::isPositive($field['ignore_empty'])) {
-            foreach ($values as $key => $val) {
-                if ($val === '') {
+        $ignoreEmpty = isset($field['ignore_empty']) && Utils::isPositive($field['ignore_empty']);
+        $valueType = $params['value_type'] ?? null;
+        $keyType = $params['key_type'] ?? null;
+        if ($ignoreEmpty || $valueType || $keyType) {
+            $values = static::arrayFilterRecurse($values, ['value_type' => $valueType, 'key_type' => $keyType, 'ignore_empty' => $ignoreEmpty]);
+        }
+
+        return $values;
+    }
+
+    /**
+     * @param array $values
+     * @param array $params
+     * @return array
+     */
+    protected static function arrayFilterRecurse(array $values, array $params): array
+    {
+        foreach ($values as $key => &$val) {
+            if ($params['key_type']) {
+                switch ($params['key_type']) {
+                    case 'int':
+                        $result = is_int($key);
+                        break;
+                    case 'string':
+                        $result = is_string($key);
+                        break;
+                    default:
+                        $result = false;
+                }
+                if (!$result) {
                     unset($values[$key]);
-                } elseif (\is_array($val)) {
-                    foreach ($val as $inner_key => $inner_value) {
-                        if ($inner_value === '') {
-                            unset($val[$inner_key]);
-                        }
+                }
+            }
+            if (is_array($val)) {
+                $val = static::arrayFilterRecurse($val, $params);
+                if ($params['ignore_empty'] && empty($val)) {
+                    unset($values[$key]);
+                }
+            } else {
+                if ($params['value_type'] && $val !== '' && $val !== null) {
+                    switch ($params['value_type']) {
+                        case 'bool':
+                            if (Utils::isPositive($val)) {
+                                $val = true;
+                            } elseif (Utils::isNegative($val)) {
+                                $val = false;
+                            } else {
+                                // Ignore invalid bool values.
+                                $val = null;
+                            }
+                            break;
+                        case 'int':
+                            $val = (int)$val;
+                            break;
+                        case 'float':
+                            $val = (float)$val;
+                            break;
+                        case 'string':
+                            $val = (string)$val;
+                            break;
+                        case 'trim':
+                            $val = trim($val);
+                            break;
                     }
                 }
 
-                $values[$key] = $val;
+                if ($params['ignore_empty'] && ($val === '' || $val === null)) {
+                    unset($values[$key]);
+                }
             }
         }
 
         return $values;
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return bool
+     */
     public static function typeList($value, array $params, array $field)
     {
-        if (!\is_array($value)) {
+        if (!is_array($value)) {
             return false;
         }
 
@@ -662,19 +972,29 @@ public static function typeList($value, array $params, array $field)
         return true;
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return array
+     */
     protected static function filterList($value, array $params, array $field)
     {
         return (array) $value;
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @return array
+     */
     public static function filterYaml($value, $params)
     {
-        if (!\is_string($value)) {
+        if (!is_string($value)) {
             return $value;
         }
 
         return (array) Yaml::parse($value);
-
     }
 
     /**
@@ -690,6 +1010,12 @@ public static function typeIgnore($value, array $params, array $field)
         return true;
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return mixed
+     */
     public static function filterIgnore($value, array $params, array $field)
     {
         return $value;
@@ -708,6 +1034,12 @@ public static function typeUnset($value, array $params, array $field)
         return true;
     }
 
+    /**
+     * @param mixed $value
+     * @param array $params
+     * @param array $field
+     * @return null
+     */
     public static function filterUnset($value, array $params, array $field)
     {
         return null;
@@ -715,6 +1047,11 @@ public static function filterUnset($value, array $params, array $field)
 
     // HTML5 attributes (min, max and range are handled inside the types)
 
+    /**
+     * @param mixed $value
+     * @param bool $params
+     * @return bool
+     */
     public static function validateRequired($value, $params)
     {
         if (is_scalar($value)) {
@@ -724,79 +1061,170 @@ public static function validateRequired($value, $params)
         return (bool) $params !== true || !empty($value);
     }
 
+    /**
+     * @param mixed $value
+     * @param string $params
+     * @return bool
+     */
     public static function validatePattern($value, $params)
     {
         return (bool) preg_match("`^{$params}$`u", $value);
     }
 
-
     // Internal types
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return bool
+     */
     public static function validateAlpha($value, $params)
     {
         return ctype_alpha($value);
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return bool
+     */
     public static function validateAlnum($value, $params)
     {
         return ctype_alnum($value);
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return bool
+     */
     public static function typeBool($value, $params)
     {
-        return \is_bool($value) || $value == 1 || $value == 0;
+        return is_bool($value) || $value == 1 || $value == 0;
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return bool
+     */
     public static function validateBool($value, $params)
     {
-        return \is_bool($value) || $value == 1 || $value == 0;
+        return is_bool($value) || $value == 1 || $value == 0;
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return bool
+     */
     protected static function filterBool($value, $params)
     {
         return (bool) $value;
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return bool
+     */
     public static function validateDigit($value, $params)
     {
         return ctype_digit($value);
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return bool
+     */
     public static function validateFloat($value, $params)
     {
-        return \is_float(filter_var($value, FILTER_VALIDATE_FLOAT));
+        return is_float(filter_var($value, FILTER_VALIDATE_FLOAT));
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return float
+     */
     protected static function filterFloat($value, $params)
     {
         return (float) $value;
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return bool
+     */
     public static function validateHex($value, $params)
     {
         return ctype_xdigit($value);
     }
 
+    /**
+     * Custom input: int
+     *
+     * @param  mixed  $value   Value to be validated.
+     * @param  array  $params  Validation parameters.
+     * @param  array  $field   Blueprint for the field.
+     * @return bool   True if validation succeeded.
+     */
+    public static function typeInt($value, array $params, array $field)
+    {
+        $params['step'] = max(1, (int)($params['step'] ?? 0));
+
+        return self::typeNumber($value, $params, $field);
+    }
+
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return bool
+     */
     public static function validateInt($value, $params)
     {
         return is_numeric($value) && (int)$value == $value;
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return int
+     */
     protected static function filterInt($value, $params)
     {
         return (int)$value;
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return bool
+     */
     public static function validateArray($value, $params)
     {
-        return \is_array($value) || ($value instanceof \ArrayAccess && $value instanceof \Traversable && $value instanceof \Countable);
+        return is_array($value) || ($value instanceof ArrayAccess && $value instanceof Traversable && $value instanceof Countable);
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return array
+     */
     public static function filterItem_List($value, $params)
     {
-        return array_values(array_filter($value, function($v) { return !empty($v); } ));
+        return array_values(array_filter($value, static function ($v) {
+            return !empty($v);
+        }));
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $params
+     * @return bool
+     */
     public static function validateJson($value, $params)
     {
         return (bool) (@json_decode($value));
diff --git a/system/src/Grav/Common/Data/ValidationException.php b/system/src/Grav/Common/Data/ValidationException.php
index 8bdb0572d7..9a3d900d1b 100644
--- a/system/src/Grav/Common/Data/ValidationException.php
+++ b/system/src/Grav/Common/Data/ValidationException.php
@@ -3,36 +3,65 @@
 /**
  * @package    Grav\Common\Data
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Data;
 
 use Grav\Common\Grav;
+use JsonSerializable;
+use RuntimeException;
 
-class ValidationException extends \RuntimeException
+/**
+ * Class ValidationException
+ * @package Grav\Common\Data
+ */
+class ValidationException extends RuntimeException implements JsonSerializable
 {
+    /** @var array */
     protected $messages = [];
+    protected $escape = true;
 
-    public function setMessages(array $messages = []) {
+    /**
+     * @param array $messages
+     * @return $this
+     */
+    public function setMessages(array $messages = [])
+    {
         $this->messages = $messages;
 
         $language = Grav::instance()['language'];
         $this->message = $language->translate('GRAV.FORM.VALIDATION_FAIL', null, true) . ' ' . $this->message;
 
-        foreach ($messages as $variable => &$list) {
+        foreach ($messages as $list) {
             $list = array_unique($list);
             foreach ($list as $message) {
-                $this->message .= "<br/>$message";
+                $this->message .= '<br/>' . htmlspecialchars($message, ENT_QUOTES | ENT_HTML5, 'UTF-8');
             }
         }
 
         return $this;
     }
 
-    public function getMessages()
+    public function setSimpleMessage(bool $escape = true): void
+    {
+        $first = reset($this->messages);
+        $message = reset($first);
+
+        $this->message = $escape ? htmlspecialchars($message, ENT_QUOTES | ENT_HTML5, 'UTF-8') : $message;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMessages(): array
     {
         return $this->messages;
     }
+
+    public function jsonSerialize(): array
+    {
+        return ['validation' => $this->messages];
+    }
 }
diff --git a/system/src/Grav/Common/Debugger.php b/system/src/Grav/Common/Debugger.php
index 3afce3798d..e7b162454e 100644
--- a/system/src/Grav/Common/Debugger.php
+++ b/system/src/Grav/Common/Debugger.php
@@ -3,12 +3,19 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use Clockwork\Clockwork;
+use Clockwork\DataSource\MonologDataSource;
+use Clockwork\DataSource\PsrMessageDataSource;
+use Clockwork\DataSource\XdebugDataSource;
+use Clockwork\Helpers\ServerTiming;
+use Clockwork\Request\UserData;
+use Clockwork\Storage\FileStorage;
 use DebugBar\DataCollector\ConfigCollector;
 use DebugBar\DataCollector\DataCollectorInterface;
 use DebugBar\DataCollector\ExceptionsCollector;
@@ -18,76 +25,106 @@
 use DebugBar\DataCollector\RequestDataCollector;
 use DebugBar\DataCollector\TimeDataCollector;
 use DebugBar\DebugBar;
+use DebugBar\DebugBarException;
 use DebugBar\JavascriptRenderer;
-use DebugBar\StandardDebugBar;
 use Grav\Common\Config\Config;
 use Grav\Common\Processors\ProcessorInterface;
+use Grav\Common\Twig\TwigClockworkDataSource;
+use Grav\Framework\Psr7\Response;
+use Monolog\Logger;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use ReflectionObject;
+use SplFileInfo;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Throwable;
+use Twig\Environment;
 use Twig\Template;
 use Twig\TemplateWrapper;
+use function array_slice;
+use function call_user_func;
+use function count;
+use function define;
+use function defined;
+use function extension_loaded;
+use function get_class;
+use function gettype;
+use function is_array;
+use function is_bool;
+use function is_object;
+use function is_scalar;
+use function is_string;
 
+/**
+ * Class Debugger
+ * @package Grav\Common
+ */
 class Debugger
 {
-    /** @var Grav $grav */
+    /** @var static */
+    protected static $instance;
+    /** @var Grav|null */
     protected $grav;
-
-    /** @var Config $config */
+    /** @var Config|null */
     protected $config;
-
-    /** @var JavascriptRenderer $renderer */
+    /** @var JavascriptRenderer|null */
     protected $renderer;
-
-    /** @var StandardDebugBar $debugbar */
+    /** @var DebugBar|null */
     protected $debugbar;
-
+    /** @var Clockwork|null */
+    protected $clockwork;
+    /** @var bool */
+    protected $enabled = false;
     /** @var bool */
-    protected $enabled;
-
     protected $initialized = false;
-
     /** @var array */
     protected $timers = [];
-
-    /** @var array $deprecations */
+    /** @var array */
     protected $deprecations = [];
-
-    /** @var callable */
+    /** @var callable|null */
     protected $errorHandler;
+    /** @var float */
+    protected $requestTime;
+    /** @var float */
+    protected $currentTime;
+    /** @var int */
+    protected $profiling = 0;
+    /** @var bool */
+    protected $censored = false;
 
     /**
      * Debugger constructor.
      */
     public function __construct()
     {
-        $currentTime = microtime(true);
-
-        if (!\defined('GRAV_REQUEST_TIME')) {
-            \define('GRAV_REQUEST_TIME', $currentTime);
-        }
-
-        // Enable debugger until $this->init() gets called.
-        $this->enabled = true;
+        static::$instance = $this;
 
-        $debugbar = new DebugBar();
-        $debugbar->addCollector(new PhpInfoCollector());
-        $debugbar->addCollector(new MessagesCollector());
-        $debugbar->addCollector(new RequestDataCollector());
-        $debugbar->addCollector(new TimeDataCollector($_SERVER['REQUEST_TIME_FLOAT'] ?? GRAV_REQUEST_TIME));
+        $this->currentTime = microtime(true);
 
-        $debugbar['time']->addMeasure('Server', $debugbar['time']->getRequestStartTime(), GRAV_REQUEST_TIME);
-        $debugbar['time']->addMeasure('Loading', GRAV_REQUEST_TIME, $currentTime);
-        $debugbar['time']->addMeasure('Debugger', $currentTime, microtime(true));
+        if (!defined('GRAV_REQUEST_TIME')) {
+            define('GRAV_REQUEST_TIME', $this->currentTime);
+        }
 
-        $this->debugbar = $debugbar;
+        $this->requestTime = $_SERVER['REQUEST_TIME_FLOAT'] ?? GRAV_REQUEST_TIME;
 
         // Set deprecation collector.
         $this->setErrorHandler();
     }
 
+    /**
+     * @return Clockwork|null
+     */
+    public function getClockwork(): ?Clockwork
+    {
+        return $this->enabled ? $this->clockwork : null;
+    }
+
     /**
      * Initialize the debugger
      *
      * @return $this
-     * @throws \DebugBar\DebugBarException
+     * @throws DebugBarException
      */
     public function init()
     {
@@ -100,30 +137,242 @@ public function init()
 
         // Enable/disable debugger based on configuration.
         $this->enabled = (bool)$this->config->get('system.debugger.enabled');
+        $this->censored = (bool)$this->config->get('system.debugger.censored', false);
 
-        if ($this->enabled()) {
+        if ($this->enabled) {
             $this->initialized = true;
 
-            $plugins_config = (array)$this->config->get('plugins');
+            $clockwork = $debugbar = null;
 
+            switch ($this->config->get('system.debugger.provider', 'debugbar')) {
+                case 'clockwork':
+                    $this->clockwork = $clockwork = new Clockwork();
+                    break;
+                default:
+                    $this->debugbar = $debugbar = new DebugBar();
+            }
+
+            $plugins_config = (array)$this->config->get('plugins');
             ksort($plugins_config);
 
-            $debugbar = $this->debugbar;
-            $debugbar->addCollector(new MemoryCollector());
-            $debugbar->addCollector(new ExceptionsCollector());
-            $debugbar->addCollector(new ConfigCollector((array)$this->config->get('system'), 'Config'));
-            $debugbar->addCollector(new ConfigCollector($plugins_config, 'Plugins'));
-            $this->addMessage('Grav v' . GRAV_VERSION);
+            if ($clockwork) {
+                $log = $this->grav['log'];
+                $clockwork->setStorage(new FileStorage('cache://clockwork'));
+                if (extension_loaded('xdebug')) {
+                    $clockwork->addDataSource(new XdebugDataSource());
+                }
+                if ($log instanceof Logger) {
+                    $clockwork->addDataSource(new MonologDataSource($log));
+                }
+
+                $timeline = $clockwork->timeline();
+                if ($this->requestTime !== GRAV_REQUEST_TIME) {
+                    $event = $timeline->event('Server');
+                    $event->finalize($this->requestTime, GRAV_REQUEST_TIME);
+                }
+                if ($this->currentTime !== GRAV_REQUEST_TIME) {
+                    $event = $timeline->event('Loading');
+                    $event->finalize(GRAV_REQUEST_TIME, $this->currentTime);
+                }
+                $event = $timeline->event('Site Setup');
+                $event->finalize($this->currentTime, microtime(true));
+            }
+
+            if ($this->censored) {
+                $censored = ['CENSORED' => true];
+            }
+
+            if ($debugbar) {
+                $debugbar->addCollector(new PhpInfoCollector());
+                $debugbar->addCollector(new MessagesCollector());
+                if (!$this->censored) {
+                    $debugbar->addCollector(new RequestDataCollector());
+                }
+                $debugbar->addCollector(new TimeDataCollector($this->requestTime));
+                $debugbar->addCollector(new MemoryCollector());
+                $debugbar->addCollector(new ExceptionsCollector());
+                $debugbar->addCollector(new ConfigCollector($censored ?? (array)$this->config->get('system'), 'Config'));
+                $debugbar->addCollector(new ConfigCollector($censored ?? $plugins_config, 'Plugins'));
+                $debugbar->addCollector(new ConfigCollector($this->config->get('streams.schemes'), 'Streams'));
+
+                if ($this->requestTime !== GRAV_REQUEST_TIME) {
+                    $debugbar['time']->addMeasure('Server', $debugbar['time']->getRequestStartTime(), GRAV_REQUEST_TIME);
+                }
+                if ($this->currentTime !== GRAV_REQUEST_TIME) {
+                    $debugbar['time']->addMeasure('Loading', GRAV_REQUEST_TIME, $this->currentTime);
+                }
+                $debugbar['time']->addMeasure('Site Setup', $this->currentTime, microtime(true));
+            }
+
+            $this->addMessage('Grav v' . GRAV_VERSION . ' - PHP ' . PHP_VERSION);
+            $this->config->debug();
+
+            if ($clockwork) {
+                $clockwork->info('System Configuration', $censored ?? $this->config->get('system'));
+                $clockwork->info('Plugins Configuration', $censored ?? $plugins_config);
+                $clockwork->info('Streams', $this->config->get('streams.schemes'));
+            }
         }
 
         return $this;
     }
 
+    public function finalize(): void
+    {
+        if ($this->clockwork && $this->enabled) {
+            $this->stopProfiling('Profiler Analysis');
+            $this->addMeasures();
+
+            $deprecations = $this->getDeprecations();
+            $count = count($deprecations);
+            if (!$count) {
+                return;
+            }
+
+            /** @var UserData $userData */
+            $userData = $this->clockwork->userData('Deprecated');
+            $userData->counters([
+                'Deprecated' => count($deprecations)
+            ]);
+            /*
+            foreach ($deprecations as &$deprecation) {
+                $d = $deprecation;
+                unset($d['message']);
+                $this->clockwork->log('deprecated', $deprecation['message'], $d);
+            }
+            unset($deprecation);
+             */
+
+            $userData->table('Your site is using following deprecated features', $deprecations);
+        }
+    }
+
+    public function logRequest(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
+    {
+        if (!$this->enabled || !$this->clockwork) {
+            return $response;
+        }
+
+        $clockwork = $this->clockwork;
+
+        $this->finalize();
+
+        $clockwork->timeline()->finalize($request->getAttribute('request_time'));
+
+        if ($this->censored) {
+            $censored = 'CENSORED';
+            $request = $request
+                ->withCookieParams([$censored => ''])
+                ->withUploadedFiles([])
+                ->withHeader('cookie', $censored);
+            $request = $request->withParsedBody([$censored => '']);
+        }
+
+        $clockwork->addDataSource(new PsrMessageDataSource($request, $response));
+
+        $clockwork->resolveRequest();
+        $clockwork->storeRequest();
+
+        $clockworkRequest = $clockwork->getRequest();
+
+        $response = $response
+            ->withHeader('X-Clockwork-Id', $clockworkRequest->id)
+            ->withHeader('X-Clockwork-Version', $clockwork::VERSION);
+
+        $grav = Grav::instance();
+        $basePath = $this->grav['base_url_relative'] . $grav['pages']->base();
+        if ($basePath) {
+            $response = $response->withHeader('X-Clockwork-Path', $basePath . '/__clockwork/');
+        }
+
+        return $response->withHeader('Server-Timing', ServerTiming::fromRequest($clockworkRequest)->value());
+    }
+
+
+    public function debuggerRequest(RequestInterface $request): Response
+    {
+        $clockwork = $this->clockwork;
+
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Grav-Internal-SkipShutdown' => 1
+        ];
+
+        $path = $request->getUri()->getPath();
+        $clockworkDataUri = '#/__clockwork(?:/(?<id>[0-9-]+))?(?:/(?<direction>(?:previous|next)))?(?:/(?<count>\d+))?#';
+        if (preg_match($clockworkDataUri, $path, $matches) === false) {
+            $response = ['message' => 'Bad Input'];
+
+            return new Response(400, $headers, json_encode($response));
+        }
+
+        $id = $matches['id'] ?? null;
+        $direction = $matches['direction'] ?? null;
+        $count = $matches['count'] ?? null;
+
+        $storage = $clockwork->getStorage();
+
+        if ($direction === 'previous') {
+            $data = $storage->previous($id, $count);
+        } elseif ($direction === 'next') {
+            $data = $storage->next($id, $count);
+        } elseif ($id === 'latest') {
+            $data = $storage->latest();
+        } else {
+            $data = $storage->find($id);
+        }
+
+        if (preg_match('#(?<id>[0-9-]+|latest)/extended#', $path)) {
+            $clockwork->extendRequest($data);
+        }
+
+        if (!$data) {
+            $response = ['message' => 'Not Found'];
+
+            return new Response(404, $headers, json_encode($response));
+        }
+
+        $data = is_array($data) ? array_map(static function ($item) {
+            return $item->toArray();
+        }, $data) : $data->toArray();
+
+        return new Response(200, $headers, json_encode($data));
+    }
+
+    /**
+     * @return void
+     */
+    protected function addMeasures(): void
+    {
+        if (!$this->enabled) {
+            return;
+        }
+
+        $nowTime = microtime(true);
+        $clkTimeLine = $this->clockwork ? $this->clockwork->timeline() : null;
+        $debTimeLine = $this->debugbar ? $this->debugbar['time'] : null;
+        foreach ($this->timers as $name => $data) {
+            $description = $data[0];
+            $startTime = $data[1] ?? null;
+            $endTime = $data[2] ?? $nowTime;
+            if ($clkTimeLine) {
+                $event = $clkTimeLine->event($description);
+                $event->finalize($startTime, $endTime);
+            } elseif ($debTimeLine) {
+                if ($endTime - $startTime < 0.001) {
+                    continue;
+                }
+
+                $debTimeLine->addMeasure($description ?? $name, $startTime, $endTime);
+            }
+        }
+        $this->timers = [];
+    }
+
     /**
      * Set/get the enabled state of the debugger
      *
-     * @param bool $state If null, the method returns the enabled value. If set, the method sets the enabled state
-     *
+     * @param bool|null $state If null, the method returns the enabled value. If set, the method sets the enabled state
      * @return bool
      */
     public function enabled($state = null)
@@ -142,8 +391,7 @@ public function enabled($state = null)
      */
     public function addAssets()
     {
-        if ($this->enabled()) {
-
+        if ($this->enabled) {
             // Only add assets if Page is HTML
             $page = $this->grav['page'];
             if ($page->templateFormat() !== 'html') {
@@ -153,28 +401,42 @@ public function addAssets()
             /** @var Assets $assets */
             $assets = $this->grav['assets'];
 
-            // Add jquery library
-            $assets->add('jquery', 101);
+            // Clockwork specific assets
+            if ($this->clockwork) {
+                $assets->addCss('/system/assets/debugger/clockwork.css', ['loading' => 'inline']);
+                $assets->addJs('/system/assets/debugger/clockwork.js', ['loading' => 'inline']);
+            }
 
-            $this->renderer = $this->debugbar->getJavascriptRenderer();
-            $this->renderer->setIncludeVendors(false);
 
-            // Get the required CSS files
-            list($css_files, $js_files) = $this->renderer->getAssets(null, JavascriptRenderer::RELATIVE_URL);
-            foreach ((array)$css_files as $css) {
-                $assets->addCss($css);
-            }
+            // Debugbar specific assets
+            if ($this->debugbar) {
+                // Add jquery library
+                $assets->add('jquery', 101);
+
+                $this->renderer = $this->debugbar->getJavascriptRenderer();
+                $this->renderer->setIncludeVendors(false);
+
+                [$css_files, $js_files] = $this->renderer->getAssets(null, JavascriptRenderer::RELATIVE_URL);
+
+                foreach ((array)$css_files as $css) {
+                    $assets->addCss($css);
+                }
 
-            $assets->addCss('/system/assets/debugger.css');
+                $assets->addCss('/system/assets/debugger/phpdebugbar.css', ['loading' => 'inline']);
 
-            foreach ((array)$js_files as $js) {
-                $assets->addJs($js);
+                foreach ((array)$js_files as $js) {
+                    $assets->addJs($js);
+                }
             }
         }
 
         return $this;
     }
 
+    /**
+     * @param int $limit
+     * @return array
+     */
     public function getCaller($limit = 2)
     {
         $trace = debug_backtrace(false, $limit);
@@ -186,13 +448,14 @@ public function getCaller($limit = 2)
      * Adds a data collector
      *
      * @param DataCollectorInterface $collector
-     *
      * @return $this
-     * @throws \DebugBar\DebugBarException
+     * @throws DebugBarException
      */
     public function addCollector($collector)
     {
-        $this->debugbar->addCollector($collector);
+        if ($this->debugbar && !$this->debugbar->hasCollector($collector->getName())) {
+            $this->debugbar->addCollector($collector);
+        }
 
         return $this;
     }
@@ -200,14 +463,17 @@ public function addCollector($collector)
     /**
      * Returns a data collector
      *
-     * @param DataCollectorInterface $collector
-     *
-     * @return DataCollectorInterface
-     * @throws \DebugBar\DebugBarException
+     * @param string $name
+     * @return DataCollectorInterface|null
+     * @throws DebugBarException
      */
-    public function getCollector($collector)
+    public function getCollector($name)
     {
-        return $this->debugbar->getCollector($collector);
+        if ($this->debugbar && $this->debugbar->hasCollector($name)) {
+            return $this->debugbar->getCollector($name);
+        }
+
+        return null;
     }
 
     /**
@@ -217,13 +483,14 @@ public function getCollector($collector)
      */
     public function render()
     {
-        if ($this->enabled()) {
+        if ($this->enabled && $this->debugbar) {
             // Only add assets if Page is HTML
             $page = $this->grav['page'];
             if (!$this->renderer || $page->templateFormat() !== 'html') {
                 return $this;
             }
 
+            $this->addMeasures();
             $this->addDeprecations();
 
             echo $this->renderer->render();
@@ -239,7 +506,8 @@ public function render()
      */
     public function sendDataInHeaders()
     {
-        if ($this->enabled()) {
+        if ($this->enabled && $this->debugbar) {
+            $this->addMeasures();
             $this->addDeprecations();
             $this->debugbar->sendDataInHeaders();
         }
@@ -250,34 +518,182 @@ public function sendDataInHeaders()
     /**
      * Returns collected debugger data.
      *
-     * @return array
+     * @return array|null
      */
     public function getData()
     {
-        if (!$this->enabled()) {
+        if (!$this->enabled || !$this->debugbar) {
             return null;
         }
 
+        $this->addMeasures();
         $this->addDeprecations();
         $this->timers = [];
 
         return $this->debugbar->getData();
     }
 
+    /**
+     * Hierarchical Profiler support.
+     *
+     * @param callable $callable
+     * @param string|null $message
+     * @return mixed
+     */
+    public function profile(callable $callable, string $message = null)
+    {
+        $this->startProfiling();
+        $response = $callable();
+        $this->stopProfiling($message);
+
+        return $response;
+    }
+
+    public function addTwigProfiler(Environment $twig): void
+    {
+        $clockwork = $this->getClockwork();
+        if ($clockwork) {
+            $source = new TwigClockworkDataSource($twig);
+            $source->listenToEvents();
+            $clockwork->addDataSource($source);
+        }
+    }
+
+    /**
+     * Start profiling code.
+     *
+     * @return void
+     */
+    public function startProfiling(): void
+    {
+        if ($this->enabled && extension_loaded('tideways_xhprof')) {
+            $this->profiling++;
+            if ($this->profiling === 1) {
+                // @phpstan-ignore-next-line
+                \tideways_xhprof_enable(TIDEWAYS_XHPROF_FLAGS_NO_BUILTINS);
+            }
+        }
+    }
+
+    /**
+     * Stop profiling code. Returns profiling array or null if profiling couldn't be done.
+     *
+     * @param string|null $message
+     * @return array|null
+     */
+    public function stopProfiling(string $message = null): ?array
+    {
+        $timings = null;
+        if ($this->enabled && extension_loaded('tideways_xhprof')) {
+            $profiling = $this->profiling - 1;
+            if ($profiling === 0) {
+                // @phpstan-ignore-next-line
+                $timings = \tideways_xhprof_disable();
+                $timings = $this->buildProfilerTimings($timings);
+
+                if ($this->clockwork) {
+                    /** @var UserData $userData */
+                    $userData = $this->clockwork->userData('Profiler');
+                    $userData->counters([
+                        'Calls' => count($timings)
+                    ]);
+                    $userData->table('Profiler', $timings);
+                } else {
+                    $this->addMessage($message ?? 'Profiler Analysis', 'debug', $timings);
+                }
+            }
+            $this->profiling = max(0, $profiling);
+        }
+
+        return $timings;
+    }
+
+    /**
+     * @param array $timings
+     * @return array
+     */
+    protected function buildProfilerTimings(array $timings): array
+    {
+        // Filter method calls which take almost no time.
+        $timings = array_filter($timings, function ($value) {
+            return $value['wt'] > 50;
+        });
+
+        uasort($timings, function (array $a, array $b) {
+            return $b['wt'] <=> $a['wt'];
+        });
+
+        $table = [];
+        foreach ($timings as $key => $timing) {
+            $parts = explode('==>', $key);
+            $method = $this->parseProfilerCall(array_pop($parts));
+            $context = $this->parseProfilerCall(array_pop($parts));
+
+            // Skip redundant method calls.
+            if ($context === 'Grav\Framework\RequestHandler\RequestHandler::handle()') {
+                continue;
+            }
+
+            // Do not profile library calls.
+            if (strpos($context, 'Grav\\') !== 0) {
+                continue;
+            }
+
+            $table[] = [
+                'Context' => $context,
+                'Method' => $method,
+                'Calls' => $timing['ct'],
+                'Time (ms)' => $timing['wt'] / 1000,
+            ];
+        }
+
+        return $table;
+    }
+
+    /**
+     * @param string|null $call
+     * @return mixed|string|null
+     */
+    protected function parseProfilerCall(?string $call)
+    {
+        if (null === $call) {
+            return '';
+        }
+        if (strpos($call, '@')) {
+            [$call,] = explode('@', $call);
+        }
+        if (strpos($call, '::')) {
+            [$class, $call] = explode('::', $call);
+        }
+
+        if (!isset($class)) {
+            return $call;
+        }
+
+        // It is also possible to display twig files, but they are being logged in views.
+        /*
+        if (strpos($class, '__TwigTemplate_') === 0 && class_exists($class)) {
+            $env = new Environment();
+            / ** @var Template $template * /
+            $template = new $class($env);
+
+            return $template->getTemplateName();
+        }
+        */
+
+        return "{$class}::{$call}()";
+    }
+
     /**
      * Start a timer with an associated name and description
      *
      * @param string      $name
      * @param string|null $description
-     *
      * @return $this
      */
     public function startTimer($name, $description = null)
     {
-        if (strpos($name, '_') === 0 || $this->enabled()) {
-            $this->debugbar['time']->startMeasure($name, $description);
-            $this->timers[] = $name;
-        }
+        $this->timers[$name] = [$description, microtime(true)];
 
         return $this;
     }
@@ -286,13 +702,13 @@ public function startTimer($name, $description = null)
      * Stop the named timer
      *
      * @param string $name
-     *
      * @return $this
      */
     public function stopTimer($name)
     {
-        if (\in_array($name, $this->timers, true) && (strpos($name, '_') === 0 || $this->enabled())) {
-            $this->debugbar['time']->stopMeasure($name);
+        if (isset($this->timers[$name])) {
+            $endTime = microtime(true);
+            $this->timers[$name][] = $endTime;
         }
 
         return $this;
@@ -303,14 +719,76 @@ public function stopTimer($name)
      *
      * @param mixed  $message
      * @param string $label
-     * @param bool   $isString
-     *
+     * @param mixed|bool $isString
      * @return $this
      */
     public function addMessage($message, $label = 'info', $isString = true)
     {
-        if ($this->enabled()) {
-            $this->debugbar['messages']->addMessage($message, $label, $isString);
+        if ($this->enabled) {
+            if ($this->censored) {
+                if (!is_scalar($message)) {
+                    $message = 'CENSORED';
+                }
+                if (!is_scalar($isString)) {
+                    $isString = ['CENSORED'];
+                }
+            }
+
+            if ($this->debugbar) {
+                if (is_array($isString)) {
+                    $message = $isString;
+                    $isString = false;
+                } elseif (is_string($isString)) {
+                    $message = $isString;
+                    $isString = true;
+                }
+                $this->debugbar['messages']->addMessage($message, $label, $isString);
+            }
+
+            if ($this->clockwork) {
+                $context = $isString;
+                if (!is_scalar($message)) {
+                    $context = $message;
+                    $message = gettype($context);
+                }
+                if (is_bool($context)) {
+                    $context = [];
+                } elseif (!is_array($context)) {
+                    $type = gettype($context);
+                    $context = [$type => $context];
+                }
+
+                $this->clockwork->log($label, $message, $context);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     * @param object $event
+     * @param EventDispatcherInterface $dispatcher
+     * @param float|null $time
+     * @return $this
+     */
+    public function addEvent(string $name, $event, EventDispatcherInterface $dispatcher, float $time = null)
+    {
+        if ($this->enabled && $this->clockwork) {
+            $time = $time ?? microtime(true);
+            $duration = (microtime(true) - $time) * 1000;
+
+            $data = null;
+            if ($event && method_exists($event, '__debugInfo')) {
+                $data = $event;
+            }
+
+            $listeners = [];
+            foreach ($dispatcher->getListeners($name) as $listener) {
+                $listeners[] = $this->resolveCallable($listener);
+            }
+
+            $this->clockwork->addEvent($name, $data, $time, ['listeners' => $listeners, 'duration' => $duration]);
         }
 
         return $this;
@@ -319,18 +797,31 @@ public function addMessage($message, $label = 'info', $isString = true)
     /**
      * Dump exception into the Messages tab of the Debug Bar
      *
-     * @param \Exception $e
+     * @param Throwable $e
      * @return Debugger
      */
-    public function addException(\Exception $e)
+    public function addException(Throwable $e)
     {
-        if ($this->initialized && $this->enabled()) {
-            $this->debugbar['exceptions']->addException($e);
+        if ($this->initialized && $this->enabled) {
+            if ($this->debugbar) {
+                $this->debugbar['exceptions']->addThrowable($e);
+            }
+
+            if ($this->clockwork) {
+                /** @var UserData $exceptions */
+                $exceptions = $this->clockwork->userData('Exceptions');
+                $exceptions->data(['message' => $e->getMessage()]);
+
+                $this->clockwork->alert($e->getMessage(), ['exception' => $e]);
+            }
         }
 
         return $this;
     }
 
+    /**
+     * @return void
+     */
     public function setErrorHandler()
     {
         $this->errorHandler = set_error_handler(
@@ -347,15 +838,15 @@ public function setErrorHandler()
      */
     public function deprecatedErrorHandler($errno, $errstr, $errfile, $errline)
     {
-        if ($errno !== E_USER_DEPRECATED) {
+        if ($errno !== E_USER_DEPRECATED && $errno !== E_DEPRECATED) {
             if ($this->errorHandler) {
-                return \call_user_func($this->errorHandler, $errno, $errstr, $errfile, $errline);
+                return call_user_func($this->errorHandler, $errno, $errstr, $errfile, $errline);
             }
 
             return true;
         }
 
-        if (!$this->enabled()) {
+        if (!$this->enabled) {
             return true;
         }
 
@@ -365,6 +856,10 @@ public function deprecatedErrorHandler($errno, $errstr, $errfile, $errline)
             $scope = 'grav';
         } elseif (strpos($errfile, '/twig/') !== false) {
             $scope = 'twig';
+            // TODO: remove when upgrading to Twig 2+
+            if (str_contains($errstr, '#[\ReturnTypeWillChange]') || str_contains($errstr, 'Passing null to parameter')) {
+                return true;
+            }
         } elseif (stripos($errfile, '/yaml/') !== false) {
             $scope = 'yaml';
         } elseif (strpos($errfile, '/vendor/') !== false) {
@@ -382,10 +877,10 @@ public function deprecatedErrorHandler($errno, $errstr, $errfile, $errline)
             foreach ($backtrace as $current) {
                 if (isset($current['args'])) {
                     foreach ($current['args'] as $arg) {
-                        if ($arg instanceof \SplFileInfo) {
+                        if ($arg instanceof SplFileInfo) {
                             $arg = $arg->getPathname();
                         }
-                        if (\is_string($arg) && preg_match('/.+\.(yaml|md)$/i', $arg)) {
+                        if (is_string($arg) && preg_match('/.+\.(yaml|md)$/i', $arg)) {
                             $errfile = $arg;
                             $errline = 0;
 
@@ -403,18 +898,18 @@ public function deprecatedErrorHandler($errno, $errstr, $errfile, $errline)
             if (isset($current['args'])) {
                 $args = [];
                 foreach ($current['args'] as $arg) {
-                    if (\is_string($arg)) {
+                    if (is_string($arg)) {
                         $arg = "'" . $arg . "'";
                         if (mb_strlen($arg) > 100) {
                             $arg = 'string';
                         }
-                    } elseif (\is_bool($arg)) {
+                    } elseif (is_bool($arg)) {
                         $arg = $arg ? 'true' : 'false';
-                    } elseif (\is_scalar($arg)) {
+                    } elseif (is_scalar($arg)) {
                         $arg = $arg;
-                    } elseif (\is_object($arg)) {
+                    } elseif (is_object($arg)) {
                         $arg = get_class($arg) . ' $object';
-                    } elseif (\is_array($arg)) {
+                    } elseif (is_array($arg)) {
                         $arg = '$array';
                     } else {
                         $arg = '$object';
@@ -430,7 +925,7 @@ public function deprecatedErrorHandler($errno, $errstr, $errfile, $errline)
 
             $reflection = null;
             if ($object instanceof TemplateWrapper) {
-                $reflection = new \ReflectionObject($object);
+                $reflection = new ReflectionObject($object);
                 $property = $reflection->getProperty('template');
                 $property->setAccessible(true);
                 $object = $property->getValue($object);
@@ -540,6 +1035,28 @@ public function deprecatedErrorHandler($errno, $errstr, $errfile, $errline)
         return true;
     }
 
+    /**
+     * @return array
+     */
+    protected function getDeprecations(): array
+    {
+        if (!$this->deprecations) {
+            return [];
+        }
+
+        $list = [];
+        /** @var array $deprecated */
+        foreach ($this->deprecations as $deprecated) {
+            $list[] = $this->getDepracatedMessage($deprecated)[0];
+        }
+
+        return $list;
+    }
+
+    /**
+     * @return void
+     * @throws DebugBarException
+     */
     protected function addDeprecations()
     {
         if (!$this->deprecations) {
@@ -558,6 +1075,10 @@ protected function addDeprecations()
         }
     }
 
+    /**
+     * @param array $deprecated
+     * @return array
+     */
     protected function getDepracatedMessage($deprecated)
     {
         $scope = $deprecated['scope'];
@@ -595,6 +1116,10 @@ protected function getDepracatedMessage($deprecated)
         ];
     }
 
+    /**
+     * @param array $trace
+     * @return string
+     */
     protected function getFunction($trace)
     {
         if (!isset($trace['function'])) {
@@ -603,4 +1128,17 @@ protected function getFunction($trace)
 
         return $trace['function'] . '(' . implode(', ', $trace['args'] ?? []) . ')';
     }
+
+    /**
+     * @param callable $callable
+     * @return string
+     */
+    protected function resolveCallable(callable $callable)
+    {
+        if (is_array($callable)) {
+            return get_class($callable[0]) . '->' . $callable[1] . '()';
+        }
+
+        return 'unknown';
+    }
 }
diff --git a/system/src/Grav/Common/Errors/BareHandler.php b/system/src/Grav/Common/Errors/BareHandler.php
index 52effc6d4e..909382717e 100644
--- a/system/src/Grav/Common/Errors/BareHandler.php
+++ b/system/src/Grav/Common/Errors/BareHandler.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Errors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,22 +11,23 @@
 
 use Whoops\Handler\Handler;
 
+/**
+ * Class BareHandler
+ * @package Grav\Common\Errors
+ */
 class BareHandler extends Handler
 {
-
     /**
-     * @return int|null
+     * @return int
      */
     public function handle()
     {
         $inspector = $this->getInspector();
         $code = $inspector->getException()->getCode();
-        if ( ($code >= 400) && ($code < 600) )
-        {
-            $this->getRun()->sendHttpCode($code);    
+        if (($code >= 400) && ($code < 600)) {
+            $this->getRun()->sendHttpCode($code);
         }
 
         return Handler::QUIT;
     }
-
 }
diff --git a/system/src/Grav/Common/Errors/Errors.php b/system/src/Grav/Common/Errors/Errors.php
index dbc955ed07..92f885bfd8 100644
--- a/system/src/Grav/Common/Errors/Errors.php
+++ b/system/src/Grav/Common/Errors/Errors.php
@@ -3,17 +3,29 @@
 /**
  * @package    Grav\Common\Errors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Errors;
 
+use Exception;
 use Grav\Common\Grav;
-use Whoops;
+use Whoops\Handler\JsonResponseHandler;
+use Whoops\Handler\PrettyPageHandler;
+use Whoops\Run;
+use Whoops\Util\Misc;
+use function is_int;
 
+/**
+ * Class Errors
+ * @package Grav\Common\Errors
+ */
 class Errors
 {
+    /**
+     * @return void
+     */
     public function resetHandlers()
     {
         $grav = Grav::instance();
@@ -22,7 +34,7 @@ public function resetHandlers()
 
         // Setup Whoops-based error handler
         $system = new SystemFacade;
-        $whoops = new Whoops\Run($system);
+        $whoops = new Run($system);
 
         $verbosity = 1;
 
@@ -36,30 +48,30 @@ public function resetHandlers()
 
         switch ($verbosity) {
             case 1:
-                $error_page = new Whoops\Handler\PrettyPageHandler;
+                $error_page = new PrettyPageHandler();
                 $error_page->setPageTitle('Crikey! There was an error...');
                 $error_page->addResourcePath(GRAV_ROOT . '/system/assets');
                 $error_page->addCustomCss('whoops.css');
-                $whoops->pushHandler($error_page);
+                $whoops->prependHandler($error_page);
                 break;
             case -1:
-                $whoops->pushHandler(new BareHandler);
+                $whoops->prependHandler(new BareHandler);
                 break;
             default:
-                $whoops->pushHandler(new SimplePageHandler);
+                $whoops->prependHandler(new SimplePageHandler);
                 break;
         }
 
-        if (Whoops\Util\Misc::isAjaxRequest() || $jsonRequest) {
-            $whoops->pushHandler(new Whoops\Handler\JsonResponseHandler);
+        if ($jsonRequest || Misc::isAjaxRequest()) {
+            $whoops->prependHandler(new JsonResponseHandler());
         }
 
         if (isset($config['log']) && $config['log']) {
             $logger = $grav['log'];
-            $whoops->pushHandler(function($exception, $inspector, $run) use ($logger) {
+            $whoops->pushHandler(function ($exception, $inspector, $run) use ($logger) {
                 try {
                     $logger->addCritical($exception->getMessage() . ' - Trace: ' . $exception->getTraceAsString());
-                } catch (\Exception $e) {
+                } catch (Exception $e) {
                     echo $e;
                 }
             });
diff --git a/system/src/Grav/Common/Errors/SimplePageHandler.php b/system/src/Grav/Common/Errors/SimplePageHandler.php
index 311d722442..80c4f96769 100644
--- a/system/src/Grav/Common/Errors/SimplePageHandler.php
+++ b/system/src/Grav/Common/Errors/SimplePageHandler.php
@@ -3,20 +3,29 @@
 /**
  * @package    Grav\Common\Errors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Errors;
 
+use ErrorException;
+use InvalidArgumentException;
+use RuntimeException;
 use Whoops\Handler\Handler;
 use Whoops\Util\Misc;
 use Whoops\Util\TemplateHelper;
 
+/**
+ * Class SimplePageHandler
+ * @package Grav\Common\Errors
+ */
 class SimplePageHandler extends Handler
 {
-    private $searchPaths = array();
-    private $resourceCache = array();
+    /** @var array */
+    private $searchPaths = [];
+    /** @var array */
+    private $resourceCache = [];
 
     public function __construct()
     {
@@ -25,7 +34,7 @@ public function __construct()
     }
 
     /**
-     * @return int|null
+     * @return int
      */
     public function handle()
     {
@@ -36,13 +45,12 @@ public function handle()
         $cssFile      = $this->getResource('error.css');
 
         $code = $inspector->getException()->getCode();
-        if ( ($code >= 400) && ($code < 600) )
-        {
-            $this->getRun()->sendHttpCode($code);    
+        if (($code >= 400) && ($code < 600)) {
+            $this->getRun()->sendHttpCode($code);
         }
         $message = $inspector->getException()->getMessage();
 
-        if ($inspector->getException() instanceof \ErrorException) {
+        if ($inspector->getException() instanceof ErrorException) {
             $code = Misc::translateErrorCode($code);
         }
 
@@ -60,9 +68,8 @@ public function handle()
 
     /**
      * @param string $resource
-     *
      * @return string
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     protected function getResource($resource)
     {
@@ -85,15 +92,19 @@ protected function getResource($resource)
         }
 
         // If we got this far, nothing was found.
-        throw new \RuntimeException(
+        throw new RuntimeException(
             "Could not find resource '{$resource}' in any resource paths (searched: " . implode(', ', $this->searchPaths). ')'
         );
     }
 
+    /**
+     * @param string $path
+     * @return void
+     */
     public function addResourcePath($path)
     {
         if (!is_dir($path)) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 "'{$path}' is not a valid directory"
             );
         }
@@ -101,6 +112,9 @@ public function addResourcePath($path)
         array_unshift($this->searchPaths, $path);
     }
 
+    /**
+     * @return array
+     */
     public function getResourcePaths()
     {
         return $this->searchPaths;
diff --git a/system/src/Grav/Common/Errors/SystemFacade.php b/system/src/Grav/Common/Errors/SystemFacade.php
index 02ef0cf8c3..e13b0f6e79 100644
--- a/system/src/Grav/Common/Errors/SystemFacade.php
+++ b/system/src/Grav/Common/Errors/SystemFacade.php
@@ -3,19 +3,23 @@
 /**
  * @package    Grav\Common\Errors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Errors;
 
+/**
+ * Class SystemFacade
+ * @package Grav\Common\Errors
+ */
 class SystemFacade extends \Whoops\Util\SystemFacade
 {
+    /** @var callable */
     protected $whoopsShutdownHandler;
 
     /**
      * @param callable $function
-     *
      * @return void
      */
     public function registerShutdownFunction(callable $function)
@@ -26,6 +30,8 @@ public function registerShutdownFunction(callable $function)
 
     /**
      * Special case to deal with Fatal errors and the like.
+     *
+     * @return void
      */
     public function handleShutdown()
     {
@@ -37,4 +43,25 @@ public function handleShutdown()
             $handler();
         }
     }
+
+
+    /**
+     * @param int $httpCode
+     *
+     * @return int
+     */
+    public function setHttpResponseCode($httpCode)
+    {
+        if (!headers_sent()) {
+            // Ensure that no 'location' header is present as otherwise this
+            // will override the HTTP code being set here, and mask the
+            // expected error page.
+            header_remove('location');
+
+            // Work around PHP bug #8218 (8.0.17 & 8.1.4).
+            header_remove('Content-Encoding');
+        }
+
+        return http_response_code($httpCode);
+    }
 }
diff --git a/system/src/Grav/Common/File/CompiledFile.php b/system/src/Grav/Common/File/CompiledFile.php
index f4b1e8d4d7..f7fb767565 100644
--- a/system/src/Grav/Common/File/CompiledFile.php
+++ b/system/src/Grav/Common/File/CompiledFile.php
@@ -3,72 +3,97 @@
 /**
  * @package    Grav\Common\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\File;
 
+use Exception;
+use Grav\Common\Debugger;
+use Grav\Common\Grav;
+use Grav\Common\Utils;
 use RocketTheme\Toolbox\File\PhpFile;
+use RuntimeException;
+use Throwable;
+use function function_exists;
+use function get_class;
 
+/**
+ * Trait CompiledFile
+ * @package Grav\Common\File
+ */
 trait CompiledFile
 {
     /**
      * Get/set parsed file contents.
      *
      * @param mixed $var
-     * @return string
+     * @return array
      */
     public function content($var = null)
     {
         try {
+            $filename = $this->filename;
             // If nothing has been loaded, attempt to get pre-compiled version of the file first.
             if ($var === null && $this->raw === null && $this->content === null) {
-                $key = md5($this->filename);
+                $key = md5($filename);
                 $file = PhpFile::instance(CACHE_DIR . "compiled/files/{$key}{$this->extension}.php");
 
                 $modified = $this->modified();
-
                 if (!$modified) {
-                    return $this->decode($this->raw());
+                    try {
+                        return $this->decode($this->raw());
+                    } catch (Throwable $e) {
+                        // If the compiled file is broken, we can safely ignore the error and continue.
+                    }
                 }
 
                 $class = get_class($this);
 
+                $size = filesize($filename);
                 $cache = $file->exists() ? $file->content() : null;
 
                 // Load real file if cache isn't up to date (or is invalid).
-                if (
-                    !isset($cache['@class'])
+                if (!isset($cache['@class'])
                     || $cache['@class'] !== $class
                     || $cache['modified'] !== $modified
-                    || $cache['filename'] !== $this->filename
+                    || ($cache['size'] ?? null) !== $size
+                    || $cache['filename'] !== $filename
                 ) {
                     // Attempt to lock the file for writing.
                     try {
-                        $file->lock(false);
-                    } catch (\Exception $e) {
-                        // Another process has locked the file; we will check this in a bit.
+                        $locked = $file->lock(false);
+                    } catch (Exception $e) {
+                        $locked = false;
+
+                        /** @var Debugger $debugger */
+                        $debugger = Grav::instance()['debugger'];
+                        $debugger->addMessage(sprintf('%s(): Cannot obtain a lock for compiling cache file for %s: %s', __METHOD__, $this->filename, $e->getMessage()), 'warning');
                     }
 
                     // Decode RAW file into compiled array.
                     $data = (array)$this->decode($this->raw());
                     $cache = [
                         '@class' => $class,
-                        'filename' => $this->filename,
+                        'filename' => $filename,
                         'modified' => $modified,
+                        'size' => $size,
                         'data' => $data
                     ];
 
                     // If compiled file wasn't already locked by another process, save it.
-                    if ($file->locked() !== false) {
+                    if ($locked) {
                         $file->save($cache);
                         $file->unlock();
 
                         // Compile cached file into bytecode cache
-                        if (function_exists('opcache_invalidate')) {
+                        if (function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN)) {
+                            $lockName = $file->filename();
+
                             // Silence error if function exists, but is restricted.
-                            @opcache_invalidate($file->filename(), true);
+                            @opcache_invalidate($lockName, true);
+                            @opcache_compile_file($lockName);
                         }
                     }
                 }
@@ -76,16 +101,76 @@ public function content($var = null)
 
                 $this->content = $cache['data'];
             }
-
-        } catch (\Exception $e) {
-            throw new \RuntimeException(sprintf('Failed to read %s: %s', basename($this->filename), $e->getMessage()), 500, $e);
+        } catch (Exception $e) {
+            throw new RuntimeException(sprintf('Failed to read %s: %s', Utils::basename($filename), $e->getMessage()), 500, $e);
         }
 
         return parent::content($var);
     }
 
+    /**
+     * Save file.
+     *
+     * @param  mixed  $data  Optional data to be saved, usually array.
+     * @return void
+     * @throws RuntimeException
+     */
+    public function save($data = null)
+    {
+        // Make sure that the cache file is always up to date!
+        $key = md5($this->filename);
+        $file = PhpFile::instance(CACHE_DIR . "compiled/files/{$key}{$this->extension}.php");
+        try {
+            $locked = $file->lock();
+        } catch (Exception $e) {
+            $locked = false;
+
+            /** @var Debugger $debugger */
+            $debugger = Grav::instance()['debugger'];
+            $debugger->addMessage(sprintf('%s(): Cannot obtain a lock for compiling cache file for %s: %s', __METHOD__, $this->filename, $e->getMessage()), 'warning');
+        }
+
+        parent::save($data);
+
+        if ($locked) {
+            $modified = $this->modified();
+            $filename = $this->filename;
+            $class = get_class($this);
+            $size = filesize($filename);
+
+            // windows doesn't play nicely with this as it can't read when locked
+            if (!Utils::isWindows()) {
+                // Reload data from the filesystem. This ensures that we always cache the correct data (see issue #2282).
+                $this->raw = $this->content = null;
+                $data = (array)$this->decode($this->raw());
+            }
+
+            // Decode data into compiled array.
+            $cache = [
+                '@class' => $class,
+                'filename' => $filename,
+                'modified' => $modified,
+                'size' => $size,
+                'data' => $data
+            ];
+
+            $file->save($cache);
+            $file->unlock();
+
+            // Compile cached file into bytecode cache
+            if (function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN)) {
+                $lockName = $file->filename();
+                // Silence error if function exists, but is restricted.
+                @opcache_invalidate($lockName, true);
+                @opcache_compile_file($lockName);
+            }
+        }
+    }
+
     /**
      * Serialize file.
+     *
+     * @return array
      */
     public function __sleep()
     {
diff --git a/system/src/Grav/Common/File/CompiledJsonFile.php b/system/src/Grav/Common/File/CompiledJsonFile.php
index d73e817b2d..e8347bb071 100644
--- a/system/src/Grav/Common/File/CompiledJsonFile.php
+++ b/system/src/Grav/Common/File/CompiledJsonFile.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,6 +11,10 @@
 
 use RocketTheme\Toolbox\File\JsonFile;
 
+/**
+ * Class CompiledJsonFile
+ * @package Grav\Common\File
+ */
 class CompiledJsonFile extends JsonFile
 {
     use CompiledFile;
@@ -20,7 +24,7 @@ class CompiledJsonFile extends JsonFile
      *
      * @param string $var
      * @param bool $assoc
-     * @return array mixed
+     * @return array
      */
     protected function decode($var, $assoc = true)
     {
diff --git a/system/src/Grav/Common/File/CompiledMarkdownFile.php b/system/src/Grav/Common/File/CompiledMarkdownFile.php
index 74b282014f..108311177a 100644
--- a/system/src/Grav/Common/File/CompiledMarkdownFile.php
+++ b/system/src/Grav/Common/File/CompiledMarkdownFile.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,6 +11,10 @@
 
 use RocketTheme\Toolbox\File\MarkdownFile;
 
+/**
+ * Class CompiledMarkdownFile
+ * @package Grav\Common\File
+ */
 class CompiledMarkdownFile extends MarkdownFile
 {
     use CompiledFile;
diff --git a/system/src/Grav/Common/File/CompiledYamlFile.php b/system/src/Grav/Common/File/CompiledYamlFile.php
index 2eb1e9838c..0f0c64fd67 100644
--- a/system/src/Grav/Common/File/CompiledYamlFile.php
+++ b/system/src/Grav/Common/File/CompiledYamlFile.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,6 +11,10 @@
 
 use RocketTheme\Toolbox\File\YamlFile;
 
+/**
+ * Class CompiledYamlFile
+ * @package Grav\Common\File
+ */
 class CompiledYamlFile extends YamlFile
 {
     use CompiledFile;
diff --git a/system/src/Grav/Common/Filesystem/Archiver.php b/system/src/Grav/Common/Filesystem/Archiver.php
index 50e40fbeab..4c291a5693 100644
--- a/system/src/Grav/Common/Filesystem/Archiver.php
+++ b/system/src/Grav/Common/Filesystem/Archiver.php
@@ -3,23 +3,37 @@
 /**
  * @package    Grav\Common\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Filesystem;
 
+use FilesystemIterator;
 use Grav\Common\Utils;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use function function_exists;
 
+/**
+ * Class Archiver
+ * @package Grav\Common\Filesystem
+ */
 abstract class Archiver
 {
+    /** @var array */
     protected $options = [
         'exclude_files' => ['.DS_Store'],
         'exclude_paths' => []
     ];
 
+    /** @var string */
     protected $archive_file;
 
+    /**
+     * @param string $compression
+     * @return ZipArchiver
+     */
     public static function create($compression)
     {
         if ($compression === 'zip') {
@@ -29,38 +43,66 @@ public static function create($compression)
         return new ZipArchiver();
     }
 
+    /**
+     * @param string $archive_file
+     * @return $this
+     */
     public function setArchive($archive_file)
     {
         $this->archive_file = $archive_file;
+
         return $this;
     }
 
+    /**
+     * @param array $options
+     * @return $this
+     */
     public function setOptions($options)
     {
         // Set infinite PHP execution time if possible.
-        if (function_exists('set_time_limit') && !Utils::isFunctionDisabled('set_time_limit')) {
-            set_time_limit(0);
+        if (Utils::functionExists('set_time_limit')) {
+            @set_time_limit(0);
         }
 
         $this->options = $options + $this->options;
+
         return $this;
     }
 
-    public abstract function compress($folder, callable $status = null);
-
-    public abstract function extract($destination, callable $status = null);
-
-    public abstract function addEmptyFolders($folders, callable $status = null);
-
+    /**
+     * @param string $folder
+     * @param callable|null $status
+     * @return $this
+     */
+    abstract public function compress($folder, callable $status = null);
+
+    /**
+     * @param string $destination
+     * @param callable|null $status
+     * @return $this
+     */
+    abstract public function extract($destination, callable $status = null);
+
+    /**
+     * @param array $folders
+     * @param callable|null $status
+     * @return $this
+     */
+    abstract public function addEmptyFolders($folders, callable $status = null);
+
+    /**
+     * @param string $rootPath
+     * @return RecursiveIteratorIterator
+     */
     protected function getArchiveFiles($rootPath)
     {
         $exclude_paths = $this->options['exclude_paths'];
         $exclude_files = $this->options['exclude_files'];
-        $dirItr    = new \RecursiveDirectoryIterator($rootPath, \RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS | \FilesystemIterator::UNIX_PATHS);
+        $dirItr    = new RecursiveDirectoryIterator($rootPath, RecursiveDirectoryIterator::SKIP_DOTS | FilesystemIterator::FOLLOW_SYMLINKS | FilesystemIterator::UNIX_PATHS);
         $filterItr = new RecursiveDirectoryFilterIterator($dirItr, $rootPath, $exclude_paths, $exclude_files);
-        $files       = new \RecursiveIteratorIterator($filterItr, \RecursiveIteratorIterator::SELF_FIRST);
+        $files     = new RecursiveIteratorIterator($filterItr, RecursiveIteratorIterator::SELF_FIRST);
 
         return $files;
     }
-
 }
diff --git a/system/src/Grav/Common/Filesystem/Folder.php b/system/src/Grav/Common/Filesystem/Folder.php
index f17410c491..ad49869a8f 100644
--- a/system/src/Grav/Common/Filesystem/Folder.php
+++ b/system/src/Grav/Common/Filesystem/Folder.php
@@ -3,43 +3,62 @@
 /**
  * @package    Grav\Common\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Filesystem;
 
+use DirectoryIterator;
+use Exception;
+use FilesystemIterator;
 use Grav\Common\Grav;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use RegexIterator;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use function count;
+use function dirname;
+use function is_callable;
 
+/**
+ * Class Folder
+ * @package Grav\Common\Filesystem
+ */
 abstract class Folder
 {
     /**
      * Recursively find the last modified time under given path.
      *
-     * @param  string $path
+     * @param array $paths
      * @return int
      */
-    public static function lastModifiedFolder($path)
+    public static function lastModifiedFolder(array $paths): int
     {
         $last_modified = 0;
 
         /** @var UniformResourceLocator $locator */
         $locator = Grav::instance()['locator'];
-        $flags = \RecursiveDirectoryIterator::SKIP_DOTS;
-        if ($locator->isStream($path)) {
-            $directory = $locator->getRecursiveIterator($path, $flags);
-        } else {
-            $directory = new \RecursiveDirectoryIterator($path, $flags);
-        }
-        $filter  = new RecursiveFolderFilterIterator($directory);
-        $iterator = new \RecursiveIteratorIterator($filter, \RecursiveIteratorIterator::SELF_FIRST);
-
-        /** @var \RecursiveDirectoryIterator $file */
-        foreach ($iterator as $dir) {
-            $dir_modified = $dir->getMTime();
-            if ($dir_modified > $last_modified) {
-                $last_modified = $dir_modified;
+        $flags = RecursiveDirectoryIterator::SKIP_DOTS;
+
+        foreach ($paths as $path) {
+            if (!file_exists($path)) {
+                return 0;
+            }
+            if ($locator->isStream($path)) {
+                $directory = $locator->getRecursiveIterator($path, $flags);
+            } else {
+                $directory = new RecursiveDirectoryIterator($path, $flags);
+            }
+            $filter  = new RecursiveFolderFilterIterator($directory);
+            $iterator = new RecursiveIteratorIterator($filter, RecursiveIteratorIterator::SELF_FIRST);
+
+            foreach ($iterator as $dir) {
+                $dir_modified = $dir->getMTime();
+                if ($dir_modified > $last_modified) {
+                    $last_modified = $dir_modified;
+                }
             }
         }
 
@@ -49,35 +68,40 @@ public static function lastModifiedFolder($path)
     /**
      * Recursively find the last modified time under given path by file.
      *
-     * @param string  $path
+     * @param array  $paths
      * @param string  $extensions   which files to search for specifically
-     *
      * @return int
      */
-    public static function lastModifiedFile($path, $extensions = 'md|yaml')
+    public static function lastModifiedFile(array $paths, $extensions = 'md|yaml'): int
     {
         $last_modified = 0;
 
         /** @var UniformResourceLocator $locator */
         $locator = Grav::instance()['locator'];
-        $flags = \RecursiveDirectoryIterator::SKIP_DOTS;
-        if ($locator->isStream($path)) {
-            $directory = $locator->getRecursiveIterator($path, $flags);
-        } else {
-            $directory = new \RecursiveDirectoryIterator($path, $flags);
-        }
-        $recursive = new \RecursiveIteratorIterator($directory, \RecursiveIteratorIterator::SELF_FIRST);
-        $iterator = new \RegexIterator($recursive, '/^.+\.'.$extensions.'$/i');
-
-        /** @var \RecursiveDirectoryIterator $file */
-        foreach ($iterator as $filepath => $file) {
-            try {
-                $file_modified = $file->getMTime();
-                if ($file_modified > $last_modified) {
-                    $last_modified = $file_modified;
+        $flags = RecursiveDirectoryIterator::SKIP_DOTS;
+
+        foreach($paths as $path) {
+            if (!file_exists($path)) {
+                return 0;
+            }
+            if ($locator->isStream($path)) {
+                $directory = $locator->getRecursiveIterator($path, $flags);
+            } else {
+                $directory = new RecursiveDirectoryIterator($path, $flags);
+            }
+            $recursive = new RecursiveIteratorIterator($directory, RecursiveIteratorIterator::SELF_FIRST);
+            $iterator = new RegexIterator($recursive, '/^.+\.'.$extensions.'$/i');
+
+            /** @var RecursiveDirectoryIterator $file */
+            foreach ($iterator as $file) {
+                try {
+                    $file_modified = $file->getMTime();
+                    if ($file_modified > $last_modified) {
+                        $last_modified = $file_modified;
+                    }
+                } catch (Exception $e) {
+                    Grav::instance()['log']->error('Could not process file: ' . $e->getMessage());
                 }
-            } catch (\Exception $e) {
-                Grav::instance()['log']->error('Could not process file: ' . $e->getMessage());
             }
         }
 
@@ -87,26 +111,31 @@ public static function lastModifiedFile($path, $extensions = 'md|yaml')
     /**
      * Recursively md5 hash all files in a path
      *
-     * @param string $path
+     * @param array $paths
      * @return string
      */
-    public static function hashAllFiles($path)
+    public static function hashAllFiles(array $paths): string
     {
-        $flags = \RecursiveDirectoryIterator::SKIP_DOTS;
         $files = [];
 
-        /** @var UniformResourceLocator $locator */
-        $locator = Grav::instance()['locator'];
-        if ($locator->isStream($path)) {
-            $directory = $locator->getRecursiveIterator($path, $flags);
-        } else {
-            $directory = new \RecursiveDirectoryIterator($path, $flags);
-        }
+        foreach ($paths as $path) {
+            if (file_exists($path)) {
+                $flags = RecursiveDirectoryIterator::SKIP_DOTS;
 
-        $iterator = new \RecursiveIteratorIterator($directory, \RecursiveIteratorIterator::SELF_FIRST);
+                /** @var UniformResourceLocator $locator */
+                $locator = Grav::instance()['locator'];
+                if ($locator->isStream($path)) {
+                    $directory = $locator->getRecursiveIterator($path, $flags);
+                } else {
+                    $directory = new RecursiveDirectoryIterator($path, $flags);
+                }
 
-        foreach ($iterator as $file) {
-            $files[] = $file->getPathname() . '?'. $file->getMTime();
+                $iterator = new RecursiveIteratorIterator($directory, RecursiveIteratorIterator::SELF_FIRST);
+
+                foreach ($iterator as $file) {
+                    $files[] = $file->getPathname() . '?'. $file->getMTime();
+                }
+            }
         }
 
         return md5(serialize($files));
@@ -115,9 +144,8 @@ public static function hashAllFiles($path)
     /**
      * Get relative path between target and base path. If path isn't relative, return full path.
      *
-     * @param string       $path
-     * @param mixed|string $base
-     *
+     * @param string $path
+     * @param string $base
      * @return string
      */
     public static function getRelativePath($path, $base = GRAV_ROOT)
@@ -175,7 +203,7 @@ public static function getRelativePathDotDot($path, $base)
      * Shift first directory out of the path.
      *
      * @param string $path
-     * @return string
+     * @return string|null
      */
     public static function shift(&$path)
     {
@@ -192,12 +220,15 @@ public static function shift(&$path)
      * @param  string            $path
      * @param  array             $params
      * @return array
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public static function all($path, array $params = [])
     {
-        if ($path === false) {
-            throw new \RuntimeException("Path doesn't exist.");
+        if (!$path) {
+            throw new RuntimeException("Path doesn't exist.");
+        }
+        if (!file_exists($path)) {
+            return [];
         }
 
         $compare = isset($params['compare']) ? 'get' . $params['compare'] : null;
@@ -213,29 +244,29 @@ public static function all($path, array $params = [])
         /** @var UniformResourceLocator $locator */
         $locator = Grav::instance()['locator'];
         if ($recursive) {
-            $flags = \RecursiveDirectoryIterator::SKIP_DOTS + \FilesystemIterator::UNIX_PATHS
-                + \FilesystemIterator::CURRENT_AS_SELF + \FilesystemIterator::FOLLOW_SYMLINKS;
+            $flags = RecursiveDirectoryIterator::SKIP_DOTS + FilesystemIterator::UNIX_PATHS
+                + FilesystemIterator::CURRENT_AS_SELF + FilesystemIterator::FOLLOW_SYMLINKS;
             if ($locator->isStream($path)) {
                 $directory = $locator->getRecursiveIterator($path, $flags);
             } else {
-                $directory = new \RecursiveDirectoryIterator($path, $flags);
+                $directory = new RecursiveDirectoryIterator($path, $flags);
             }
-            $iterator = new \RecursiveIteratorIterator($directory, \RecursiveIteratorIterator::SELF_FIRST);
+            $iterator = new RecursiveIteratorIterator($directory, RecursiveIteratorIterator::SELF_FIRST);
             $iterator->setMaxDepth(max($levels, -1));
         } else {
             if ($locator->isStream($path)) {
                 $iterator = $locator->getIterator($path);
             } else {
-                $iterator = new \FilesystemIterator($path);
+                $iterator = new FilesystemIterator($path);
             }
         }
 
         $results = [];
 
-        /** @var \RecursiveDirectoryIterator $file */
+        /** @var RecursiveDirectoryIterator $file */
         foreach ($iterator as $file) {
             // Ignore hidden files.
-            if (strpos($file->getFilename(), '.') === 0) {
+            if (strpos($file->getFilename(), '.') === 0 && $file->isFile()) {
                 continue;
             }
             if (!$folders && $file->isDir()) {
@@ -279,8 +310,9 @@ public static function all($path, array $params = [])
      *
      * @param  string $source
      * @param  string $target
-     * @param  string $ignore  Ignore files matching pattern (regular expression).
-     * @throws \RuntimeException
+     * @param  string|null $ignore  Ignore files matching pattern (regular expression).
+     * @return void
+     * @throws RuntimeException
      */
     public static function copy($source, $target, $ignore = null)
     {
@@ -288,7 +320,7 @@ public static function copy($source, $target, $ignore = null)
         $target = rtrim($target, '\\/');
 
         if (!is_dir($source)) {
-            throw new \RuntimeException('Cannot copy non-existing folder.');
+            throw new RuntimeException('Cannot copy non-existing folder.');
         }
 
         // Make sure that path to the target exists before copying.
@@ -318,7 +350,7 @@ public static function copy($source, $target, $ignore = null)
 
         if (!$success) {
             $error = error_get_last();
-            throw new \RuntimeException($error['message'] ?? 'Unknown error');
+            throw new RuntimeException($error['message'] ?? 'Unknown error');
         }
 
         // Make sure that the change will be detected when caching.
@@ -330,13 +362,14 @@ public static function copy($source, $target, $ignore = null)
      *
      * @param  string $source
      * @param  string $target
-     * @throws \RuntimeException
+     * @return void
+     * @throws RuntimeException
      */
     public static function move($source, $target)
     {
         if (!file_exists($source) || !is_dir($source)) {
             // Rename fails if source folder does not exist.
-            throw new \RuntimeException('Cannot move non-existing folder.');
+            throw new RuntimeException('Cannot move non-existing folder.');
         }
 
         // Don't do anything if the source is the same as the new target
@@ -344,9 +377,13 @@ public static function move($source, $target)
             return;
         }
 
+        if (strpos($target, $source . '/') === 0) {
+            throw new RuntimeException('Cannot move folder to itself');
+        }
+
         if (file_exists($target)) {
             // Rename fails if target folder exists.
-            throw new \RuntimeException('Cannot move files to existing folder/file.');
+            throw new RuntimeException('Cannot move files to existing folder/file.');
         }
 
         // Make sure that path to the target exists before moving.
@@ -356,11 +393,7 @@ public static function move($source, $target)
         @rename($source, $target);
 
         // Rename function can fail while still succeeding, so let's check if the folder exists.
-        if (!file_exists($target) || !is_dir($target)) {
-            // In some rare cases rename() creates file, not a folder. Get rid of it.
-            if (file_exists($target)) {
-                @unlink($target);
-            }
+        if (is_dir($source)) {
             // Rename doesn't support moving folders across filesystems. Use copy instead.
             self::copy($source, $target);
             self::delete($source);
@@ -378,7 +411,7 @@ public static function move($source, $target)
      * @param  string $target
      * @param  bool   $include_target
      * @return bool
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public static function delete($target, $include_target = true)
     {
@@ -390,7 +423,8 @@ public static function delete($target, $include_target = true)
 
         if (!$success) {
             $error = error_get_last();
-            throw new \RuntimeException($error['message']);
+
+            throw new RuntimeException($error['message'] ?? 'Unknown error');
         }
 
         // Make sure that the change will be detected when caching.
@@ -405,7 +439,8 @@ public static function delete($target, $include_target = true)
 
     /**
      * @param  string  $folder
-     * @throws \RuntimeException
+     * @return void
+     * @throws RuntimeException
      */
     public static function mkdir($folder)
     {
@@ -414,7 +449,8 @@ public static function mkdir($folder)
 
     /**
      * @param  string  $folder
-     * @throws \RuntimeException
+     * @return void
+     * @throws RuntimeException
      */
     public static function create($folder)
     {
@@ -429,7 +465,7 @@ public static function create($folder)
             // Take yet another look, make sure that the folder doesn't exist.
             clearstatcache(true, $folder);
             if (!@is_dir($folder)) {
-                throw new \RuntimeException(sprintf('Unable to create directory: %s', $folder));
+                throw new RuntimeException(sprintf('Unable to create directory: %s', $folder));
             }
         }
     }
@@ -439,9 +475,8 @@ public static function create($folder)
      *
      * @param string $src
      * @param string $dest
-     *
      * @return bool
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public static function rcopy($src, $dest)
     {
@@ -458,8 +493,7 @@ public static function rcopy($src, $dest)
         }
 
         // Open the source directory to read in files
-        $i = new \DirectoryIterator($src);
-        /** @var \DirectoryIterator $f */
+        $i = new DirectoryIterator($src);
         foreach ($i as $f) {
             if ($f->isFile()) {
                 copy($f->getRealPath(), "{$dest}/" . $f->getFilename());
@@ -472,6 +506,22 @@ public static function rcopy($src, $dest)
         return true;
     }
 
+    /**
+     * Does a directory contain children
+     *
+     * @param string $directory
+     * @return int|false
+     */
+    public static function countChildren($directory)
+    {
+        if (!is_dir($directory)) {
+            return false;
+        }
+        $directories = glob($directory . '/*', GLOB_ONLYDIR);
+
+        return $directories ? count($directories) : false;
+    }
+
     /**
      * @param  string $folder
      * @param  bool   $include_target
@@ -486,7 +536,8 @@ protected static function doDelete($folder, $include_target = true)
         }
 
         // Go through all items in filesystem and recursively remove everything.
-        $files = array_diff(scandir($folder, SCANDIR_SORT_NONE), array('.', '..'));
+        $files = scandir($folder, SCANDIR_SORT_NONE);
+        $files = $files ? array_diff($files, ['.', '..']) : [];
         foreach ($files as $file) {
             $path = "{$folder}/{$file}";
             is_dir($path) ? self::doDelete($path) : @unlink($path);
diff --git a/system/src/Grav/Common/Filesystem/RecursiveDirectoryFilterIterator.php b/system/src/Grav/Common/Filesystem/RecursiveDirectoryFilterIterator.php
index c662fc466e..75c19bcc0f 100644
--- a/system/src/Grav/Common/Filesystem/RecursiveDirectoryFilterIterator.php
+++ b/system/src/Grav/Common/Filesystem/RecursiveDirectoryFilterIterator.php
@@ -3,27 +3,39 @@
 /**
  * @package    Grav\Common\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Filesystem;
 
-class RecursiveDirectoryFilterIterator extends \RecursiveFilterIterator
+use RecursiveFilterIterator;
+use RecursiveIterator;
+use SplFileInfo;
+use function in_array;
+
+/**
+ * Class RecursiveDirectoryFilterIterator
+ * @package Grav\Common\Filesystem
+ */
+class RecursiveDirectoryFilterIterator extends RecursiveFilterIterator
 {
+    /** @var string */
     protected static $root;
+    /** @var array */
     protected static $ignore_folders;
+    /** @var array */
     protected static $ignore_files;
 
     /**
      * Create a RecursiveFilterIterator from a RecursiveIterator
      *
-     * @param \RecursiveIterator $iterator
+     * @param RecursiveIterator $iterator
      * @param string $root
      * @param array $ignore_folders
      * @param array $ignore_files
      */
-    public function __construct(\RecursiveIterator $iterator, $root, $ignore_folders, $ignore_files)
+    public function __construct(RecursiveIterator $iterator, $root, $ignore_folders, $ignore_files)
     {
         parent::__construct($iterator);
 
@@ -39,7 +51,7 @@ public function __construct(\RecursiveIterator $iterator, $root, $ignore_folders
      */
     public function accept()
     {
-        /** @var \SplFileInfo $file */
+        /** @var SplFileInfo $file */
         $file = $this->current();
         $filename = $file->getFilename();
         $relative_filename = str_replace($this::$root . '/', '', $file->getPathname());
@@ -57,6 +69,9 @@ public function accept()
         return false;
     }
 
+    /**
+     * @return RecursiveDirectoryFilterIterator|RecursiveFilterIterator
+     */
     public function getChildren()
     {
         /** @var RecursiveDirectoryFilterIterator $iterator */
diff --git a/system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php b/system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php
index eb493db6a0..12d6c6b0f1 100644
--- a/system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php
+++ b/system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php
@@ -3,25 +3,33 @@
 /**
  * @package    Grav\Common\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Filesystem;
 
 use Grav\Common\Grav;
+use RecursiveIterator;
+use SplFileInfo;
+use function in_array;
 
+/**
+ * Class RecursiveFolderFilterIterator
+ * @package Grav\Common\Filesystem
+ */
 class RecursiveFolderFilterIterator extends \RecursiveFilterIterator
 {
+    /** @var array */
     protected static $ignore_folders;
 
     /**
      * Create a RecursiveFilterIterator from a RecursiveIterator
      *
-     * @param \RecursiveIterator $iterator
+     * @param RecursiveIterator $iterator
      * @param array $ignore_folders
      */
-    public function __construct(\RecursiveIterator $iterator, $ignore_folders = [])
+    public function __construct(RecursiveIterator $iterator, $ignore_folders = [])
     {
         parent::__construct($iterator);
 
@@ -39,7 +47,7 @@ public function __construct(\RecursiveIterator $iterator, $ignore_folders = [])
      */
     public function accept()
     {
-        /** @var \SplFileInfo $current */
+        /** @var SplFileInfo $current */
         $current = $this->current();
 
         return $current->isDir() && !in_array($current->getFilename(), $this::$ignore_folders, true);
diff --git a/system/src/Grav/Common/Filesystem/ZipArchiver.php b/system/src/Grav/Common/Filesystem/ZipArchiver.php
index 91212f7705..4f2a9eed66 100644
--- a/system/src/Grav/Common/Filesystem/ZipArchiver.php
+++ b/system/src/Grav/Common/Filesystem/ZipArchiver.php
@@ -3,52 +3,71 @@
 /**
  * @package    Grav\Common\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Filesystem;
 
+use InvalidArgumentException;
+use RuntimeException;
+use ZipArchive;
+use function extension_loaded;
+use function strlen;
+
+/**
+ * Class ZipArchiver
+ * @package Grav\Common\Filesystem
+ */
 class ZipArchiver extends Archiver
 {
-
+    /**
+     * @param string $destination
+     * @param callable|null $status
+     * @return $this
+     */
     public function extract($destination, callable $status = null)
     {
-        $zip = new \ZipArchive();
+        $zip = new ZipArchive();
         $archive = $zip->open($this->archive_file);
 
         if ($archive === true) {
             Folder::create($destination);
 
             if (!$zip->extractTo($destination)) {
-                throw new \RuntimeException('ZipArchiver: ZIP failed to extract ' . $this->archive_file . ' to ' . $destination);
+                throw new RuntimeException('ZipArchiver: ZIP failed to extract ' . $this->archive_file . ' to ' . $destination);
             }
 
             $zip->close();
+
             return $this;
         }
 
-        throw new \RuntimeException('ZipArchiver: Failed to open ' . $this->archive_file);
+        throw new RuntimeException('ZipArchiver: Failed to open ' . $this->archive_file);
     }
 
+    /**
+     * @param string $source
+     * @param callable|null $status
+     * @return $this
+     */
     public function compress($source, callable $status = null)
     {
         if (!extension_loaded('zip')) {
-            throw new \InvalidArgumentException('ZipArchiver: Zip PHP module not installed...');
+            throw new InvalidArgumentException('ZipArchiver: Zip PHP module not installed...');
         }
 
-        if (!file_exists($source)) {
-            throw new \InvalidArgumentException('ZipArchiver: ' . $source . ' cannot be found...');
+        // Get real path for our folder
+        $rootPath = realpath($source);
+        if (!$rootPath) {
+            throw new InvalidArgumentException('ZipArchiver: ' . $source . ' cannot be found...');
         }
 
-        $zip = new \ZipArchive();
-        if (!$zip->open($this->archive_file, \ZipArchive::CREATE)) {
-            throw new \InvalidArgumentException('ZipArchiver:' . $this->archive_file . ' cannot be created...');
+        $zip = new ZipArchive();
+        if (!$zip->open($this->archive_file, ZipArchive::CREATE)) {
+            throw new InvalidArgumentException('ZipArchiver:' . $this->archive_file . ' cannot be created...');
         }
 
-        // Get real path for our folder
-        $rootPath = realpath($source);
-
         $files = $this->getArchiveFiles($rootPath);
 
         $status && $status([
@@ -81,15 +100,20 @@ public function compress($source, callable $status = null)
         return $this;
     }
 
+    /**
+     * @param array $folders
+     * @param callable|null $status
+     * @return $this
+     */
     public function addEmptyFolders($folders, callable $status = null)
     {
         if (!extension_loaded('zip')) {
-            throw new \InvalidArgumentException('ZipArchiver: Zip PHP module not installed...');
+            throw new InvalidArgumentException('ZipArchiver: Zip PHP module not installed...');
         }
 
-        $zip = new \ZipArchive();
+        $zip = new ZipArchive();
         if (!$zip->open($this->archive_file)) {
-            throw new \InvalidArgumentException('ZipArchiver: ' . $this->archive_file . ' cannot be opened...');
+            throw new InvalidArgumentException('ZipArchiver: ' . $this->archive_file . ' cannot be opened...');
         }
 
         $status && $status([
@@ -97,7 +121,7 @@ public function addEmptyFolders($folders, callable $status = null)
             'message' => 'Adding empty folders...'
         ]);
 
-        foreach($folders as $folder) {
+        foreach ($folders as $folder) {
             $zip->addEmptyDir($folder);
             $status && $status([
                 'type' => 'progress',
diff --git a/system/src/Grav/Common/Flex/FlexCollection.php b/system/src/Grav/Common/Flex/FlexCollection.php
new file mode 100644
index 0000000000..704e21f5e0
--- /dev/null
+++ b/system/src/Grav/Common/Flex/FlexCollection.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex;
+
+use Grav\Common\Flex\Traits\FlexCollectionTrait;
+use Grav\Common\Flex\Traits\FlexGravTrait;
+
+/**
+ * Class FlexCollection
+ *
+ * @package Grav\Common\Flex
+ * @template T of \Grav\Framework\Flex\Interfaces\FlexObjectInterface
+ * @extends \Grav\Framework\Flex\FlexCollection<T>
+ */
+abstract class FlexCollection extends \Grav\Framework\Flex\FlexCollection
+{
+    use FlexGravTrait;
+    use FlexCollectionTrait;
+}
diff --git a/system/src/Grav/Common/Flex/FlexIndex.php b/system/src/Grav/Common/Flex/FlexIndex.php
new file mode 100644
index 0000000000..f903c88b24
--- /dev/null
+++ b/system/src/Grav/Common/Flex/FlexIndex.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex;
+
+use Grav\Common\Flex\Traits\FlexGravTrait;
+use Grav\Common\Flex\Traits\FlexIndexTrait;
+
+/**
+ * Class FlexIndex
+ *
+ * @package Grav\Common\Flex
+ * @template T of \Grav\Framework\Flex\Interfaces\FlexObjectInterface
+ * @template C of \Grav\Framework\Flex\Interfaces\FlexCollectionInterface
+ * @extends \Grav\Framework\Flex\FlexIndex<T,C>
+ */
+abstract class FlexIndex extends \Grav\Framework\Flex\FlexIndex
+{
+    use FlexGravTrait;
+    use FlexIndexTrait;
+}
diff --git a/system/src/Grav/Common/Flex/FlexObject.php b/system/src/Grav/Common/Flex/FlexObject.php
new file mode 100644
index 0000000000..887d7a3f27
--- /dev/null
+++ b/system/src/Grav/Common/Flex/FlexObject.php
@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex;
+
+use Grav\Common\Flex\Traits\FlexGravTrait;
+use Grav\Common\Flex\Traits\FlexObjectTrait;
+use Grav\Common\Media\Interfaces\MediaInterface;
+use Grav\Framework\Flex\Traits\FlexMediaTrait;
+use function is_array;
+
+/**
+ * Class FlexObject
+ *
+ * @package Grav\Common\Flex
+ */
+abstract class FlexObject extends \Grav\Framework\Flex\FlexObject implements MediaInterface
+{
+    use FlexGravTrait;
+    use FlexObjectTrait;
+    use FlexMediaTrait;
+
+    /**
+     * {@inheritdoc}
+     * @see FlexObjectInterface::getFormValue()
+     */
+    public function getFormValue(string $name, $default = null, string $separator = null)
+    {
+        $value = $this->getNestedProperty($name, null, $separator);
+
+        // Handle media order field.
+        if (null === $value && $name === 'media_order') {
+            return implode(',', $this->getMediaOrder());
+        }
+
+        // Handle media fields.
+        $settings = $this->getFieldSettings($name);
+        if (($settings['media_field'] ?? false) === true) {
+            return $this->parseFileProperty($value, $settings);
+        }
+
+        return $value ?? $default;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexObjectInterface::prepareStorage()
+     */
+    public function prepareStorage(): array
+    {
+        // Remove extra content from media fields.
+        $fields = $this->getMediaFields();
+        foreach ($fields as $field) {
+            $data = $this->getNestedProperty($field);
+            if (is_array($data)) {
+                foreach ($data as $name => &$image) {
+                    unset($image['image_url'], $image['thumb_url']);
+                }
+                unset($image);
+                $this->setNestedProperty($field, $data);
+            }
+        }
+
+        return parent::prepareStorage();
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Traits/FlexCollectionTrait.php b/system/src/Grav/Common/Flex/Traits/FlexCollectionTrait.php
new file mode 100644
index 0000000000..b919b40c3a
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Traits/FlexCollectionTrait.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Traits;
+
+use RocketTheme\Toolbox\Event\Event;
+
+/**
+ * Trait FlexCollectionTrait
+ * @package Grav\Common\Flex\Traits
+ */
+trait FlexCollectionTrait
+{
+    use FlexCommonTrait;
+
+    /**
+     * @param string $name
+     * @param object|null $event
+     * @return $this
+     */
+    public function triggerEvent(string $name, $event = null)
+    {
+        if (null === $event) {
+            $event = new Event([
+                'type' => 'flex',
+                'directory' => $this->getFlexDirectory(),
+                'collection' => $this
+            ]);
+        }
+        if (strpos($name, 'onFlexCollection') !== 0 && strpos($name, 'on') === 0) {
+            $name = 'onFlexCollection' . substr($name, 2);
+        }
+
+        $container = $this->getContainer();
+        if ($event instanceof Event) {
+            $container->fireEvent($name, $event);
+        } else {
+            $container->dispatchEvent($event);
+        }
+
+        return $this;
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Traits/FlexCommonTrait.php b/system/src/Grav/Common/Flex/Traits/FlexCommonTrait.php
new file mode 100644
index 0000000000..9291a4257a
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Traits/FlexCommonTrait.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Traits;
+
+use Grav\Common\Debugger;
+use Grav\Common\Grav;
+use Grav\Common\Twig\Twig;
+use Twig\Error\LoaderError;
+use Twig\Error\SyntaxError;
+use Twig\Template;
+use Twig\TemplateWrapper;
+
+/**
+ * Trait FlexCommonTrait
+ * @package Grav\Common\Flex\Traits
+ */
+trait FlexCommonTrait
+{
+    /**
+     * @param string $layout
+     * @return Template|TemplateWrapper
+     * @throws LoaderError
+     * @throws SyntaxError
+     */
+    protected function getTemplate($layout)
+    {
+        $container = $this->getContainer();
+
+        /** @var Twig $twig */
+        $twig = $container['twig'];
+
+        try {
+            return $twig->twig()->resolveTemplate($this->getTemplatePaths($layout));
+        } catch (LoaderError $e) {
+            /** @var Debugger $debugger */
+            $debugger = Grav::instance()['debugger'];
+            $debugger->addException($e);
+
+            return $twig->twig()->resolveTemplate(['flex/404.html.twig']);
+        }
+    }
+
+    abstract protected function getTemplatePaths(string $layout): array;
+    abstract protected function getContainer(): Grav;
+}
diff --git a/system/src/Grav/Common/Flex/Traits/FlexGravTrait.php b/system/src/Grav/Common/Flex/Traits/FlexGravTrait.php
new file mode 100644
index 0000000000..c34b89da97
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Traits/FlexGravTrait.php
@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Traits;
+
+use Grav\Common\Grav;
+use Grav\Common\User\Interfaces\UserInterface;
+use Grav\Framework\Flex\Flex;
+
+/**
+ * Implements Grav specific logic
+ */
+trait FlexGravTrait
+{
+    /**
+     * @return Grav
+     */
+    protected function getContainer(): Grav
+    {
+        return Grav::instance();
+    }
+
+    /**
+     * @return Flex
+     */
+    protected function getFlexContainer(): Flex
+    {
+        $container = $this->getContainer();
+
+        /** @var Flex $flex */
+        $flex = $container['flex'];
+
+        return $flex;
+    }
+
+    /**
+     * @return UserInterface|null
+     */
+    protected function getActiveUser(): ?UserInterface
+    {
+        $container = $this->getContainer();
+
+        /** @var UserInterface|null $user */
+        $user = $container['user'] ?? null;
+
+        return $user;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isAdminSite(): bool
+    {
+        $container = $this->getContainer();
+
+        return isset($container['admin']);
+    }
+
+    /**
+     * @return string
+     */
+    protected function getAuthorizeScope(): string
+    {
+        return $this->isAdminSite() ? 'admin' : 'site';
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Traits/FlexIndexTrait.php b/system/src/Grav/Common/Flex/Traits/FlexIndexTrait.php
new file mode 100644
index 0000000000..a71eb991d6
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Traits/FlexIndexTrait.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Traits;
+
+/**
+ * Trait FlexIndexTrait
+ * @package Grav\Common\Flex\Traits
+ */
+trait FlexIndexTrait
+{
+}
diff --git a/system/src/Grav/Common/Flex/Traits/FlexObjectTrait.php b/system/src/Grav/Common/Flex/Traits/FlexObjectTrait.php
new file mode 100644
index 0000000000..3c81f07e89
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Traits/FlexObjectTrait.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Traits;
+
+use RocketTheme\Toolbox\Event\Event;
+
+/**
+ * Trait FlexObjectTrait
+ * @package Grav\Common\Flex\Traits
+ */
+trait FlexObjectTrait
+{
+    use FlexCommonTrait;
+
+    /**
+     * @param string $name
+     * @param object|null $event
+     * @return $this
+     */
+    public function triggerEvent(string $name, $event = null)
+    {
+        $events = [
+            'onRender' => 'onFlexObjectRender',
+            'onBeforeSave' => 'onFlexObjectBeforeSave',
+            'onAfterSave' => 'onFlexObjectAfterSave',
+            'onBeforeDelete' => 'onFlexObjectBeforeDelete',
+            'onAfterDelete' => 'onFlexObjectAfterDelete'
+        ];
+
+        if (null === $event) {
+            $event = new Event([
+                'type' => 'flex',
+                'directory' => $this->getFlexDirectory(),
+                'object' => $this
+            ]);
+        }
+
+        if (isset($events['name'])) {
+            $name = $events['name'];
+        } elseif (strpos($name, 'onFlexObject') !== 0 && strpos($name, 'on') === 0) {
+            $name = 'onFlexObject' . substr($name, 2);
+        }
+
+        $container = $this->getContainer();
+        if ($event instanceof Event) {
+            $container->fireEvent($name, $event);
+        } else {
+            $container->dispatchEvent($event);
+        }
+
+        return $this;
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Generic/GenericCollection.php b/system/src/Grav/Common/Flex/Types/Generic/GenericCollection.php
new file mode 100644
index 0000000000..e4ec3d459c
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Generic/GenericCollection.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Generic;
+
+use Grav\Common\Flex\FlexCollection;
+
+/**
+ * Class GenericCollection
+ * @package Grav\Common\Flex\Generic
+ *
+ * @extends FlexCollection<GenericObject>
+ */
+class GenericCollection extends FlexCollection
+{
+}
diff --git a/system/src/Grav/Common/Flex/Types/Generic/GenericIndex.php b/system/src/Grav/Common/Flex/Types/Generic/GenericIndex.php
new file mode 100644
index 0000000000..fdba5039c3
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Generic/GenericIndex.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Generic;
+
+use Grav\Common\Flex\FlexIndex;
+
+/**
+ * Class GenericIndex
+ * @package Grav\Common\Flex\Generic
+ *
+ * @extends FlexIndex<GenericObject,GenericCollection>
+ */
+class GenericIndex extends FlexIndex
+{
+}
diff --git a/system/src/Grav/Common/Flex/Types/Generic/GenericObject.php b/system/src/Grav/Common/Flex/Types/Generic/GenericObject.php
new file mode 100644
index 0000000000..eba642be99
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Generic/GenericObject.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Generic;
+
+use Grav\Common\Flex\FlexObject;
+
+/**
+ * Class GenericObject
+ * @package Grav\Common\Flex\Generic
+ */
+class GenericObject extends FlexObject
+{
+}
diff --git a/system/src/Grav/Common/Flex/Types/Pages/PageCollection.php b/system/src/Grav/Common/Flex/Types/Pages/PageCollection.php
new file mode 100644
index 0000000000..b6c5230d8f
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Pages/PageCollection.php
@@ -0,0 +1,839 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Pages;
+
+use Exception;
+use Grav\Common\Flex\Traits\FlexCollectionTrait;
+use Grav\Common\Flex\Traits\FlexGravTrait;
+use Grav\Common\Grav;
+use Grav\Common\Page\Header;
+use Grav\Common\Page\Interfaces\PageCollectionInterface;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\Utils;
+use Grav\Framework\Flex\Pages\FlexPageCollection;
+use Collator;
+use InvalidArgumentException;
+use RuntimeException;
+use function array_search;
+use function count;
+use function extension_loaded;
+use function in_array;
+use function is_array;
+use function is_string;
+
+/**
+ * Class GravPageCollection
+ * @package Grav\Plugin\FlexObjects\Types\GravPages
+ *
+ * @template T as PageObject
+ * @extends FlexPageCollection<T>
+ * @implements PageCollectionInterface<string,T>
+ *
+ * Incompatibilities with Grav\Common\Page\Collection:
+ *     $page = $collection->key()       will not work at all
+ *     $clone = clone $collection       does not clone objects inside the collection, does it matter?
+ *     $string = (string)$collection    returns collection id instead of comma separated list
+ *     $collection->add()               incompatible method signature
+ *     $collection->remove()            incompatible method signature
+ *     $collection->filter()            incompatible method signature (takes closure instead of callable)
+ *     $collection->prev()              does not rewind the internal pointer
+ * AND most methods are immutable; they do not update the current collection, but return updated one
+ *
+ * @method PageIndex getIndex()
+ */
+class PageCollection extends FlexPageCollection implements PageCollectionInterface
+{
+    use FlexGravTrait;
+    use FlexCollectionTrait;
+
+    /** @var array|null */
+    protected $_params;
+
+    /**
+     * @return array
+     */
+    public static function getCachedMethods(): array
+    {
+        return [
+                // Collection specific methods
+                'getRoot' => false,
+                'getParams' => false,
+                'setParams' => false,
+                'params' => false,
+                'addPage' => false,
+                'merge' => false,
+                'intersect' => false,
+                'prev' => false,
+                'nth' => false,
+                'random' => false,
+                'append' => false,
+                'batch' => false,
+                'order' => false,
+
+                // Collection filtering
+                'dateRange' => true,
+                'visible' => true,
+                'nonVisible' => true,
+                'pages' => true,
+                'modules' => true,
+                'modular' => true,
+                'nonModular' => true,
+                'published' => true,
+                'nonPublished' => true,
+                'routable' => true,
+                'nonRoutable' => true,
+                'ofType' => true,
+                'ofOneOfTheseTypes' => true,
+                'ofOneOfTheseAccessLevels' => true,
+                'withOrdered' => true,
+                'withModules' => true,
+                'withPages' => true,
+                'withTranslation' => true,
+                'filterBy' => true,
+
+                'toExtendedArray' => false,
+                'getLevelListing' => false,
+            ] + parent::getCachedMethods();
+    }
+
+    /**
+     * @return PageInterface
+     */
+    public function getRoot()
+    {
+        return $this->getIndex()->getRoot();
+    }
+
+    /**
+     * Get the collection params
+     *
+     * @return array
+     */
+    public function getParams(): array
+    {
+        return $this->_params ?? [];
+    }
+
+    /**
+     * Set parameters to the Collection
+     *
+     * @param array $params
+     * @return $this
+     */
+    public function setParams(array $params)
+    {
+        $this->_params = $this->_params ? array_merge($this->_params, $params) : $params;
+
+        return $this;
+    }
+
+    /**
+     * Get the collection params
+     *
+     * @return array
+     */
+    public function params(): array
+    {
+        return $this->getParams();
+    }
+
+    /**
+     * Add a single page to a collection
+     *
+     * @param PageInterface $page
+     * @return $this
+     */
+    public function addPage(PageInterface $page)
+    {
+        if (!$page instanceof PageObject) {
+            throw new InvalidArgumentException('$page is not a flex page.');
+        }
+
+        // FIXME: support other keys.
+        $this->set($page->getKey(), $page);
+
+        return $this;
+    }
+
+    /**
+     *
+     * Merge another collection with the current collection
+     *
+     * @param PageCollectionInterface $collection
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function merge(PageCollectionInterface $collection)
+    {
+        throw new RuntimeException(__METHOD__ . '(): Not Implemented');
+    }
+
+    /**
+     * Intersect another collection with the current collection
+     *
+     * @param PageCollectionInterface $collection
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function intersect(PageCollectionInterface $collection)
+    {
+        throw new RuntimeException(__METHOD__ . '(): Not Implemented');
+    }
+
+    /**
+     * Set current page.
+     */
+    public function setCurrent(string $path): void
+    {
+        throw new RuntimeException(__METHOD__ . '(): Not Implemented');
+    }
+
+    /**
+     * Return previous item.
+     *
+     * @return PageInterface|false
+     * @phpstan-return T|false
+     */
+    public function prev()
+    {
+        // FIXME: this method does not rewind the internal pointer!
+        $key = (string)$this->key();
+        $prev = $this->prevSibling($key);
+
+        return $prev !== $this->current() ? $prev : false;
+    }
+
+    /**
+     * Return nth item.
+     * @param int $key
+     * @return PageInterface|bool
+     * @phpstan-return T|false
+     */
+    public function nth($key)
+    {
+        return $this->slice($key, 1)[0] ?? false;
+    }
+
+    /**
+     * Pick one or more random entries.
+     *
+     * @param int $num Specifies how many entries should be picked.
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function random($num = 1)
+    {
+        return $this->createFrom($this->shuffle()->slice(0, $num));
+    }
+
+    /**
+     * Append new elements to the list.
+     *
+     * @param array $items Items to be appended. Existing keys will be overridden with the new values.
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function append($items)
+    {
+        throw new RuntimeException(__METHOD__ . '(): Not Implemented');
+    }
+
+    /**
+     * Split collection into array of smaller collections.
+     *
+     * @param int $size
+     * @return static[]
+     * @phpstan-return static<T>[]
+     */
+    public function batch($size): array
+    {
+        $chunks = $this->chunk($size);
+
+        $list = [];
+        foreach ($chunks as $chunk) {
+            $list[] = $this->createFrom($chunk);
+        }
+
+        return $list;
+    }
+
+    /**
+     * Reorder collection.
+     *
+     * @param string $by
+     * @param string $dir
+     * @param array|null  $manual
+     * @param int|null $sort_flags
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function order($by, $dir = 'asc', $manual = null, $sort_flags = null)
+    {
+        if (!$this->count()) {
+            return $this;
+        }
+
+        if ($by === 'random') {
+            return $this->shuffle();
+        }
+
+        $keys = $this->buildSort($by, $dir, $manual, $sort_flags);
+
+        return $this->createFrom(array_replace(array_flip($keys), $this->toArray()) ?? []);
+    }
+
+    /**
+     * @param string $order_by
+     * @param string $order_dir
+     * @param array|null  $manual
+     * @param int|null    $sort_flags
+     * @return array
+     */
+    protected function buildSort($order_by = 'default', $order_dir = 'asc', $manual = null, $sort_flags = null): array
+    {
+        // do this header query work only once
+        $header_query = null;
+        $header_default = null;
+        if (strpos($order_by, 'header.') === 0) {
+            $query = explode('|', str_replace('header.', '', $order_by), 2);
+            $header_query = array_shift($query) ?? '';
+            $header_default = array_shift($query);
+        }
+
+        $list = [];
+        foreach ($this as $key => $child) {
+            switch ($order_by) {
+                case 'title':
+                    $list[$key] = $child->title();
+                    break;
+                case 'date':
+                    $list[$key] = $child->date();
+                    $sort_flags = SORT_REGULAR;
+                    break;
+                case 'modified':
+                    $list[$key] = $child->modified();
+                    $sort_flags = SORT_REGULAR;
+                    break;
+                case 'publish_date':
+                    $list[$key] = $child->publishDate();
+                    $sort_flags = SORT_REGULAR;
+                    break;
+                case 'unpublish_date':
+                    $list[$key] = $child->unpublishDate();
+                    $sort_flags = SORT_REGULAR;
+                    break;
+                case 'slug':
+                    $list[$key] = $child->slug();
+                    break;
+                case 'basename':
+                    $list[$key] = Utils::basename($key);
+                    break;
+                case 'folder':
+                    $list[$key] = $child->folder();
+                    break;
+                case 'manual':
+                case 'default':
+                default:
+                    if (is_string($header_query)) {
+                        /** @var Header $child_header */
+                        $child_header = $child->header();
+                        $header_value = $child_header->get($header_query);
+                        if (is_array($header_value)) {
+                            $list[$key] = implode(',', $header_value);
+                        } elseif ($header_value) {
+                            $list[$key] = $header_value;
+                        } else {
+                            $list[$key] = $header_default ?: $key;
+                        }
+                        $sort_flags = $sort_flags ?: SORT_REGULAR;
+                        break;
+                    }
+                    $list[$key] = $key;
+                    $sort_flags = $sort_flags ?: SORT_REGULAR;
+            }
+        }
+
+        if (null === $sort_flags) {
+            $sort_flags = SORT_NATURAL | SORT_FLAG_CASE;
+        }
+
+        // else just sort the list according to specified key
+        if (extension_loaded('intl') && Grav::instance()['config']->get('system.intl_enabled')) {
+            $locale = setlocale(LC_COLLATE, '0'); //`setlocale` with a '0' param returns the current locale set
+            $col = Collator::create($locale);
+            if ($col) {
+                $col->setAttribute(Collator::NUMERIC_COLLATION, Collator::ON);
+                if (($sort_flags & SORT_NATURAL) === SORT_NATURAL) {
+                    $list = preg_replace_callback('~([0-9]+)\.~', static function ($number) {
+                        return sprintf('%032d.', $number[0]);
+                    }, $list);
+                    if (!is_array($list)) {
+                        throw new RuntimeException('Internal Error');
+                    }
+
+                    $list_vals = array_values($list);
+                    if (is_numeric(array_shift($list_vals))) {
+                        $sort_flags = Collator::SORT_REGULAR;
+                    } else {
+                        $sort_flags = Collator::SORT_STRING;
+                    }
+                }
+
+                $col->asort($list, $sort_flags);
+            } else {
+                asort($list, $sort_flags);
+            }
+        } else {
+            asort($list, $sort_flags);
+        }
+
+        // Move manually ordered items into the beginning of the list. Order of the unlisted items does not change.
+        if (is_array($manual) && !empty($manual)) {
+            $i = count($manual);
+            $new_list = [];
+            foreach ($list as $key => $dummy) {
+                $child = $this[$key] ?? null;
+                $order = $child ? array_search($child->slug, $manual, true) : false;
+                if ($order === false) {
+                    $order = $i++;
+                }
+                $new_list[$key] = (int)$order;
+            }
+
+            $list = $new_list;
+
+            // Apply manual ordering to the list.
+            asort($list, SORT_NUMERIC);
+        }
+
+        if ($order_dir !== 'asc') {
+            $list = array_reverse($list);
+        }
+
+        return array_keys($list);
+    }
+
+    /**
+     * Mimicks Pages class.
+     *
+     * @return $this
+     * @deprecated 1.7 Not needed anymore in Flex Pages (does nothing).
+     */
+    public function all()
+    {
+        return $this;
+    }
+
+    /**
+     * Returns the items between a set of date ranges of either the page date field (default) or
+     * an arbitrary datetime page field where start date and end date are optional
+     * Dates must be passed in as text that strtotime() can process
+     * http://php.net/manual/en/function.strtotime.php
+     *
+     * @param string|null $startDate
+     * @param string|null $endDate
+     * @param string|null $field
+     * @return static
+     * @phpstan-return static<T>
+     * @throws Exception
+     */
+    public function dateRange($startDate = null, $endDate = null, $field = null)
+    {
+        $start = $startDate ? Utils::date2timestamp($startDate) : null;
+        $end = $endDate ? Utils::date2timestamp($endDate) : null;
+
+        $entries = [];
+        foreach ($this as $key => $object) {
+            if (!$object) {
+                continue;
+            }
+
+            $date = $field ? strtotime($object->getNestedProperty($field)) : $object->date();
+
+            if ((!$start || $date >= $start) && (!$end || $date <= $end)) {
+                $entries[$key] = $object;
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * Creates new collection with only visible pages
+     *
+     * @return static The collection with only visible pages
+     * @phpstan-return static<T>
+     */
+    public function visible()
+    {
+        $entries = [];
+        foreach ($this as $key => $object) {
+            if ($object && $object->visible()) {
+                $entries[$key] = $object;
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * Creates new collection with only non-visible pages
+     *
+     * @return static The collection with only non-visible pages
+     * @phpstan-return static<T>
+     */
+    public function nonVisible()
+    {
+        $entries = [];
+        foreach ($this as $key => $object) {
+            if ($object && !$object->visible()) {
+                $entries[$key] = $object;
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * Creates new collection with only pages
+     *
+     * @return static The collection with only pages
+     * @phpstan-return static<T>
+     */
+    public function pages()
+    {
+        $entries = [];
+        /**
+         * @var int|string $key
+         * @var PageInterface|null $object
+         */
+        foreach ($this as $key => $object) {
+            if ($object && !$object->isModule()) {
+                $entries[$key] = $object;
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * Creates new collection with only modules
+     *
+     * @return static The collection with only modules
+     * @phpstan-return static<T>
+     */
+    public function modules()
+    {
+        $entries = [];
+        /**
+         * @var int|string $key
+         * @var PageInterface|null $object
+         */
+        foreach ($this as $key => $object) {
+            if ($object && $object->isModule()) {
+                $entries[$key] = $object;
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * Alias of modules()
+     *
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function modular()
+    {
+        return $this->modules();
+    }
+
+    /**
+     * Alias of pages()
+     *
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function nonModular()
+    {
+        return $this->pages();
+    }
+
+    /**
+     * Creates new collection with only published pages
+     *
+     * @return static The collection with only published pages
+     * @phpstan-return static<T>
+     */
+    public function published()
+    {
+        $entries = [];
+        foreach ($this as $key => $object) {
+            if ($object && $object->published()) {
+                $entries[$key] = $object;
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * Creates new collection with only non-published pages
+     *
+     * @return static The collection with only non-published pages
+     * @phpstan-return static<T>
+     */
+    public function nonPublished()
+    {
+        $entries = [];
+        foreach ($this as $key => $object) {
+            if ($object && !$object->published()) {
+                $entries[$key] = $object;
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * Creates new collection with only routable pages
+     *
+     * @return static The collection with only routable pages
+     * @phpstan-return static<T>
+     */
+    public function routable()
+    {
+        $entries = [];
+        foreach ($this as $key => $object) {
+            if ($object && $object->routable()) {
+                $entries[$key] = $object;
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * Creates new collection with only non-routable pages
+     *
+     * @return static The collection with only non-routable pages
+     * @phpstan-return static<T>
+     */
+    public function nonRoutable()
+    {
+        $entries = [];
+        foreach ($this as $key => $object) {
+            if ($object && !$object->routable()) {
+                $entries[$key] = $object;
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * Creates new collection with only pages of the specified type
+     *
+     * @param string $type
+     * @return static The collection
+     * @phpstan-return static<T>
+     */
+    public function ofType($type)
+    {
+        $entries = [];
+        foreach ($this as $key => $object) {
+            if ($object && $object->template() === $type) {
+                $entries[$key] = $object;
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * Creates new collection with only pages of one of the specified types
+     *
+     * @param string[] $types
+     * @return static The collection
+     * @phpstan-return static<T>
+     */
+    public function ofOneOfTheseTypes($types)
+    {
+        $entries = [];
+        foreach ($this as $key => $object) {
+            if ($object && in_array($object->template(), $types, true)) {
+                $entries[$key] = $object;
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * Creates new collection with only pages of one of the specified access levels
+     *
+     * @param array $accessLevels
+     * @return static The collection
+     * @phpstan-return static<T>
+     */
+    public function ofOneOfTheseAccessLevels($accessLevels)
+    {
+        $entries = [];
+        foreach ($this as $key => $object) {
+            if ($object && isset($object->header()->access)) {
+                if (is_array($object->header()->access)) {
+                    //Multiple values for access
+                    $valid = false;
+
+                    foreach ($object->header()->access as $index => $accessLevel) {
+                        if (is_array($accessLevel)) {
+                            foreach ($accessLevel as $innerIndex => $innerAccessLevel) {
+                                if (in_array($innerAccessLevel, $accessLevels)) {
+                                    $valid = true;
+                                }
+                            }
+                        } else {
+                            if (in_array($index, $accessLevels)) {
+                                $valid = true;
+                            }
+                        }
+                    }
+                    if ($valid) {
+                        $entries[$key] = $object;
+                    }
+                } else {
+                    //Single value for access
+                    if (in_array($object->header()->access, $accessLevels)) {
+                        $entries[$key] = $object;
+                    }
+                }
+            }
+        }
+
+        return $this->createFrom($entries);
+    }
+
+    /**
+     * @param bool $bool
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function withOrdered(bool $bool = true)
+    {
+        $list = array_keys(array_filter($this->call('isOrdered', [$bool])));
+
+        return $this->select($list);
+    }
+
+    /**
+     * @param bool $bool
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function withModules(bool $bool = true)
+    {
+        $list = array_keys(array_filter($this->call('isModule', [$bool])));
+
+        return $this->select($list);
+    }
+
+    /**
+     * @param bool $bool
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function withPages(bool $bool = true)
+    {
+        $list = array_keys(array_filter($this->call('isPage', [$bool])));
+
+        return $this->select($list);
+    }
+
+    /**
+     * @param bool $bool
+     * @param string|null $languageCode
+     * @param bool|null $fallback
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function withTranslation(bool $bool = true, string $languageCode = null, bool $fallback = null)
+    {
+        $list = array_keys(array_filter($this->call('hasTranslation', [$languageCode, $fallback])));
+
+        return $bool ? $this->select($list) : $this->unselect($list);
+    }
+
+    /**
+     * @param string|null $languageCode
+     * @param bool|null $fallback
+     * @return PageIndex
+     */
+    public function withTranslated(string $languageCode = null, bool $fallback = null)
+    {
+        return $this->getIndex()->withTranslated($languageCode, $fallback);
+    }
+
+    /**
+     * Filter pages by given filters.
+     *
+     * - search: string
+     * - page_type: string|string[]
+     * - modular: bool
+     * - visible: bool
+     * - routable: bool
+     * - published: bool
+     * - page: bool
+     * - translated: bool
+     *
+     * @param array $filters
+     * @param bool $recursive
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function filterBy(array $filters, bool $recursive = false)
+    {
+        $list = array_keys(array_filter($this->call('filterBy', [$filters, $recursive])));
+
+        return $this->select($list);
+    }
+
+    /**
+     * Get the extended version of this Collection with each page keyed by route
+     *
+     * @return array
+     * @throws Exception
+     */
+    public function toExtendedArray(): array
+    {
+        $entries  = [];
+        foreach ($this as $key => $object) {
+            if ($object) {
+                $entries[$object->route()] = $object->toArray();
+            }
+        }
+
+        return $entries;
+    }
+
+    /**
+     * @param array $options
+     * @return array
+     */
+    public function getLevelListing(array $options): array
+    {
+        /** @var PageIndex $index */
+        $index = $this->getIndex();
+
+        return method_exists($index, 'getLevelListing') ? $index->getLevelListing($options) : [];
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Pages/PageIndex.php b/system/src/Grav/Common/Flex/Types/Pages/PageIndex.php
new file mode 100644
index 0000000000..f919d432cd
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Pages/PageIndex.php
@@ -0,0 +1,1198 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Pages;
+
+use Exception;
+use Grav\Common\Debugger;
+use Grav\Common\File\CompiledJsonFile;
+use Grav\Common\File\CompiledYamlFile;
+use Grav\Common\Flex\Traits\FlexGravTrait;
+use Grav\Common\Flex\Traits\FlexIndexTrait;
+use Grav\Common\Grav;
+use Grav\Common\Language\Language;
+use Grav\Common\Page\Header;
+use Grav\Common\Page\Interfaces\PageCollectionInterface;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\User\Interfaces\UserInterface;
+use Grav\Common\Utils;
+use Grav\Framework\Flex\FlexDirectory;
+use Grav\Framework\Flex\Interfaces\FlexStorageInterface;
+use Grav\Framework\Flex\Pages\FlexPageIndex;
+use InvalidArgumentException;
+use RuntimeException;
+use function array_slice;
+use function count;
+use function in_array;
+use function is_array;
+use function is_string;
+
+/**
+ * Class GravPageObject
+ * @package Grav\Plugin\FlexObjects\Types\GravPages
+ *
+ * @template T of PageObject
+ * @template C of PageCollection
+ * @extends FlexPageIndex<T,C>
+ * @implements PageCollectionInterface<string,T>
+ *
+ * @method PageIndex withModules(bool $bool = true)
+ * @method PageIndex withPages(bool $bool = true)
+ * @method PageIndex withTranslation(bool $bool = true, string $languageCode = null, bool $fallback = null)
+ */
+class PageIndex extends FlexPageIndex implements PageCollectionInterface
+{
+    use FlexGravTrait;
+    use FlexIndexTrait;
+
+    public const VERSION = parent::VERSION . '.5';
+    public const ORDER_LIST_REGEX = '/(\/\d+)\.[^\/]+/u';
+    public const PAGE_ROUTE_REGEX = '/\/\d+\./u';
+
+    /** @var PageObject|array */
+    protected $_root;
+    /** @var array|null */
+    protected $_params;
+
+    /**
+     * @param array $entries
+     * @param FlexDirectory|null $directory
+     */
+    public function __construct(array $entries = [], FlexDirectory $directory = null)
+    {
+        // Remove root if it's taken.
+        if (isset($entries[''])) {
+            $this->_root = $entries[''];
+            unset($entries['']);
+        }
+
+        parent::__construct($entries, $directory);
+    }
+
+    /**
+     * @param FlexStorageInterface $storage
+     * @return array
+     */
+    public static function loadEntriesFromStorage(FlexStorageInterface $storage): array
+    {
+        // Load saved index.
+        $index = static::loadIndex($storage);
+
+        $version = $index['version'] ?? 0;
+        $force = static::VERSION !== $version;
+
+        // TODO: Following check flex index to be out of sync after some saves, disabled until better solution is found.
+        //$timestamp = $index['timestamp'] ?? 0;
+        //if (!$force && $timestamp && $timestamp > time() - 1) {
+        //    return $index['index'];
+        //}
+
+        // Load up to date index.
+        $entries = parent::loadEntriesFromStorage($storage);
+
+        return static::updateIndexFile($storage, $index['index'], $entries, ['include_missing' => true, 'force_update' => $force]);
+    }
+
+    /**
+     * @param string $key
+     * @return PageObject|null
+     * @phpstan-return T|null
+     */
+    public function get($key)
+    {
+        if (mb_strpos($key, '|') !== false) {
+            [$key, $params] = explode('|', $key, 2);
+        }
+
+        $element = parent::get($key);
+        if (null === $element) {
+            return null;
+        }
+
+        if (isset($params)) {
+            $element = $element->getTranslation(ltrim($params, '.'));
+        }
+
+        \assert(null === $element || $element instanceof PageObject);
+
+        return $element;
+    }
+
+    /**
+     * @return PageInterface
+     */
+    public function getRoot()
+    {
+        $root = $this->_root;
+        if (is_array($root)) {
+            $directory = $this->getFlexDirectory();
+            $storage = $directory->getStorage();
+
+            $defaults = [
+                'header' => [
+                    'routable' => false,
+                    'permissions' => [
+                        'inherit' => false
+                    ]
+                ]
+            ];
+
+            $row = $storage->readRows(['' => null])[''] ?? null;
+            if (null !== $row) {
+                if (isset($row['__ERROR'])) {
+                    /** @var Debugger $debugger */
+                    $debugger = Grav::instance()['debugger'];
+                    $message = sprintf('Flex Pages: root page is broken in storage: %s', $row['__ERROR']);
+
+                    $debugger->addException(new RuntimeException($message));
+                    $debugger->addMessage($message, 'error');
+
+                    $row = ['__META' => $root];
+                }
+
+            } else {
+                $row = ['__META' => $root];
+            }
+
+            $row = array_merge_recursive($defaults, $row);
+
+            /** @var PageObject $root */
+            $root = $this->getFlexDirectory()->createObject($row, '/', false);
+            $root->name('root.md');
+            $root->root(true);
+
+            $this->_root = $root;
+        }
+
+        return $root;
+    }
+
+    /**
+     * @param string|null $languageCode
+     * @param bool|null $fallback
+     * @return static
+     * @phpstan-return static<T,C>
+     */
+    public function withTranslated(string $languageCode = null, bool $fallback = null)
+    {
+        if (null === $languageCode) {
+            return $this;
+        }
+
+        $entries = $this->translateEntries($this->getEntries(), $languageCode, $fallback);
+        $params = ['language' => $languageCode, 'language_fallback' => $fallback] + $this->getParams();
+
+        return $this->createFrom($entries)->setParams($params);
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getLanguage(): ?string
+    {
+        return $this->_params['language'] ?? null;
+    }
+
+    /**
+     * Get the collection params
+     *
+     * @return array
+     */
+    public function getParams(): array
+    {
+        return $this->_params ?? [];
+    }
+
+    /**
+     * Get the collection param
+     *
+     * @param string $name
+     * @return mixed
+     */
+    public function getParam(string $name)
+    {
+        return $this->_params[$name] ?? null;
+    }
+
+    /**
+     * Set parameters to the Collection
+     *
+     * @param array $params
+     * @return $this
+     */
+    public function setParams(array $params)
+    {
+        $this->_params = $this->_params ? array_merge($this->_params, $params) : $params;
+
+        return $this;
+    }
+
+    /**
+     * Set a parameter to the Collection
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return $this
+     */
+    public function setParam(string $name, $value)
+    {
+        $this->_params[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get the collection params
+     *
+     * @return array
+     */
+    public function params(): array
+    {
+        return $this->getParams();
+    }
+
+        /**
+     * {@inheritdoc}
+     * @see FlexCollectionInterface::getCacheKey()
+     */
+    public function getCacheKey(): string
+    {
+        return $this->getTypePrefix() . $this->getFlexType() . '.' . sha1(json_encode($this->getKeys()) . $this->getKeyField() . $this->getLanguage());
+    }
+
+    /**
+     * Filter pages by given filters.
+     *
+     * - search: string
+     * - page_type: string|string[]
+     * - modular: bool
+     * - visible: bool
+     * - routable: bool
+     * - published: bool
+     * - page: bool
+     * - translated: bool
+     *
+     * @param array $filters
+     * @param bool $recursive
+     * @return static
+     * @phpstan-return static<T,C>
+     */
+    public function filterBy(array $filters, bool $recursive = false)
+    {
+        if (!$filters) {
+            return $this;
+        }
+
+        if ($recursive) {
+            return $this->__call('filterBy', [$filters, true]);
+        }
+
+        $list = [];
+        $index = $this;
+        foreach ($filters as $key => $value) {
+            switch ($key) {
+                case 'search':
+                    $index = $index->search((string)$value);
+                    break;
+                case 'page_type':
+                    if (!is_array($value)) {
+                        $value = is_string($value) && $value !== '' ? explode(',', $value) : [];
+                    }
+                    $index = $index->ofOneOfTheseTypes($value);
+                    break;
+                case 'routable':
+                    $index = $index->withRoutable((bool)$value);
+                    break;
+                case 'published':
+                    $index = $index->withPublished((bool)$value);
+                    break;
+                case 'visible':
+                    $index = $index->withVisible((bool)$value);
+                    break;
+                case 'module':
+                    $index = $index->withModules((bool)$value);
+                    break;
+                case 'page':
+                    $index = $index->withPages((bool)$value);
+                    break;
+                case 'folder':
+                    $index = $index->withPages(!$value);
+                    break;
+                case 'translated':
+                    $index = $index->withTranslation((bool)$value);
+                    break;
+                default:
+                    $list[$key] = $value;
+            }
+        }
+
+        return $list ? $index->filterByParent($list) : $index;
+    }
+
+    /**
+     * @param array $filters
+     * @return static
+     * @phpstan-return static<T,C>
+     */
+    protected function filterByParent(array $filters)
+    {
+        /** @var static $index */
+        $index = parent::filterBy($filters);
+
+        return $index;
+    }
+
+    /**
+     * @param array $options
+     * @return array
+     */
+    public function getLevelListing(array $options): array
+    {
+        // Undocumented B/C
+        $order = $options['order'] ?? 'asc';
+        if ($order === SORT_ASC) {
+            $options['order'] = 'asc';
+        } elseif ($order === SORT_DESC) {
+            $options['order'] = 'desc';
+        }
+
+        $options += [
+            'field' => null,
+            'route' => null,
+            'leaf_route' => null,
+            'sortby' => null,
+            'order' => 'asc',
+            'lang' => null,
+            'filters' => [],
+        ];
+
+        $options['filters'] += [
+            'type' => ['root', 'dir'],
+        ];
+
+        $key = 'page.idx.lev.' . sha1(json_encode($options, JSON_THROW_ON_ERROR) . $this->getCacheKey());
+        $checksum = $this->getCacheChecksum();
+
+        $cache = $this->getCache('object');
+
+        /** @var Debugger $debugger */
+        $debugger = Grav::instance()['debugger'];
+
+        $result = null;
+        try {
+            $cached = $cache->get($key);
+            $test = $cached[0] ?? null;
+            $result = $test === $checksum ? ($cached[1] ?? null) : null;
+        } catch (\Psr\SimpleCache\InvalidArgumentException $e) {
+            $debugger->addException($e);
+        }
+
+        try {
+            if (null === $result) {
+                $result = $this->getLevelListingRecurse($options);
+                $cache->set($key, [$checksum, $result]);
+            }
+        } catch (\Psr\SimpleCache\InvalidArgumentException $e) {
+            $debugger->addException($e);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param array $entries
+     * @param string|null $keyField
+     * @return static
+     * @phpstan-return static<T,C>
+     */
+    protected function createFrom(array $entries, string $keyField = null)
+    {
+        /** @var static $index */
+        $index = parent::createFrom($entries, $keyField);
+        $index->_root = $this->getRoot();
+
+        return $index;
+    }
+
+    /**
+     * @param array $entries
+     * @param string $lang
+     * @param bool|null $fallback
+     * @return array
+     */
+    protected function translateEntries(array $entries, string $lang, bool $fallback = null): array
+    {
+        $languages = $this->getFallbackLanguages($lang, $fallback);
+        foreach ($entries as $key => &$entry) {
+            // Find out which version of the page we should load.
+            $translations = $this->getLanguageTemplates((string)$key);
+            if (!$translations) {
+                // No translations found, is this a folder?
+                continue;
+            }
+
+            // Find a translation.
+            $template = null;
+            foreach ($languages as $code) {
+                if (isset($translations[$code])) {
+                    $template = $translations[$code];
+                    break;
+                }
+            }
+
+            // We couldn't find a translation, remove entry from the list.
+            if (!isset($code, $template)) {
+                unset($entries['key']);
+                continue;
+            }
+
+            // Get the main key without template and language.
+            [$main_key,] = explode('|', $entry['storage_key'] . '|', 2);
+
+            // Update storage key and language.
+            $entry['storage_key'] = $main_key . '|' . $template . '.' . $code;
+            $entry['lang'] = $code;
+        }
+        unset($entry);
+
+        return $entries;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getLanguageTemplates(string $key): array
+    {
+        $meta = $this->getMetaData($key);
+        $template = $meta['template'] ?? 'folder';
+        $translations = $meta['markdown'] ?? [];
+        $list = [];
+        foreach ($translations as $code => $search) {
+            if (isset($search[$template])) {
+                // Use main template if possible.
+                $list[$code] = $template;
+            } elseif (!empty($search)) {
+                // Fall back to first matching template.
+                $list[$code] = key($search);
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * @param string|null $languageCode
+     * @param bool|null $fallback
+     * @return array
+     */
+    protected function getFallbackLanguages(string $languageCode = null, bool $fallback = null): array
+    {
+        $fallback = $fallback ?? true;
+        if (!$fallback && null !== $languageCode) {
+            return [$languageCode];
+        }
+
+        $grav = Grav::instance();
+
+        /** @var Language $language */
+        $language = $grav['language'];
+        $languageCode = $languageCode ?? '';
+        if ($languageCode === '' && $fallback) {
+            return $language->getFallbackLanguages(null, true);
+        }
+
+        return $fallback ? $language->getFallbackLanguages($languageCode, true) : [$languageCode];
+    }
+
+    /**
+     * @param array $options
+     * @return array
+     */
+    protected function getLevelListingRecurse(array $options): array
+    {
+        $filters = $options['filters'] ?? [];
+        $field = $options['field'];
+        $route = $options['route'];
+        $leaf_route = $options['leaf_route'];
+        $sortby = $options['sortby'];
+        $order = $options['order'];
+        $language = $options['lang'];
+
+        $status = 'error';
+        $response = [];
+        $extra = null;
+
+        // Handle leaf_route
+        $leaf = null;
+        if ($leaf_route && $route !== $leaf_route) {
+            $nodes = explode('/', $leaf_route);
+            $sub_route =  '/' . implode('/', array_slice($nodes, 1, $options['level']++));
+            $options['route'] = $sub_route;
+
+            [$status,,$leaf,$extra] = $this->getLevelListingRecurse($options);
+        }
+
+        // Handle no route, assume page tree root
+        if (!$route) {
+            $page = $this->getRoot();
+        } else {
+            $page = $this->get(trim($route, '/'));
+        }
+        $path = $page ? $page->path() : null;
+
+        if ($field) {
+            // Get forced filters from the field.
+            $blueprint = $page ? $page->getBlueprint() : $this->getFlexDirectory()->getBlueprint();
+            $settings = $blueprint->schema()->getProperty($field);
+            $filters = array_merge([], $filters, $settings['filters'] ?? []);
+        }
+
+        // Clean up filter.
+        $filter_type = (array)($filters['type'] ?? []);
+        unset($filters['type']);
+        $filters = array_filter($filters, static function($val) { return $val !== null && $val !== ''; });
+
+        if ($page) {
+            $status = 'success';
+            $msg = 'PLUGIN_ADMIN.PAGE_ROUTE_FOUND';
+
+            if ($page->root() && (!$filter_type || in_array('root', $filter_type, true))) {
+                if ($field) {
+                    $response[] = [
+                        'name' => '<root>',
+                        'value' => '/',
+                        'item-key' => '',
+                        'filename' => '.',
+                        'extension' => '',
+                        'type' => 'root',
+                        'modified' => $page->modified(),
+                        'size' => 0,
+                        'symlink' => false,
+                        'has-children' => false
+                    ];
+                } else {
+                    $response[] = [
+                        'item-key' => '-root-',
+                        'icon' => 'root',
+                        'title' => 'Root', // FIXME
+                        'route' => [
+                            'display' => '&lt;root&gt;', // FIXME
+                            'raw' => '_root',
+                        ],
+                        'modified' => $page->modified(),
+                        'extras' => [
+                            'template' => $page->template(),
+                            //'lang' => null,
+                            //'translated' => null,
+                            'langs' => [],
+                            'published' => false,
+                            'visible' => false,
+                            'routable' => false,
+                            'tags' => ['root', 'non-routable'],
+                            'actions' => ['edit'], // FIXME
+                        ]
+                    ];
+                }
+            }
+
+            /** @var PageCollection|PageIndex $children */
+            $children = $page->children();
+            /** @var PageIndex $children */
+            $children = $children->getIndex();
+            $selectedChildren = $children->filterBy($filters + ['language' => $language], true);
+
+            /** @var Header $header */
+            $header = $page->header();
+
+            if (!$field && $header->get('admin.children_display_order', 'collection') === 'collection' && ($orderby = $header->get('content.order.by'))) {
+                // Use custom sorting by page header.
+                $sortby = $orderby;
+                $order = $header->get('content.order.dir', $order);
+                $custom = $header->get('content.order.custom');
+            }
+
+            if ($sortby) {
+                // Sort children.
+                $selectedChildren = $selectedChildren->order($sortby, $order, $custom ?? null);
+            }
+
+            /** @var UserInterface|null $user */
+            $user = Grav::instance()['user'] ?? null;
+
+            /** @var PageObject $child */
+            foreach ($selectedChildren as $child) {
+                $selected = $child->path() === $extra;
+                $includeChildren = is_array($leaf) && !empty($leaf) && $selected;
+                if ($field) {
+                    $child_count = count($child->children());
+                    $payload = [
+                        'name' => $child->menu(),
+                        'value' => $child->rawRoute(),
+                        'item-key' => Utils::basename($child->rawRoute() ?? ''),
+                        'filename' => $child->folder(),
+                        'extension' => $child->extension(),
+                        'type' => 'dir',
+                        'modified' => $child->modified(),
+                        'size' => $child_count,
+                        'symlink' => false,
+                        'has-children' => $child_count > 0
+                    ];
+                } else {
+                    $lang = $child->findTranslation($language) ?? 'n/a';
+                    /** @var PageObject $child */
+                    $child = $child->getTranslation($language) ?? $child;
+
+                    // TODO: all these features are independent from each other, we cannot just have one icon/color to catch all.
+                    // TODO: maybe icon by home/modular/page/folder (or even from blueprints) and color by visibility etc..
+                    if ($child->home()) {
+                        $icon = 'home';
+                    } elseif ($child->isModule()) {
+                        $icon = 'modular';
+                    } elseif ($child->visible()) {
+                        $icon = 'visible';
+                    } elseif ($child->isPage()) {
+                        $icon = 'page';
+                    } else {
+                        // TODO: add support
+                        $icon = 'folder';
+                    }
+                    $tags = [
+                        $child->published() ? 'published' : 'non-published',
+                        $child->visible() ? 'visible' : 'non-visible',
+                        $child->routable() ? 'routable' : 'non-routable'
+                    ];
+                    $extras = [
+                        'template' => $child->template(),
+                        'lang' => $lang ?: null,
+                        'translated' => $lang ? $child->hasTranslation($language, false) : null,
+                        'langs' => $child->getAllLanguages(true) ?: null,
+                        'published' => $child->published(),
+                        'published_date' => $this->jsDate($child->publishDate()),
+                        'unpublished_date' => $this->jsDate($child->unpublishDate()),
+                        'visible' => $child->visible(),
+                        'routable' => $child->routable(),
+                        'tags' => $tags,
+                        'actions' => $this->getListingActions($child, $user),
+                    ];
+                    $extras = array_filter($extras, static function ($v) {
+                        return $v !== null;
+                    });
+
+                    /** @var PageIndex $tmp */
+                    $tmp = $child->children()->getIndex();
+                    $child_count = $tmp->count();
+                    $count = $filters ? $tmp->filterBy($filters, true)->count() : null;
+                    $route = $child->getRoute();
+                    $route = $route ? ($route->toString(false) ?: '/') : '';
+                    $payload = [
+                        'item-key' => htmlspecialchars(Utils::basename($child->rawRoute() ?? $child->getKey())),
+                        'icon' => $icon,
+                        'title' => htmlspecialchars($child->menu()),
+                        'route' => [
+                            'display' => htmlspecialchars($route) ?: null,
+                            'raw' => htmlspecialchars($child->rawRoute()),
+                        ],
+                        'modified' => $this->jsDate($child->modified()),
+                        'child_count' => $child_count ?: null,
+                        'count' => $count ?? null,
+                        'filters_hit' => $filters ? ($child->filterBy($filters, false) ?: null) : null,
+                        'extras' => $extras
+                    ];
+                    $payload = array_filter($payload, static function ($v) {
+                        return $v !== null;
+                    });
+                }
+
+                // Add children if any
+                if ($includeChildren) {
+                    $payload['children'] = array_values($leaf);
+                }
+
+                $response[] = $payload;
+            }
+        } else {
+            $msg = 'PLUGIN_ADMIN.PAGE_ROUTE_NOT_FOUND';
+        }
+
+        if ($field) {
+            $temp_array = [];
+            foreach ($response as $index => $item) {
+                $temp_array[$item['type']][$index] = $item;
+            }
+
+            $sorted = Utils::sortArrayByArray($temp_array, $filter_type);
+            $response = Utils::arrayFlatten($sorted);
+        }
+
+        return [$status, $msg, $response, $path];
+    }
+
+    /**
+     * @param PageObject $object
+     * @param UserInterface $user
+     * @return array
+     */
+    protected function getListingActions(PageObject $object, UserInterface $user): array
+    {
+        $actions = [];
+        if ($object->isAuthorized('read', null, $user)) {
+            $actions[] = 'preview';
+            $actions[] = 'edit';
+        }
+        if ($object->isAuthorized('update', null, $user)) {
+            $actions[] = 'copy';
+            $actions[] = 'move';
+        }
+        if ($object->isAuthorized('delete', null, $user)) {
+            $actions[] = 'delete';
+        }
+
+        return $actions;
+    }
+
+    /**
+     * @param FlexStorageInterface $storage
+     * @return CompiledJsonFile|CompiledYamlFile|null
+     */
+    protected static function getIndexFile(FlexStorageInterface $storage)
+    {
+        if (!method_exists($storage, 'isIndexed') || !$storage->isIndexed()) {
+            return null;
+        }
+
+        // Load saved index file.
+        $grav = Grav::instance();
+        $locator = $grav['locator'];
+
+        $filename = $locator->findResource('user-data://flex/indexes/pages.json', true, true);
+
+        return CompiledJsonFile::instance($filename);
+    }
+
+    /**
+     * @param int|null $timestamp
+     * @return string|null
+     */
+    private function jsDate(int $timestamp = null): ?string
+    {
+        if (!$timestamp) {
+            return null;
+        }
+
+        $config = Grav::instance()['config'];
+        $dateFormat = $config->get('system.pages.dateformat.long');
+
+        return date($dateFormat, $timestamp) ?: null;
+    }
+
+    /**
+     * Add a single page to a collection
+     *
+     * @param PageInterface $page
+     * @return PageCollection
+     * @phpstan-return C
+     */
+    public function addPage(PageInterface $page)
+    {
+        return $this->getCollection()->addPage($page);
+    }
+
+    /**
+     *
+     * Create a copy of this collection
+     *
+     * @return static
+     * @phpstan-return static<T,C>
+     */
+    public function copy()
+    {
+        return clone $this;
+    }
+
+    /**
+     *
+     * Merge another collection with the current collection
+     *
+     * @param PageCollectionInterface $collection
+     * @return PageCollection
+     * @phpstan-return C
+     */
+    public function merge(PageCollectionInterface $collection)
+    {
+        return $this->getCollection()->merge($collection);
+    }
+
+
+    /**
+     * Intersect another collection with the current collection
+     *
+     * @param PageCollectionInterface $collection
+     * @return PageCollection
+     * @phpstan-return C
+     */
+    public function intersect(PageCollectionInterface $collection)
+    {
+        return $this->getCollection()->intersect($collection);
+    }
+
+    /**
+     * Split collection into array of smaller collections.
+     *
+     * @param int $size
+     * @return PageCollection[]
+     * @phpstan-return C[]
+     */
+    public function batch($size)
+    {
+        return $this->getCollection()->batch($size);
+    }
+
+    /**
+     * Remove item from the list.
+     *
+     * @param string $key
+     * @return PageObject|null
+     * @phpstan-return T|null
+     * @throws InvalidArgumentException
+     */
+    public function remove($key)
+    {
+        return $this->getCollection()->remove($key);
+    }
+
+    /**
+     * Reorder collection.
+     *
+     * @param string $by
+     * @param string $dir
+     * @param array  $manual
+     * @param string $sort_flags
+     * @return static
+     * @phpstan-return static<T,C>
+     */
+    public function order($by, $dir = 'asc', $manual = null, $sort_flags = null)
+    {
+        /** @var PageCollectionInterface $collection */
+        $collection = $this->__call('order', [$by, $dir, $manual, $sort_flags]);
+
+        return $collection;
+    }
+
+    /**
+     * Check to see if this item is the first in the collection.
+     *
+     * @param  string $path
+     * @return bool True if item is first.
+     */
+    public function isFirst($path): bool
+    {
+        /** @var bool $result */
+        $result = $this->__call('isFirst', [$path]);
+
+        return $result;
+
+    }
+
+    /**
+     * Check to see if this item is the last in the collection.
+     *
+     * @param  string $path
+     * @return bool True if item is last.
+     */
+    public function isLast($path): bool
+    {
+        /** @var bool $result */
+        $result = $this->__call('isLast', [$path]);
+
+        return $result;
+    }
+
+    /**
+     * Gets the previous sibling based on current position.
+     *
+     * @param  string $path
+     * @return PageObject|null  The previous item.
+     * @phpstan-return T|null
+     */
+    public function prevSibling($path)
+    {
+        /** @var PageObject|null $result */
+        $result = $this->__call('prevSibling', [$path]);
+
+        return $result;
+    }
+
+    /**
+     * Gets the next sibling based on current position.
+     *
+     * @param  string $path
+     * @return PageObject|null The next item.
+     * @phpstan-return T|null
+     */
+    public function nextSibling($path)
+    {
+        /** @var PageObject|null $result */
+        $result = $this->__call('nextSibling', [$path]);
+
+        return $result;
+    }
+
+    /**
+     * Returns the adjacent sibling based on a direction.
+     *
+     * @param  string  $path
+     * @param  int $direction either -1 or +1
+     * @return PageObject|false    The sibling item.
+     * @phpstan-return T|false
+     */
+    public function adjacentSibling($path, $direction = 1)
+    {
+        /** @var PageObject|false $result */
+        $result = $this->__call('adjacentSibling', [$path, $direction]);
+
+        return $result;
+    }
+
+    /**
+     * Returns the item in the current position.
+     *
+     * @param  string $path the path the item
+     * @return int|null The index of the current page, null if not found.
+     */
+    public function currentPosition($path): ?int
+    {
+        /** @var int|null $result */
+        $result = $this->__call('currentPosition', [$path]);
+
+        return $result;
+    }
+
+    /**
+     * Returns the items between a set of date ranges of either the page date field (default) or
+     * an arbitrary datetime page field where start date and end date are optional
+     * Dates must be passed in as text that strtotime() can process
+     * http://php.net/manual/en/function.strtotime.php
+     *
+     * @param string|null $startDate
+     * @param string|null $endDate
+     * @param string|null $field
+     * @return static
+     * @phpstan-return static<T,C>
+     * @throws Exception
+     */
+    public function dateRange($startDate = null, $endDate = null, $field = null)
+    {
+        $collection = $this->__call('dateRange', [$startDate, $endDate, $field]);
+
+        return $collection;
+    }
+
+    /**
+     * Mimicks Pages class.
+     *
+     * @return $this
+     * @deprecated 1.7 Not needed anymore in Flex Pages (does nothing).
+     */
+    public function all()
+    {
+        return $this;
+    }
+
+    /**
+     * Creates new collection with only visible pages
+     *
+     * @return static The collection with only visible pages
+     * @phpstan-return static<T,C>
+     */
+    public function visible()
+    {
+        $collection = $this->__call('visible', []);
+
+        return $collection;
+    }
+
+    /**
+     * Creates new collection with only non-visible pages
+     *
+     * @return static The collection with only non-visible pages
+     * @phpstan-return static<T,C>
+     */
+    public function nonVisible()
+    {
+        $collection = $this->__call('nonVisible', []);
+
+        return $collection;
+    }
+
+    /**
+     * Creates new collection with only non-modular pages
+     *
+     * @return static The collection with only non-modular pages
+     * @phpstan-return static<T,C>
+     */
+    public function pages()
+    {
+        $collection = $this->__call('pages', []);
+
+        return $collection;
+    }
+
+    /**
+     * Creates new collection with only modular pages
+     *
+     * @return static The collection with only modular pages
+     * @phpstan-return static<T,C>
+     */
+    public function modules()
+    {
+        $collection = $this->__call('modules', []);
+
+        return $collection;
+    }
+
+    /**
+     * Creates new collection with only modular pages
+     *
+     * @return static The collection with only modular pages
+     * @phpstan-return static<T,C>
+     */
+    public function modular()
+    {
+        return $this->modules();
+    }
+
+    /**
+     * Creates new collection with only non-modular pages
+     *
+     * @return static The collection with only non-modular pages
+     * @phpstan-return static<T,C>
+     */
+    public function nonModular()
+    {
+        return $this->pages();
+    }
+
+    /**
+     * Creates new collection with only published pages
+     *
+     * @return static The collection with only published pages
+     * @phpstan-return static<T,C>
+     */
+    public function published()
+    {
+        $collection = $this->__call('published', []);
+
+        return $collection;
+    }
+
+    /**
+     * Creates new collection with only non-published pages
+     *
+     * @return static The collection with only non-published pages
+     * @phpstan-return static<T,C>
+     */
+    public function nonPublished()
+    {
+        $collection = $this->__call('nonPublished', []);
+
+        return $collection;
+    }
+
+    /**
+     * Creates new collection with only routable pages
+     *
+     * @return static The collection with only routable pages
+     * @phpstan-return static<T,C>
+     */
+    public function routable()
+    {
+        $collection = $this->__call('routable', []);
+
+        return $collection;
+    }
+
+    /**
+     * Creates new collection with only non-routable pages
+     *
+     * @return static The collection with only non-routable pages
+     * @phpstan-return static<T,C>
+     */
+    public function nonRoutable()
+    {
+        $collection = $this->__call('nonRoutable', []);
+
+        return $collection;
+    }
+
+    /**
+     * Creates new collection with only pages of the specified type
+     *
+     * @param string $type
+     * @return static The collection
+     * @phpstan-return static<T,C>
+     */
+    public function ofType($type)
+    {
+        $collection = $this->__call('ofType', []);
+
+        return $collection;
+    }
+
+    /**
+     * Creates new collection with only pages of one of the specified types
+     *
+     * @param string[] $types
+     * @return static The collection
+     * @phpstan-return static<T,C>
+     */
+    public function ofOneOfTheseTypes($types)
+    {
+        $collection = $this->__call('ofOneOfTheseTypes', []);
+
+        return $collection;
+    }
+
+    /**
+     * Creates new collection with only pages of one of the specified access levels
+     *
+     * @param array $accessLevels
+     * @return static The collection
+     * @phpstan-return static<T,C>
+     */
+    public function ofOneOfTheseAccessLevels($accessLevels)
+    {
+        $collection = $this->__call('ofOneOfTheseAccessLevels', []);
+
+        return $collection;
+    }
+
+    /**
+     * Converts collection into an array.
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return $this->getCollection()->toArray();
+    }
+
+    /**
+     * Get the extended version of this Collection with each page keyed by route
+     *
+     * @return array
+     * @throws Exception
+     */
+    public function toExtendedArray()
+    {
+        return $this->getCollection()->toExtendedArray();
+    }
+
+}
diff --git a/system/src/Grav/Common/Flex/Types/Pages/PageObject.php b/system/src/Grav/Common/Flex/Types/Pages/PageObject.php
new file mode 100644
index 0000000000..6a0afdb84a
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Pages/PageObject.php
@@ -0,0 +1,744 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Pages;
+
+use Grav\Common\Data\Blueprint;
+use Grav\Common\Flex\Traits\FlexGravTrait;
+use Grav\Common\Flex\Traits\FlexObjectTrait;
+use Grav\Common\Grav;
+use Grav\Common\Flex\Types\Pages\Traits\PageContentTrait;
+use Grav\Common\Flex\Types\Pages\Traits\PageLegacyTrait;
+use Grav\Common\Flex\Types\Pages\Traits\PageRoutableTrait;
+use Grav\Common\Flex\Types\Pages\Traits\PageTranslateTrait;
+use Grav\Common\Language\Language;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\Page\Pages;
+use Grav\Common\User\Interfaces\UserInterface;
+use Grav\Common\Utils;
+use Grav\Framework\Filesystem\Filesystem;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use Grav\Framework\Flex\Pages\FlexPageObject;
+use Grav\Framework\Object\ObjectCollection;
+use Grav\Framework\Route\Route;
+use Grav\Framework\Route\RouteFactory;
+use Grav\Plugin\Admin\Admin;
+use RocketTheme\Toolbox\Event\Event;
+use RuntimeException;
+use stdClass;
+use function array_key_exists;
+use function count;
+use function func_get_args;
+use function in_array;
+use function is_array;
+
+/**
+ * Class GravPageObject
+ * @package Grav\Plugin\FlexObjects\Types\GravPages
+ *
+ * @property string $name
+ * @property string $slug
+ * @property string $route
+ * @property string $folder
+ * @property int|false $order
+ * @property string $template
+ * @property string $language
+ */
+class PageObject extends FlexPageObject
+{
+    use FlexGravTrait;
+    use FlexObjectTrait;
+    use PageContentTrait;
+    use PageLegacyTrait;
+    use PageRoutableTrait;
+    use PageTranslateTrait;
+
+    /** @var string Language code, eg: 'en' */
+    protected $language;
+    /** @var string File format, eg. 'md' */
+    protected $format;
+
+    /** @var bool */
+    private $_initialized = false;
+
+    /**
+     * @return array
+     */
+    public static function getCachedMethods(): array
+    {
+        return [
+            'path' => true,
+            'full_order' => true,
+            'filterBy' => true,
+            'translated' => false,
+        ] + parent::getCachedMethods();
+    }
+
+    /**
+     * @return void
+     */
+    public function initialize(): void
+    {
+        if (!$this->_initialized) {
+            Grav::instance()->fireEvent('onPageProcessed', new Event(['page' => $this]));
+            $this->_initialized = true;
+        }
+    }
+
+    /**
+     * @param string|array $query
+     * @return Route|null
+     */
+    public function getRoute($query = []): ?Route
+    {
+        $path = $this->route();
+        if (null === $path) {
+            return null;
+        }
+
+        $route = RouteFactory::createFromString($path);
+        if ($lang = $route->getLanguage()) {
+            $grav = Grav::instance();
+            if (!$grav['config']->get('system.languages.include_default_lang')) {
+                /** @var Language $language */
+                $language = $grav['language'];
+                if ($lang === $language->getDefault()) {
+                    $route = $route->withLanguage('');
+                }
+            }
+        }
+        if (is_array($query)) {
+            foreach ($query as $key => $value) {
+                $route = $route->withQueryParam($key, $value);
+            }
+        } else {
+            $route = $route->withAddedPath($query);
+        }
+
+        return $route;
+    }
+
+    /**
+     * @inheritdoc PageInterface
+     */
+    public function getFormValue(string $name, $default = null, string $separator = null)
+    {
+        $test = new stdClass();
+
+        $value = $this->pageContentValue($name, $test);
+        if ($value !== $test) {
+            return $value;
+        }
+
+        switch ($name) {
+            case 'name':
+                // TODO: this should not be template!
+                return $this->getProperty('template');
+            case 'route':
+                $filesystem = Filesystem::getInstance(false);
+                $key = $filesystem->dirname($this->hasKey() ? '/' . $this->getKey() : '/');
+                return $key !== '/' ? $key : null;
+            case 'full_route':
+                return $this->hasKey() ? '/' . $this->getKey() : '';
+            case 'full_order':
+                return $this->full_order();
+            case 'lang':
+                return $this->getLanguage() ?? '';
+            case 'translations':
+                return $this->getLanguages();
+        }
+
+        return parent::getFormValue($name, $default, $separator);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexObjectInterface::getCacheKey()
+     */
+    public function getCacheKey(): string
+    {
+        $cacheKey = parent::getCacheKey();
+        if ($cacheKey) {
+            /** @var Language $language */
+            $language = Grav::instance()['language'];
+            $cacheKey .= '_' . $language->getActive();
+        }
+
+        return $cacheKey;
+    }
+
+    /**
+     * @param array $variables
+     * @return array
+     */
+    protected function onBeforeSave(array $variables)
+    {
+        $reorder = $variables[0] ?? true;
+
+        $meta = $this->getMetaData();
+        if (($meta['copy'] ?? false) === true) {
+            $this->folder = $this->getKey();
+        }
+
+        // Figure out storage path to the new route.
+        $parentKey = $this->getProperty('parent_key');
+        if ($parentKey !== '') {
+            $parentRoute = $this->getProperty('route');
+
+            // Root page cannot be moved.
+            if ($this->root()) {
+                throw new RuntimeException(sprintf('Root page cannot be moved to %s', $parentRoute));
+            }
+
+            // Make sure page isn't being moved under itself.
+            $key = $this->getStorageKey();
+
+            /** @var PageObject|null $parent */
+            $parent = $parentKey !== false ? $this->getFlexDirectory()->getObject($parentKey, 'storage_key') : null;
+            if (!$parent) {
+                // Page cannot be moved to non-existing location.
+                throw new RuntimeException(sprintf('Page /%s cannot be moved to non-existing path %s', $key, $parentRoute));
+            }
+
+            // TODO: make sure that the page doesn't exist yet if moved/copied.
+        }
+
+        if ($reorder === true && !$this->root()) {
+            $reorder = $this->_reorder;
+        }
+
+        // Force automatic reorder if item is supposed to be added to the last.
+        if (!is_array($reorder) && (int)$this->order() >= 999999) {
+            $reorder = [];
+        }
+
+        // Reorder siblings.
+        $siblings = is_array($reorder) ? ($this->reorderSiblings($reorder) ?? []) : [];
+
+        $data = $this->prepareStorage();
+        unset($data['header']);
+
+        foreach ($siblings as $sibling) {
+            $data = $sibling->prepareStorage();
+            unset($data['header']);
+        }
+
+        return ['reorder' => $reorder, 'siblings' => $siblings];
+    }
+
+    /**
+     * @param array $variables
+     * @return array
+     */
+    protected function onSave(array $variables): array
+    {
+        /** @var PageCollection $siblings */
+        $siblings = $variables['siblings'];
+        /** @var PageObject $sibling */
+        foreach ($siblings as $sibling) {
+            $sibling->save(false);
+        }
+
+        return $variables;
+    }
+
+    /**
+     * @param array $variables
+     */
+    protected function onAfterSave(array $variables): void
+    {
+        $this->getFlexDirectory()->reloadIndex();
+    }
+
+    /**
+     * @param UserInterface|null $user
+     */
+    public function check(UserInterface $user = null): void
+    {
+        parent::check($user);
+
+        if ($user && $this->isMoved()) {
+            $parentKey = $this->getProperty('parent_key');
+
+            /** @var PageObject|null $parent */
+            $parent = $this->getFlexDirectory()->getObject($parentKey, 'storage_key');
+            if (!$parent || !$parent->isAuthorized('create', null, $user)) {
+                throw new \RuntimeException('Forbidden', 403);
+            }
+        }
+    }
+
+    /**
+     * @param array|bool $reorder
+     * @return static
+     */
+    public function save($reorder = true)
+    {
+        $variables = $this->onBeforeSave(func_get_args());
+
+        // Backwards compatibility with older plugins.
+        $fireEvents = $reorder && $this->isAdminSite() && $this->getFlexDirectory()->getConfig('object.compat.events', true);
+        $grav = $this->getContainer();
+        if ($fireEvents) {
+            $self = $this;
+            $grav->fireEvent('onAdminSave', new Event(['type' => 'flex', 'directory' => $this->getFlexDirectory(), 'object' => &$self]));
+            if ($self !== $this) {
+                throw new RuntimeException('Switching Flex Page object during onAdminSave event is not supported! Please update plugin.');
+            }
+        }
+
+        /** @var static $instance */
+        $instance = parent::save();
+        $variables = $this->onSave($variables);
+
+        $this->onAfterSave($variables);
+
+        // Backwards compatibility with older plugins.
+        if ($fireEvents) {
+            $grav->fireEvent('onAdminAfterSave', new Event(['type' => 'flex', 'directory' => $this->getFlexDirectory(), 'object' => $this]));
+        }
+
+        // Reset original after save events have all been called.
+        $this->_originalObject = null;
+
+        return $instance;
+    }
+
+    /**
+     * @return static
+     */
+    public function delete()
+    {
+        $result = parent::delete();
+
+        // Backwards compatibility with older plugins.
+        $fireEvents = $this->isAdminSite() && $this->getFlexDirectory()->getConfig('object.compat.events', true);
+        if ($fireEvents) {
+            $this->getContainer()->fireEvent('onAdminAfterDelete', new Event(['object' => $this]));
+        }
+
+        return $result;
+    }
+
+    /**
+     * Prepare move page to new location. Moves also everything that's under the current page.
+     *
+     * You need to call $this->save() in order to perform the move.
+     *
+     * @param PageInterface $parent New parent page.
+     * @return $this
+     */
+    public function move(PageInterface $parent)
+    {
+        if (!$parent instanceof FlexObjectInterface) {
+            throw new RuntimeException('Failed: Parent is not Flex Object');
+        }
+
+        $this->_reorder = [];
+        $this->setProperty('parent_key', $parent->getStorageKey());
+        $this->storeOriginal();
+
+        return $this;
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param string $action
+     * @param string $scope
+     * @param bool $isMe
+     * @return bool|null
+     */
+    protected function isAuthorizedOverride(UserInterface $user, string $action, string $scope, bool $isMe): ?bool
+    {
+        // Special case: creating a new page means checking parent for its permissions.
+        if ($action === 'create' && !$this->exists()) {
+            $parent = $this->parent();
+            if ($parent && method_exists($parent, 'isAuthorized')) {
+                return $parent->isAuthorized($action, $scope, $user);
+            }
+
+            return false;
+        }
+
+        return parent::isAuthorizedOverride($user, $action, $scope, $isMe);
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isMoved(): bool
+    {
+        $storageKey = $this->getMasterKey();
+        $filesystem = Filesystem::getInstance(false);
+        $oldParentKey = ltrim($filesystem->dirname("/{$storageKey}"), '/');
+        $newParentKey = $this->getProperty('parent_key');
+
+        return $this->exists() && $oldParentKey !== $newParentKey;
+    }
+
+    /**
+     * @param array $ordering
+     * @return PageCollection|null
+     * @phpstan-return ObjectCollection<string,PageObject>|null
+     */
+    protected function reorderSiblings(array $ordering)
+    {
+        $storageKey = $this->getMasterKey();
+        $isMoved = $this->isMoved();
+        $order = !$isMoved ? $this->order() : false;
+        if ($order !== false) {
+            $order = (int)$order;
+        }
+
+        $parent = $this->parent();
+        if (!$parent) {
+            throw new RuntimeException('Cannot reorder a page which has no parent');
+        }
+
+        /** @var PageCollection $siblings */
+        $siblings = $parent->children();
+        $siblings = $siblings->getCollection()->withOrdered();
+
+        // Handle special case where ordering isn't given.
+        if ($ordering === []) {
+            if ($order >= 999999) {
+                // Set ordering to point to be the last item, ignoring the object itself.
+                $order = 0;
+                foreach ($siblings as $sibling) {
+                    if ($sibling->getKey() !== $this->getKey()) {
+                        $order = max($order, (int)$sibling->order());
+                    }
+                }
+                $this->order($order + 1);
+            }
+
+            // Do not change sibling ordering.
+            return null;
+        }
+
+        $siblings = $siblings->orderBy(['order' => 'ASC']);
+
+        if ($storageKey !== null) {
+            if ($order !== false) {
+                // Add current page back to the list if it's ordered.
+                $siblings->set($storageKey, $this);
+            } else {
+                // Remove old copy of the current page from the siblings list.
+                $siblings->remove($storageKey);
+            }
+        }
+
+        // Add missing siblings into the end of the list, keeping the previous ordering between them.
+        foreach ($siblings as $sibling) {
+            $folder = (string)$sibling->getProperty('folder');
+            $basename = preg_replace('|^\d+\.|', '', $folder);
+            if (!in_array($basename, $ordering, true)) {
+                $ordering[] = $basename;
+            }
+        }
+
+        // Reorder.
+        $ordering = array_flip(array_values($ordering));
+        $count = count($ordering);
+        foreach ($siblings as $sibling) {
+            $folder = (string)$sibling->getProperty('folder');
+            $basename = preg_replace('|^\d+\.|', '', $folder);
+            $newOrder = $ordering[$basename] ?? null;
+            $newOrder = null !== $newOrder ? $newOrder + 1 : (int)$sibling->order() + $count;
+            $sibling->order($newOrder);
+        }
+
+        $siblings = $siblings->orderBy(['order' => 'ASC']);
+        $siblings->removeElement($this);
+
+        // If menu item was moved, just make it to be the last in order.
+        if ($isMoved && $this->order() !== false) {
+            $parentKey = $this->getProperty('parent_key');
+            if ($parentKey === '') {
+                /** @var PageIndex $index */
+                $index = $this->getFlexDirectory()->getIndex();
+                $newParent = $index->getRoot();
+            } else {
+                $newParent = $this->getFlexDirectory()->getObject($parentKey, 'storage_key');
+                if (!$newParent instanceof PageInterface) {
+                    throw new RuntimeException("New parent page '{$parentKey}' not found.");
+                }
+            }
+            /** @var PageCollection $newSiblings */
+            $newSiblings = $newParent->children();
+            $newSiblings = $newSiblings->getCollection()->withOrdered();
+            $order = 0;
+            foreach ($newSiblings as $sibling) {
+                $order = max($order, (int)$sibling->order());
+            }
+            $this->order($order + 1);
+        }
+
+        return $siblings;
+    }
+
+    /**
+     * @return string
+     */
+    public function full_order(): string
+    {
+        $route = $this->path() . '/' . $this->folder();
+
+        return preg_replace(PageIndex::ORDER_LIST_REGEX, '\\1', $route) ?? $route;
+    }
+
+    /**
+     * @param string $name
+     * @return Blueprint
+     */
+    protected function doGetBlueprint(string $name = ''): Blueprint
+    {
+        try {
+            // Make sure that pages has been initialized.
+            Pages::getTypes();
+
+            // TODO: We need to move raw blueprint logic to Grav itself to remove admin dependency here.
+            if ($name === 'raw') {
+                // Admin RAW mode.
+                if ($this->isAdminSite()) {
+                    /** @var Admin $admin */
+                    $admin = Grav::instance()['admin'];
+
+                    $template = $this->isModule() ? 'modular_raw' : ($this->root() ? 'root_raw' : 'raw');
+
+                    return $admin->blueprints("admin/pages/{$template}");
+                }
+            }
+
+            $template = $this->getProperty('template') . ($name ? '.' . $name : '');
+
+            $blueprint = $this->getFlexDirectory()->getBlueprint($template, 'blueprints://pages');
+        } catch (RuntimeException $e) {
+            $template = 'default' . ($name ? '.' . $name : '');
+
+            $blueprint = $this->getFlexDirectory()->getBlueprint($template, 'blueprints://pages');
+        }
+
+        $isNew = $blueprint->get('initialized', false) === false;
+        if ($isNew === true && $name === '') {
+            // Support onBlueprintCreated event just like in Pages::blueprints($template)
+            $blueprint->set('initialized', true);
+            $blueprint->setFilename($template);
+
+            Grav::instance()->fireEvent('onBlueprintCreated', new Event(['blueprint' => $blueprint, 'type' => $template]));
+        }
+
+        return $blueprint;
+    }
+
+    /**
+     * @param array $options
+     * @return array
+     */
+    public function getLevelListing(array $options): array
+    {
+        $index = $this->getFlexDirectory()->getIndex();
+        if (!is_callable([$index, 'getLevelListing'])) {
+            return [];
+        }
+
+        // Deal with relative paths.
+        $initial = $options['initial'] ?? null;
+        $var = $initial ? 'leaf_route' : 'route';
+        $route = $options[$var] ?? '';
+        if ($route !== '' && !str_starts_with($route, '/')) {
+            $filesystem = Filesystem::getInstance();
+
+            $route = "/{$this->getKey()}/{$route}";
+            $route = $filesystem->normalize($route);
+
+            $options[$var] = $route;
+        }
+
+        [$status, $message, $response,] = $index->getLevelListing($options);
+
+        return [$status, $message, $response, $options[$var] ?? null];
+    }
+
+    /**
+     * Filter page (true/false) by given filters.
+     *
+     * - search: string
+     * - extension: string
+     * - module: bool
+     * - visible: bool
+     * - routable: bool
+     * - published: bool
+     * - page: bool
+     * - translated: bool
+     *
+     * @param array $filters
+     * @param bool $recursive
+     * @return bool
+     */
+    public function filterBy(array $filters, bool $recursive = false): bool
+    {
+        $language = $filters['language'] ?? null;
+        if (null !== $language) {
+            /** @var PageObject $test */
+            $test = $this->getTranslation($language) ?? $this;
+        } else {
+            $test = $this;
+        }
+
+        foreach ($filters as $key => $value) {
+            switch ($key) {
+                case 'search':
+                    $matches = $test->search((string)$value) > 0.0;
+                    break;
+                case 'page_type':
+                    $types = $value ? explode(',', $value) : [];
+                    $matches = in_array($test->template(), $types, true);
+                    break;
+                case 'extension':
+                    $matches = Utils::contains((string)$value, $test->extension());
+                    break;
+                case 'routable':
+                    $matches = $test->isRoutable() === (bool)$value;
+                    break;
+                case 'published':
+                    $matches = $test->isPublished() === (bool)$value;
+                    break;
+                case 'visible':
+                    $matches = $test->isVisible() === (bool)$value;
+                    break;
+                case 'module':
+                    $matches = $test->isModule() === (bool)$value;
+                    break;
+                case 'page':
+                    $matches = $test->isPage() === (bool)$value;
+                    break;
+                case 'folder':
+                    $matches = $test->isPage() === !$value;
+                    break;
+                case 'translated':
+                    $matches = $test->hasTranslation() === (bool)$value;
+                    break;
+                default:
+                    $matches = true;
+                    break;
+            }
+
+            // If current filter does not match, we still may have match as a parent.
+            if ($matches === false) {
+                if (!$recursive) {
+                    return false;
+                }
+
+                /** @var PageIndex $index */
+                $index = $this->children()->getIndex();
+
+                return $index->filterBy($filters, true)->count() > 0;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexObjectInterface::exists()
+     */
+    public function exists(): bool
+    {
+        return $this->root ?: parent::exists();
+    }
+
+    /**
+     * @return array
+     */
+    public function __debugInfo(): array
+    {
+        $list = parent::__debugInfo();
+
+        return $list + [
+            '_content_meta:private' => $this->getContentMeta(),
+            '_content:private' => $this->getRawContent()
+        ];
+    }
+
+    /**
+     * @param array $elements
+     * @param bool $extended
+     */
+    protected function filterElements(array &$elements, bool $extended = false): void
+    {
+        // Change parent page if needed.
+        if (array_key_exists('route', $elements) && isset($elements['folder'], $elements['name'])) {
+            $elements['template'] = $elements['name'];
+
+            // Figure out storage path to the new route.
+            $parentKey = trim($elements['route'] ?? '', '/');
+            if ($parentKey !== '') {
+                /** @var PageObject|null $parent */
+                $parent = $this->getFlexDirectory()->getObject($parentKey);
+                $parentKey = $parent ? $parent->getStorageKey() : $parentKey;
+            }
+
+            $elements['parent_key'] = $parentKey;
+        }
+
+        // Deal with ordering=bool and order=page1,page2,page3.
+        if ($this->root()) {
+            // Root page doesn't have ordering.
+            unset($elements['ordering'], $elements['order']);
+        } elseif (array_key_exists('ordering', $elements) && array_key_exists('order', $elements)) {
+            // Store ordering.
+            $ordering = $elements['order'] ?? null;
+            $this->_reorder = !empty($ordering) ? explode(',', $ordering) : [];
+
+            $order = false;
+            if ((bool)($elements['ordering'] ?? false)) {
+                $order = $this->order();
+                if ($order === false) {
+                    $order = 999999;
+                }
+            }
+
+            $elements['order'] = $order;
+        }
+
+        parent::filterElements($elements, true);
+    }
+
+    /**
+     * @return array
+     */
+    public function prepareStorage(): array
+    {
+        $meta = $this->getMetaData();
+        $oldLang = $meta['lang'] ?? '';
+        $newLang = $this->getProperty('lang') ?? '';
+
+        // Always clone the page to the new language.
+        if ($oldLang !== $newLang) {
+            $meta['clone'] = true;
+        }
+
+        // Make sure that certain elements are always sent to the storage layer.
+        $elements = [
+            '__META' => $meta,
+            'storage_key' => $this->getStorageKey(),
+            'parent_key' => $this->getProperty('parent_key'),
+            'order' => $this->getProperty('order'),
+            'folder' => preg_replace('|^\d+\.|', '', $this->getProperty('folder') ?? ''),
+            'template' => preg_replace('|modular/|', '', $this->getProperty('template') ?? ''),
+            'lang' => $newLang
+        ] + parent::prepareStorage();
+
+        return $elements;
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Pages/Storage/PageStorage.php b/system/src/Grav/Common/Flex/Types/Pages/Storage/PageStorage.php
new file mode 100644
index 0000000000..f590e36614
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Pages/Storage/PageStorage.php
@@ -0,0 +1,700 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Pages\Storage;
+
+use FilesystemIterator;
+use Grav\Common\Debugger;
+use Grav\Common\Flex\Types\Pages\PageIndex;
+use Grav\Common\Grav;
+use Grav\Common\Language\Language;
+use Grav\Common\Utils;
+use Grav\Framework\Filesystem\Filesystem;
+use Grav\Framework\Flex\Storage\FolderStorage;
+use RocketTheme\Toolbox\File\MarkdownFile;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use SplFileInfo;
+use function in_array;
+use function is_string;
+
+/**
+ * Class GravPageStorage
+ * @package Grav\Plugin\FlexObjects\Types\GravPages
+ */
+class PageStorage extends FolderStorage
+{
+    /** @var bool */
+    protected $ignore_hidden;
+    /** @var array */
+    protected $ignore_files;
+    /** @var array */
+    protected $ignore_folders;
+    /** @var bool */
+    protected $include_default_lang_file_extension;
+    /** @var bool */
+    protected $recurse;
+    /** @var string */
+    protected $base_path;
+
+    /** @var int */
+    protected $flags;
+    /** @var string */
+    protected $regex;
+
+    /**
+     * @param array $options
+     */
+    protected function initOptions(array $options): void
+    {
+        parent::initOptions($options);
+
+        $this->flags = FilesystemIterator::KEY_AS_FILENAME | FilesystemIterator::CURRENT_AS_FILEINFO
+            | FilesystemIterator::SKIP_DOTS | FilesystemIterator::UNIX_PATHS;
+
+        $grav = Grav::instance();
+
+        $config = $grav['config'];
+        $this->ignore_hidden = (bool)$config->get('system.pages.ignore_hidden');
+        $this->ignore_files = (array)$config->get('system.pages.ignore_files');
+        $this->ignore_folders = (array)$config->get('system.pages.ignore_folders');
+        $this->include_default_lang_file_extension = (bool)$config->get('system.languages.include_default_lang_file_extension', true);
+        $this->recurse = (bool)($options['recurse'] ?? true);
+        $this->regex = '/(\.([\w\d_-]+))?\.md$/D';
+    }
+
+    /**
+     * @param string $key
+     * @param bool $variations
+     * @return array
+     */
+    public function parseKey(string $key, bool $variations = true): array
+    {
+        if (mb_strpos($key, '|') !== false) {
+            [$key, $params] = explode('|', $key, 2);
+        } else {
+            $params = '';
+        }
+        $key = ltrim($key, '/');
+
+        $keys = parent::parseKey($key, false) + ['params' => $params];
+
+        if ($variations) {
+            $keys += $this->parseParams($key, $params);
+        }
+
+        return $keys;
+    }
+
+    /**
+     * @param string $key
+     * @return string
+     */
+    public function readFrontmatter(string $key): string
+    {
+        $path = $this->getPathFromKey($key);
+        $file = $this->getFile($path);
+        try {
+            if ($file instanceof MarkdownFile) {
+                $frontmatter = $file->frontmatter();
+            } else {
+                $frontmatter = $file->raw();
+            }
+        } catch (RuntimeException $e) {
+            $frontmatter = 'ERROR: ' . $e->getMessage();
+        } finally {
+            $file->free();
+            unset($file);
+        }
+
+        return $frontmatter;
+    }
+
+    /**
+     * @param string $key
+     * @return string
+     */
+    public function readRaw(string $key): string
+    {
+        $path = $this->getPathFromKey($key);
+        $file = $this->getFile($path);
+        try {
+            $raw = $file->raw();
+        } catch (RuntimeException $e) {
+            $raw = 'ERROR: ' . $e->getMessage();
+        } finally {
+            $file->free();
+            unset($file);
+        }
+
+        return $raw;
+    }
+
+    /**
+     * @param array $keys
+     * @param bool $includeParams
+     * @return string
+     */
+    public function buildStorageKey(array $keys, bool $includeParams = true): string
+    {
+        $key = $keys['key'] ?? null;
+        if (null === $key) {
+            $key = $keys['parent_key'] ?? '';
+            if ($key !== '') {
+                $key .= '/';
+            }
+            $order = $keys['order'] ?? null;
+            $folder = $keys['folder'] ?? 'undefined';
+            $key .= is_numeric($order) ? sprintf('%02d.%s', $order, $folder) : $folder;
+        }
+
+        $params = $includeParams ? $this->buildStorageKeyParams($keys) : '';
+
+        return $params ? "{$key}|{$params}" : $key;
+    }
+
+    /**
+     * @param array $keys
+     * @return string
+     */
+    public function buildStorageKeyParams(array $keys): string
+    {
+        $params = $keys['template'] ?? '';
+        $language = $keys['lang'] ?? '';
+        if ($language) {
+            $params .= '.' . $language;
+        }
+
+        return $params;
+    }
+
+    /**
+     * @param array $keys
+     * @return string
+     */
+    public function buildFolder(array $keys): string
+    {
+        return $this->dataFolder . '/' . $this->buildStorageKey($keys, false);
+    }
+
+    /**
+     * @param array $keys
+     * @return string
+     */
+    public function buildFilename(array $keys): string
+    {
+        $file = $this->buildStorageKeyParams($keys);
+
+        // Template is optional; if it is missing, we need to have to load the object metadata.
+        if ($file && $file[0] === '.') {
+            $meta = $this->getObjectMeta($this->buildStorageKey($keys, false));
+            $file = ($meta['template'] ?? 'folder') . $file;
+        }
+
+        return $file . $this->dataExt;
+    }
+
+    /**
+     * @param array $keys
+     * @return string
+     */
+    public function buildFilepath(array $keys): string
+    {
+        $folder = $this->buildFolder($keys);
+        $filename = $this->buildFilename($keys);
+
+        return rtrim($folder, '/') !== $folder ? $folder . $filename : $folder . '/' . $filename;
+    }
+
+    /**
+     * @param array $row
+     * @param bool $setDefaultLang
+     * @return array
+     */
+    public function extractKeysFromRow(array $row, bool $setDefaultLang = true): array
+    {
+        $meta = $row['__META'] ?? null;
+        $storageKey = $row['storage_key'] ?? $meta['storage_key']  ?? '';
+        $keyMeta = $storageKey !== '' ? $this->extractKeysFromStorageKey($storageKey) : null;
+        $parentKey = $row['parent_key'] ?? $meta['parent_key'] ?? $keyMeta['parent_key'] ?? '';
+        $order = $row['order'] ?? $meta['order'] ?? $keyMeta['order'] ?? null;
+        $folder = $row['folder'] ?? $meta['folder']  ?? $keyMeta['folder'] ?? '';
+        $template = $row['template'] ?? $meta['template'] ?? $keyMeta['template'] ?? '';
+        $lang = $row['lang'] ?? $meta['lang'] ?? $keyMeta['lang'] ?? '';
+
+        // Handle default language, if it should be saved without language extension.
+        if ($setDefaultLang && empty($meta['markdown'][$lang])) {
+            $grav = Grav::instance();
+
+            /** @var Language $language */
+            $language = $grav['language'];
+            $default = $language->getDefault();
+            // Make sure that the default language file doesn't exist before overriding it.
+            if (empty($meta['markdown'][$default])) {
+                if ($this->include_default_lang_file_extension) {
+                    if ($lang === '') {
+                        $lang = $language->getDefault();
+                    }
+                } elseif ($lang === $language->getDefault()) {
+                    $lang = '';
+                }
+            }
+        }
+
+        $keys = [
+            'key' => null,
+            'params' => null,
+            'parent_key' => $parentKey,
+            'order' => is_numeric($order) ? (int)$order : null,
+            'folder' => $folder,
+            'template' => $template,
+            'lang' => $lang
+        ];
+
+        $keys['key'] = $this->buildStorageKey($keys, false);
+        $keys['params'] = $this->buildStorageKeyParams($keys);
+
+        return $keys;
+    }
+
+    /**
+     * @param string $key
+     * @return array
+     */
+    public function extractKeysFromStorageKey(string $key): array
+    {
+        if (mb_strpos($key, '|') !== false) {
+            [$key, $params] = explode('|', $key, 2);
+            [$template, $language] = mb_strpos($params, '.') !== false ? explode('.', $params, 2) : [$params, ''];
+        } else {
+            $params = $template = $language = '';
+        }
+        $objectKey = Utils::basename($key);
+        if (preg_match('|^(\d+)\.(.+)$|', $objectKey, $matches)) {
+            [, $order, $folder] = $matches;
+        } else {
+            [$order, $folder] = ['', $objectKey];
+        }
+
+        $filesystem = Filesystem::getInstance(false);
+
+        $parentKey = ltrim($filesystem->dirname('/' . $key), '/');
+
+        return [
+            'key' => $key,
+            'params' => $params,
+            'parent_key' => $parentKey,
+            'order' => is_numeric($order) ? (int)$order : null,
+            'folder' => $folder,
+            'template' => $template,
+            'lang' => $language
+        ];
+    }
+
+    /**
+     * @param string $key
+     * @param string $params
+     * @return array
+     */
+    protected function parseParams(string $key, string $params): array
+    {
+        if (mb_strpos($params, '.') !== false) {
+            [$template, $language] = explode('.', $params, 2);
+        } else {
+            $template = $params;
+            $language = '';
+        }
+
+        if ($template === '') {
+            $meta = $this->getObjectMeta($key);
+            $template = $meta['template'] ?? 'folder';
+        }
+
+        return [
+            'file' => $template . ($language ? '.' . $language : ''),
+            'template' => $template,
+            'lang' => $language
+        ];
+    }
+
+    /**
+     * Prepares the row for saving and returns the storage key for the record.
+     *
+     * @param array $row
+     */
+    protected function prepareRow(array &$row): void
+    {
+        // Remove keys used in the filesystem.
+        unset($row['parent_key'], $row['order'], $row['folder'], $row['template'], $row['lang']);
+    }
+
+    /**
+     * @param string $key
+     * @return array
+     */
+    protected function loadRow(string $key): ?array
+    {
+        $data = parent::loadRow($key);
+
+        // Special case for root page.
+        if ($key === '' && null !== $data) {
+            $data['root'] = true;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Page storage supports moving and copying the pages and their languages.
+     *
+     * $row['__META']['copy'] = true       Use this if you want to copy the whole folder, otherwise it will be moved
+     * $row['__META']['clone'] = true      Use this if you want to clone the file, otherwise it will be renamed
+     *
+     * @param string $key
+     * @param array $row
+     * @return array
+     */
+    protected function saveRow(string $key, array $row): array
+    {
+        // Initialize all key-related variables.
+        $newKeys = $this->extractKeysFromRow($row);
+        $newKey = $this->buildStorageKey($newKeys);
+        $newFolder = $this->buildFolder($newKeys);
+        $newFilename = $this->buildFilename($newKeys);
+        $newFilepath = rtrim($newFolder, '/') !== $newFolder ? $newFolder . $newFilename : $newFolder . '/' . $newFilename;
+
+        try {
+            if ($key === '' && empty($row['root'])) {
+                throw new RuntimeException('Page has no path');
+            }
+
+            $grav = Grav::instance();
+
+            /** @var Debugger $debugger */
+            $debugger = $grav['debugger'];
+            $debugger->addMessage("Save page: {$newKey}", 'debug');
+
+            // Check if the row already exists.
+            $oldKey = $row['__META']['storage_key'] ?? null;
+            if (is_string($oldKey)) {
+                // Initialize all old key-related variables.
+                $oldKeys = $this->extractKeysFromRow(['__META' => $row['__META']], false);
+                $oldFolder = $this->buildFolder($oldKeys);
+                $oldFilename = $this->buildFilename($oldKeys);
+
+                // Check if folder has changed.
+                if ($oldFolder !== $newFolder && file_exists($oldFolder)) {
+                    $isCopy = $row['__META']['copy'] ?? false;
+                    if ($isCopy) {
+                        if (strpos($newFolder, $oldFolder . '/') === 0) {
+                            throw new RuntimeException(sprintf('Page /%s cannot be copied to itself', $oldKey));
+                        }
+
+                        $this->copyRow($oldKey, $newKey);
+                        $debugger->addMessage("Page copied: {$oldFolder} => {$newFolder}", 'debug');
+                    } else {
+                        if (strpos($newFolder, $oldFolder . '/') === 0) {
+                            throw new RuntimeException(sprintf('Page /%s cannot be moved to itself', $oldKey));
+                        }
+
+                        $this->renameRow($oldKey, $newKey);
+                        $debugger->addMessage("Page moved: {$oldFolder} => {$newFolder}", 'debug');
+                    }
+                }
+
+                // Check if filename has changed.
+                if ($oldFilename !== $newFilename) {
+                    // Get instance of the old file (we have already copied/moved it).
+                    $oldFilepath = "{$newFolder}/{$oldFilename}";
+                    $file = $this->getFile($oldFilepath);
+
+                    // Rename the file if we aren't supposed to clone it.
+                    $isClone = $row['__META']['clone'] ?? false;
+                    if (!$isClone && $file->exists()) {
+                        /** @var UniformResourceLocator $locator */
+                        $locator = $grav['locator'];
+                        $toPath = $locator->isStream($newFilepath) ? $locator->findResource($newFilepath, true, true) : GRAV_ROOT . "/{$newFilepath}";
+                        $success = $file->rename($toPath);
+                        if (!$success) {
+                            throw new RuntimeException("Changing page template failed: {$oldFilepath} => {$newFilepath}");
+                        }
+                        $debugger->addMessage("Page template changed: {$oldFilename} => {$newFilename}", 'debug');
+                    } else {
+                        $file = null;
+                        $debugger->addMessage("Page template created: {$newFilename}", 'debug');
+                    }
+                }
+            }
+
+            // Clean up the data to be saved.
+            $this->prepareRow($row);
+            unset($row['__META'], $row['__ERROR']);
+
+            if (!isset($file)) {
+                $file = $this->getFile($newFilepath);
+            }
+
+            // Compare existing file content to the new one and save the file only if content has been changed.
+            $file->free();
+            $oldRaw = $file->raw();
+            $file->content($row);
+            $newRaw = $file->raw();
+            if ($oldRaw !== $newRaw) {
+                $file->save($row);
+                $debugger->addMessage("Page content saved: {$newFilepath}", 'debug');
+            } else {
+                $debugger->addMessage('Page content has not been changed, do not update the file', 'debug');
+            }
+        } catch (RuntimeException $e) {
+            $name = isset($file) ? $file->filename() : $newKey;
+
+            throw new RuntimeException(sprintf('Flex saveRow(%s): %s', $name, $e->getMessage()));
+        } finally {
+            /** @var UniformResourceLocator $locator */
+            $locator = Grav::instance()['locator'];
+            $locator->clearCache();
+
+            if (isset($file)) {
+                $file->free();
+                unset($file);
+            }
+        }
+
+        $row['__META'] = $this->getObjectMeta($newKey, true);
+
+        return $row;
+    }
+
+    /**
+     * Check if page folder should be deleted.
+     *
+     * Deleting page can be done either by deleting everything or just a single language.
+     * If key contains the language, delete only it, unless it is the last language.
+     *
+     * @param string $key
+     * @return bool
+     */
+    protected function canDeleteFolder(string $key): bool
+    {
+        // Return true if there's no language in the key.
+        $keys = $this->extractKeysFromStorageKey($key);
+        if (!$keys['lang']) {
+            return true;
+        }
+
+        // Get the main key and reload meta.
+        $key = $this->buildStorageKey($keys);
+        $meta = $this->getObjectMeta($key, true);
+
+        // Return true if there aren't any markdown files left.
+        return empty($meta['markdown'] ?? []);
+    }
+
+    /**
+     * Get key from the filesystem path.
+     *
+     * @param  string $path
+     * @return string
+     */
+    protected function getKeyFromPath(string $path): string
+    {
+        if ($this->base_path) {
+            $path = $this->base_path . '/' . $path;
+        }
+
+        return $path;
+    }
+
+    /**
+     * Returns list of all stored keys in [key => timestamp] pairs.
+     *
+     * @return array
+     */
+    protected function buildIndex(): array
+    {
+        $this->clearCache();
+
+        return $this->getIndexMeta();
+    }
+
+    /**
+     * @param string $key
+     * @param bool $reload
+     * @return array
+     */
+    protected function getObjectMeta(string $key, bool $reload = false): array
+    {
+        $keys = $this->extractKeysFromStorageKey($key);
+        $key = $keys['key'];
+
+        if ($reload || !isset($this->meta[$key])) {
+            /** @var UniformResourceLocator $locator */
+            $locator = Grav::instance()['locator'];
+            if (mb_strpos($key, '@@') === false) {
+                $path = $this->getStoragePath($key);
+                if (is_string($path)) {
+                    $path = $locator->isStream($path) ? $locator->findResource($path) : GRAV_ROOT . "/{$path}";
+                } else {
+                    $path = null;
+                }
+            } else {
+                $path = null;
+            }
+
+            $modified = 0;
+            $markdown = [];
+            $children = [];
+
+            if (is_string($path) && is_dir($path)) {
+                $modified = filemtime($path);
+                $iterator = new FilesystemIterator($path, $this->flags);
+
+                /** @var SplFileInfo $info */
+                foreach ($iterator as $k => $info) {
+                    // Ignore all hidden files if set.
+                    if ($k === '' || ($this->ignore_hidden && $k[0] === '.')) {
+                        continue;
+                    }
+
+                    if ($info->isDir()) {
+                        // Ignore all folders in ignore list.
+                        if ($this->ignore_folders && in_array($k, $this->ignore_folders, true)) {
+                            continue;
+                        }
+
+                        $children[$k] = false;
+                    } else {
+                        // Ignore all files in ignore list.
+                        if ($this->ignore_files && in_array($k, $this->ignore_files, true)) {
+                            continue;
+                        }
+
+                        $timestamp = $info->getMTime();
+
+                        // Page is the one that matches to $page_extensions list with the lowest index number.
+                        if (preg_match($this->regex, $k, $matches)) {
+                            $mark = $matches[2] ?? '';
+                            $ext = $matches[1] ?? '';
+                            $ext .= $this->dataExt;
+                            $markdown[$mark][Utils::basename($k, $ext)] = $timestamp;
+                        }
+
+                        $modified = max($modified, $timestamp);
+                    }
+                }
+            }
+
+            $rawRoute = trim(preg_replace(PageIndex::PAGE_ROUTE_REGEX, '/', "/{$key}") ?? '', '/');
+            $route = PageIndex::normalizeRoute($rawRoute);
+
+            ksort($markdown, SORT_NATURAL | SORT_FLAG_CASE);
+            ksort($children, SORT_NATURAL | SORT_FLAG_CASE);
+
+            $file = array_key_first($markdown[''] ?? (reset($markdown) ?: []));
+
+            $meta = [
+                'key' => $route,
+                'storage_key' => $key,
+                'template' => $file,
+                'storage_timestamp' => $modified,
+            ];
+            if ($markdown) {
+                $meta['markdown'] = $markdown;
+            }
+            if ($children) {
+                $meta['children'] = $children;
+            }
+            $meta['checksum'] = md5(json_encode($meta) ?: '');
+
+            // Cache meta as copy.
+            $this->meta[$key] = $meta;
+        } else {
+            $meta = $this->meta[$key];
+        }
+
+        $params = $keys['params'];
+        if ($params) {
+            $language = $keys['lang'];
+            $template = $keys['template'] ?: array_key_first($meta['markdown'][$language]) ?? $meta['template'];
+            $meta['exists'] = ($template && !empty($meta['children'])) || isset($meta['markdown'][$language][$template]);
+            $meta['storage_key'] .= '|' . $params;
+            $meta['template'] = $template;
+            $meta['lang'] = $language;
+        }
+
+        return $meta;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getIndexMeta(): array
+    {
+        $queue = [''];
+        $list = [];
+        do {
+            $current = array_pop($queue);
+            if ($current === null) {
+                break;
+            }
+
+            $meta = $this->getObjectMeta($current);
+            $storage_key = $meta['storage_key'];
+
+            if (!empty($meta['children'])) {
+                $prefix = $storage_key . ($storage_key !== '' ? '/' : '');
+
+                foreach ($meta['children'] as $child => $value) {
+                    $queue[] = $prefix . $child;
+                }
+            }
+
+            $list[$storage_key] = $meta;
+        } while ($queue);
+
+        ksort($list, SORT_NATURAL | SORT_FLAG_CASE);
+
+        // Update parent timestamps.
+        foreach (array_reverse($list) as $storage_key => $meta) {
+            if ($storage_key !== '') {
+                $filesystem = Filesystem::getInstance(false);
+
+                $storage_key = (string)$storage_key;
+                $parentKey = $filesystem->dirname($storage_key);
+                if ($parentKey === '.') {
+                    $parentKey = '';
+                }
+
+                /** @phpstan-var array{'storage_key': string, 'storage_timestamp': int, 'children': array<string, mixed>} $parent */
+                $parent = &$list[$parentKey];
+                $basename = Utils::basename($storage_key);
+
+                if (isset($parent['children'][$basename])) {
+                    $timestamp = $meta['storage_timestamp'];
+                    $parent['children'][$basename] = $timestamp;
+                    if ($basename && $basename[0] === '_') {
+                        $parent['storage_timestamp'] = max($parent['storage_timestamp'], $timestamp);
+                    }
+                }
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getNewKey(): string
+    {
+        throw new RuntimeException('Generating random key is disabled for pages');
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Pages/Traits/PageContentTrait.php b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageContentTrait.php
new file mode 100644
index 0000000000..9a2c7c3389
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageContentTrait.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Pages\Traits;
+
+use Grav\Common\Utils;
+
+/**
+ * Implements PageContentInterface.
+ */
+trait PageContentTrait
+{
+    /**
+     * @inheritdoc
+     */
+    public function id($var = null): string
+    {
+        $property = 'id';
+        $value = null === $var ? $this->getProperty($property) : null;
+        if (null === $value) {
+            $value = $this->language() . ($var ?? ($this->modified() . md5($this->filePath() ?? $this->getKey())));
+
+            $this->setProperty($property, $value);
+            if ($this->doHasProperty($property)) {
+                $value = $this->getProperty($property);
+            }
+        }
+
+        return $value;
+    }
+
+
+    /**
+     * @inheritdoc
+     */
+    public function date($var = null): int
+    {
+        return $this->loadHeaderProperty(
+            'date',
+            $var,
+            function ($value) {
+                $value = $value ? Utils::date2timestamp($value, $this->getProperty('dateformat')) : false;
+
+                if (!$value) {
+                    // Get the specific translation updated date.
+                    $meta = $this->getMetaData();
+                    $language = $meta['lang'] ?? '';
+                    $template = $this->getProperty('template');
+                    $value = $meta['markdown'][$language][$template] ?? 0;
+                }
+
+                return $value ?: $this->modified();
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     * @param bool $bool
+     */
+    public function isPage(bool $bool = true): bool
+    {
+        $meta = $this->getMetaData();
+
+        return empty($meta['markdown']) !== $bool;
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Pages/Traits/PageLegacyTrait.php b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageLegacyTrait.php
new file mode 100644
index 0000000000..98f3949247
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageLegacyTrait.php
@@ -0,0 +1,236 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Pages\Traits;
+
+use Grav\Common\Grav;
+use Grav\Common\Page\Collection;
+use Grav\Common\Page\Interfaces\PageCollectionInterface;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\Page\Pages;
+use Grav\Common\Utils;
+use Grav\Framework\Flex\Interfaces\FlexIndexInterface;
+use InvalidArgumentException;
+use function is_array;
+use function is_string;
+
+/**
+ * Implements PageLegacyInterface.
+ */
+trait PageLegacyTrait
+{
+    /**
+     * Returns children of this page.
+     *
+     * @return FlexIndexInterface|PageCollectionInterface|Collection
+     */
+    public function children()
+    {
+        if (Utils::isAdminPlugin()) {
+            return parent::children();
+        }
+
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+        $path = $this->path() ?? '';
+
+        return $pages->children($path);
+    }
+
+    /**
+     * Check to see if this item is the first in an array of sub-pages.
+     *
+     * @return bool True if item is first.
+     */
+    public function isFirst(): bool
+    {
+        if (Utils::isAdminPlugin()) {
+            return parent::isFirst();
+        }
+
+        $path = $this->path();
+        $parent = $this->parent();
+        $collection = $parent ? $parent->collection('content', false) : null;
+        if (null !== $path && $collection instanceof PageCollectionInterface) {
+            return $collection->isFirst($path);
+        }
+
+        return true;
+    }
+
+    /**
+     * Check to see if this item is the last in an array of sub-pages.
+     *
+     * @return bool True if item is last
+     */
+    public function isLast(): bool
+    {
+        if (Utils::isAdminPlugin()) {
+            return parent::isLast();
+        }
+
+        $path = $this->path();
+        $parent = $this->parent();
+        $collection = $parent ? $parent->collection('content', false) : null;
+        if (null !== $path && $collection instanceof PageCollectionInterface) {
+            return $collection->isLast($path);
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the adjacent sibling based on a direction.
+     *
+     * @param  int $direction either -1 or +1
+     * @return PageInterface|false             the sibling page
+     */
+    public function adjacentSibling($direction = 1)
+    {
+        if (Utils::isAdminPlugin()) {
+            return parent::adjacentSibling($direction);
+        }
+
+        $path = $this->path();
+        $parent = $this->parent();
+        $collection = $parent ? $parent->collection('content', false) : null;
+        if (null !== $path && $collection instanceof PageCollectionInterface) {
+            $child = $collection->adjacentSibling($path, $direction);
+            if ($child instanceof PageInterface) {
+                return $child;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Helper method to return an ancestor page.
+     *
+     * @param string|null $lookup Name of the parent folder
+     * @return PageInterface|null page you were looking for if it exists
+     */
+    public function ancestor($lookup = null)
+    {
+        if (Utils::isAdminPlugin()) {
+            return parent::ancestor($lookup);
+        }
+
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+
+        return $pages->ancestor($this->getProperty('parent_route'), $lookup);
+    }
+
+    /**
+     * Method that contains shared logic for inherited() and inheritedField()
+     *
+     * @param string $field Name of the parent folder
+     * @return array
+     */
+    protected function getInheritedParams($field): array
+    {
+        if (Utils::isAdminPlugin()) {
+            return parent::getInheritedParams($field);
+        }
+
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+
+        $inherited = $pages->inherited($this->getProperty('parent_route'), $field);
+        $inheritedParams = $inherited ? (array)$inherited->value('header.' . $field) : [];
+        $currentParams = (array)$this->getFormValue('header.' . $field);
+        if ($inheritedParams && is_array($inheritedParams)) {
+            $currentParams = array_replace_recursive($inheritedParams, $currentParams);
+        }
+
+        return [$inherited, $currentParams];
+    }
+
+    /**
+     * Helper method to return a page.
+     *
+     * @param string $url the url of the page
+     * @param bool $all
+     * @return PageInterface|null page you were looking for if it exists
+     */
+    public function find($url, $all = false)
+    {
+        if (Utils::isAdminPlugin()) {
+            return parent::find($url, $all);
+        }
+
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+
+        return $pages->find($url, $all);
+    }
+
+    /**
+     * Get a collection of pages in the current context.
+     *
+     * @param string|array $params
+     * @param bool $pagination
+     * @return PageCollectionInterface|Collection
+     * @throws InvalidArgumentException
+     */
+    public function collection($params = 'content', $pagination = true)
+    {
+        if (Utils::isAdminPlugin()) {
+            return parent::collection($params, $pagination);
+        }
+
+        if (is_string($params)) {
+            // Look into a page header field.
+            $params = (array)$this->getFormValue('header.' . $params);
+        } elseif (!is_array($params)) {
+            throw new InvalidArgumentException('Argument should be either header variable name or array of parameters');
+        }
+
+        $context = [
+            'pagination' => $pagination,
+            'self' => $this
+        ];
+
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+
+        return $pages->getCollection($params, $context);
+    }
+
+    /**
+     * @param string|array $value
+     * @param bool $only_published
+     * @return PageCollectionInterface|Collection
+     */
+    public function evaluate($value, $only_published = true)
+    {
+        if (Utils::isAdminPlugin()) {
+            return parent::collection($value, $only_published);
+        }
+
+        $params = [
+            'items' => $value,
+            'published' => $only_published
+        ];
+        $context = [
+            'event' => false,
+            'pagination' => false,
+            'url_taxonomy_filters' => false,
+            'self' => $this
+        ];
+
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+
+        return $pages->getCollection($params, $context);
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Pages/Traits/PageRoutableTrait.php b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageRoutableTrait.php
new file mode 100644
index 0000000000..ace74dc38e
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageRoutableTrait.php
@@ -0,0 +1,122 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Pages\Traits;
+
+use Grav\Common\Grav;
+use Grav\Common\Page\Interfaces\PageCollectionInterface;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\Page\Pages;
+use Grav\Common\Uri;
+use Grav\Common\Utils;
+use Grav\Framework\Filesystem\Filesystem;
+use RuntimeException;
+
+/**
+ * Implements PageRoutableInterface.
+ */
+trait PageRoutableTrait
+{
+    /**
+     * Gets and Sets the parent object for this page
+     *
+     * @param  PageInterface|null $var the parent page object
+     * @return PageInterface|null the parent page object if it exists.
+     */
+
+    public function parent(PageInterface $var = null)
+    {
+        if (Utils::isAdminPlugin()) {
+            return parent::parent();
+        }
+
+        if (null !== $var) {
+            throw new RuntimeException('Not Implemented');
+        }
+
+        if ($this->root()) {
+            return null;
+        }
+
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+
+        $filesystem = Filesystem::getInstance(false);
+
+        // FIXME: this does not work, needs to use $pages->get() with cached parent id!
+        $key = $this->getKey();
+        $parent_route = $filesystem->dirname('/' . $key);
+
+        return $parent_route !== '/' ? $pages->find($parent_route) : $pages->root();
+    }
+
+    /**
+     * Returns the item in the current position.
+     *
+     * @return int|null   the index of the current page.
+     */
+    public function currentPosition(): ?int
+    {
+        $path = $this->path();
+        $parent = $this->parent();
+        $collection = $parent ? $parent->collection('content', false) : null;
+        if (null !== $path && $collection instanceof PageCollectionInterface) {
+            return $collection->currentPosition($path);
+        }
+
+        return 1;
+    }
+
+    /**
+     * Returns whether or not this page is the currently active page requested via the URL.
+     *
+     * @return bool True if it is active
+     */
+    public function active(): bool
+    {
+        $grav = Grav::instance();
+        $uri_path = rtrim(urldecode($grav['uri']->path()), '/') ?: '/';
+        $routes = $grav['pages']->routes();
+
+        return isset($routes[$uri_path]) && $routes[$uri_path] === $this->path();
+    }
+
+    /**
+     * Returns whether or not this URI's URL contains the URL of the active page.
+     * Or in other words, is this page's URL in the current URL
+     *
+     * @return bool True if active child exists
+     */
+    public function activeChild(): bool
+    {
+        $grav = Grav::instance();
+        /** @var Uri $uri */
+        $uri = $grav['uri'];
+        /** @var Pages $pages */
+        $pages = $grav['pages'];
+        $uri_path = rtrim(urldecode($uri->path()), '/');
+        $routes = $pages->routes();
+
+        if (isset($routes[$uri_path])) {
+            $page = $pages->find($uri->route());
+            /** @var PageInterface|null $child_page */
+            $child_page = $page ? $page->parent() : null;
+            while ($child_page && !$child_page->root()) {
+                if ($this->path() === $child_page->path()) {
+                    return true;
+                }
+                $child_page = $child_page->parent();
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Pages/Traits/PageTranslateTrait.php b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageTranslateTrait.php
new file mode 100644
index 0000000000..a30ae1a3e8
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Pages/Traits/PageTranslateTrait.php
@@ -0,0 +1,108 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Pages\Traits;
+
+use Grav\Common\Grav;
+use Grav\Common\Language\Language;
+use Grav\Common\Page\Page;
+use Grav\Common\Utils;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use SplFileInfo;
+
+/**
+ * Implements PageTranslateInterface
+ */
+trait PageTranslateTrait
+{
+    /**
+     * Return an array with the routes of other translated languages
+     *
+     * @param bool $onlyPublished only return published translations
+     * @return array the page translated languages
+     */
+    public function translatedLanguages($onlyPublished = false): array
+    {
+        if (Utils::isAdminPlugin()) {
+            return parent::translatedLanguages();
+        }
+
+        $translated = $this->getLanguageTemplates();
+        if (!$translated) {
+            return $translated;
+        }
+
+        $grav = Grav::instance();
+
+        /** @var Language $language */
+        $language = $grav['language'];
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $grav['locator'];
+
+        $languages = $language->getLanguages();
+        $languages[] = '';
+        $defaultCode = $language->getDefault();
+
+        if (isset($translated[$defaultCode])) {
+            unset($translated['']);
+        }
+
+        foreach ($translated as $key => &$template) {
+            $template .= $key !== '' ? ".{$key}.md" : '.md';
+        }
+        unset($template);
+
+        $translated = array_intersect_key($translated, array_flip($languages));
+
+        $folder = $this->getStorageFolder();
+        if (!$folder) {
+            return [];
+        }
+        $folder = $locator->isStream($folder) ? $locator->getResource($folder) : GRAV_ROOT . "/{$folder}";
+
+        $list = array_fill_keys($languages, null);
+        foreach ($translated as $languageCode => $languageFile) {
+            $languageExtension = $languageCode ? ".{$languageCode}.md" : '.md';
+            $path = "{$folder}/{$languageFile}";
+
+            // FIXME: use flex, also rawRoute() does not fully work?
+            $aPage = new Page();
+            $aPage->init(new SplFileInfo($path), $languageExtension);
+            if ($onlyPublished && !$aPage->published()) {
+                continue;
+            }
+
+            $header = $aPage->header();
+            // @phpstan-ignore-next-line
+            $routes = $header->routes ?? [];
+            $route = $routes['default'] ?? $aPage->rawRoute();
+            if (!$route) {
+                $route = $aPage->route();
+            }
+
+            $list[$languageCode ?: $defaultCode] = $route ?? '';
+        }
+
+        $list = array_filter($list, static function ($var) {
+            return null !== $var;
+        });
+
+        // Hack to get the same result as with old pages.
+        foreach ($list as &$path) {
+            if ($path === '') {
+                $path = null;
+            }
+        }
+
+        return $list;
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupCollection.php b/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupCollection.php
new file mode 100644
index 0000000000..3a91d77cc5
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupCollection.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\UserGroups;
+
+use Grav\Common\Flex\FlexCollection;
+
+/**
+ * Class UserGroupCollection
+ * @package Grav\Common\Flex\Types\UserGroups
+ *
+ * @extends FlexCollection<UserGroupObject>
+ */
+class UserGroupCollection extends FlexCollection
+{
+    /**
+     * @return array
+     */
+    public static function getCachedMethods(): array
+    {
+        return [
+            'authorize' => false,
+        ] + parent::getCachedMethods();
+    }
+
+    /**
+     * Checks user authorization to the action.
+     *
+     * @param  string $action
+     * @param  string|null $scope
+     * @return bool|null
+     */
+    public function authorize(string $action, string $scope = null): ?bool
+    {
+        $authorized = null;
+        /** @var UserGroupObject $object */
+        foreach ($this as $object) {
+            $auth = $object->authorize($action, $scope);
+            if ($auth === true) {
+                $authorized = true;
+            } elseif ($auth === false) {
+                return false;
+            }
+        }
+
+        return $authorized;
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupIndex.php b/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupIndex.php
new file mode 100644
index 0000000000..66de52e736
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupIndex.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\UserGroups;
+
+use Grav\Common\Flex\FlexIndex;
+
+/**
+ * Class GroupIndex
+ * @package Grav\Common\User\FlexUser
+ *
+ * @extends FlexIndex<UserGroupObject,UserGroupCollection>
+ */
+class UserGroupIndex extends FlexIndex
+{
+}
diff --git a/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupObject.php b/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupObject.php
new file mode 100644
index 0000000000..4a59d520a8
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupObject.php
@@ -0,0 +1,121 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\UserGroups;
+
+use Grav\Common\Flex\FlexObject;
+use Grav\Common\User\Access;
+use Grav\Common\User\Interfaces\UserGroupInterface;
+use function is_bool;
+
+/**
+ * Flex User Group
+ *
+ * @package Grav\Common\User
+ *
+ * @property string $groupname
+ * @property Access $access
+ */
+class UserGroupObject extends FlexObject implements UserGroupInterface
+{
+    /** @var Access */
+    protected $_access;
+    /** @var array|null */
+    protected $access;
+
+    /**
+     * @return array
+     */
+    public static function getCachedMethods(): array
+    {
+        return [
+            'authorize' => false,
+        ] + parent::getCachedMethods();
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle(): string
+    {
+        return $this->getProperty('readableName');
+    }
+
+    /**
+     * Checks user authorization to the action.
+     *
+     * @param  string $action
+     * @param  string|null $scope
+     * @return bool|null
+     */
+    public function authorize(string $action, string $scope = null): ?bool
+    {
+        if ($scope === 'test') {
+            $scope = null;
+        } elseif (!$this->getProperty('enabled', true)) {
+            return null;
+        }
+
+        $access = $this->getAccess();
+
+        $authorized = $access->authorize($action, $scope);
+        if (is_bool($authorized)) {
+            return $authorized;
+        }
+
+        return $access->authorize('admin.super') ? true : null;
+    }
+
+    /**
+     * @return Access
+     */
+    protected function getAccess(): Access
+    {
+        if (null === $this->_access) {
+            $this->getProperty('access');
+        }
+
+        return $this->_access;
+    }
+
+    /**
+     * @param mixed $value
+     * @return array
+     */
+    protected function offsetLoad_access($value): array
+    {
+        if (!$value instanceof Access) {
+            $value = new Access($value);
+        }
+
+        $this->_access = $value;
+
+        return $value->jsonSerialize();
+    }
+
+    /**
+     * @param mixed $value
+     * @return array
+     */
+    protected function offsetPrepare_access($value): array
+    {
+        return $this->offsetLoad_access($value);
+    }
+
+    /**
+     * @param array|null $value
+     * @return array|null
+     */
+    protected function offsetSerialize_access(?array $value): ?array
+    {
+        return $value;
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Users/Storage/UserFileStorage.php b/system/src/Grav/Common/Flex/Types/Users/Storage/UserFileStorage.php
new file mode 100644
index 0000000000..664f24faa0
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Users/Storage/UserFileStorage.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Users\Storage;
+
+use Grav\Framework\Flex\Storage\FileStorage;
+
+/**
+ * Class UserFileStorage
+ * @package Grav\Common\Flex\Types\Users\Storage
+ */
+class UserFileStorage extends FileStorage
+{
+    /**
+     * {@inheritdoc}
+     * @see FlexStorageInterface::getMediaPath()
+     */
+    public function getMediaPath(string $key = null): ?string
+    {
+        // There is no media support for file storage (fallback to common location).
+        return null;
+    }
+
+    /**
+     * Prepares the row for saving and returns the storage key for the record.
+     *
+     * @param array $row
+     */
+    protected function prepareRow(array &$row): void
+    {
+        parent::prepareRow($row);
+
+        $access = $row['access'] ?? [];
+        unset($row['access']);
+        if ($access) {
+            $row['access'] = $access;
+        }
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Users/Storage/UserFolderStorage.php b/system/src/Grav/Common/Flex/Types/Users/Storage/UserFolderStorage.php
new file mode 100644
index 0000000000..a037f0ef7f
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Users/Storage/UserFolderStorage.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Users\Storage;
+
+use Grav\Framework\Flex\Storage\FolderStorage;
+
+/**
+ * Class UserFolderStorage
+ * @package Grav\Common\Flex\Types\Users\Storage
+ */
+class UserFolderStorage extends FolderStorage
+{
+    /**
+     * Prepares the row for saving and returns the storage key for the record.
+     *
+     * @param array $row
+     */
+    protected function prepareRow(array &$row): void
+    {
+        parent::prepareRow($row);
+
+        $access = $row['access'] ?? [];
+        unset($row['access']);
+        if ($access) {
+            $row['access'] = $access;
+        }
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Users/Traits/UserObjectLegacyTrait.php b/system/src/Grav/Common/Flex/Types/Users/Traits/UserObjectLegacyTrait.php
new file mode 100644
index 0000000000..07acf66a50
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Users/Traits/UserObjectLegacyTrait.php
@@ -0,0 +1,94 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Users\Traits;
+
+use Grav\Common\Page\Medium\ImageMedium;
+use Grav\Common\Page\Medium\StaticImageMedium;
+use function count;
+
+/**
+ * Trait UserObjectLegacyTrait
+ * @package Grav\Common\Flex\Types\Users\Traits
+ */
+trait UserObjectLegacyTrait
+{
+    /**
+     * Merge two configurations together.
+     *
+     * @param array $data
+     * @return $this
+     * @deprecated 1.6 Use `->update($data)` instead (same but with data validation & filtering, file upload support).
+     */
+    public function merge(array $data)
+    {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->update($data) method instead', E_USER_DEPRECATED);
+
+        $this->setElements($this->getBlueprint()->mergeData($this->toArray(), $data));
+
+        return $this;
+    }
+
+    /**
+     * Return media object for the User's avatar.
+     *
+     * @return ImageMedium|StaticImageMedium|null
+     * @deprecated 1.6 Use ->getAvatarImage() method instead.
+     */
+    public function getAvatarMedia()
+    {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->getAvatarImage() method instead', E_USER_DEPRECATED);
+
+        return $this->getAvatarImage();
+    }
+
+    /**
+     * Return the User's avatar URL
+     *
+     * @return string
+     * @deprecated 1.6 Use ->getAvatarUrl() method instead.
+     */
+    public function avatarUrl()
+    {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->getAvatarUrl() method instead', E_USER_DEPRECATED);
+
+        return $this->getAvatarUrl();
+    }
+
+    /**
+     * Checks user authorization to the action.
+     * Ensures backwards compatibility
+     *
+     * @param string $action
+     * @return bool
+     * @deprecated 1.5 Use ->authorize() method instead.
+     */
+    public function authorise($action)
+    {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.5, use ->authorize() method instead', E_USER_DEPRECATED);
+
+        return $this->authorize($action) ?? false;
+    }
+
+    /**
+     * Implements Countable interface.
+     *
+     * @return int
+     * @deprecated 1.6 Method makes no sense for user account.
+     */
+    #[\ReturnTypeWillChange]
+    public function count()
+    {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6', E_USER_DEPRECATED);
+
+        return count($this->jsonSerialize());
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Users/UserCollection.php b/system/src/Grav/Common/Flex/Types/Users/UserCollection.php
new file mode 100644
index 0000000000..f5641e7324
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Users/UserCollection.php
@@ -0,0 +1,135 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Users;
+
+use Grav\Common\Flex\FlexCollection;
+use Grav\Common\User\Interfaces\UserCollectionInterface;
+use Grav\Common\User\Interfaces\UserInterface;
+use function is_string;
+
+/**
+ * Class UserCollection
+ * @package Grav\Common\Flex\Types\Users
+ *
+ * @extends FlexCollection<UserObject>
+ */
+class UserCollection extends FlexCollection implements UserCollectionInterface
+{
+    /**
+     * @return array
+     */
+    public static function getCachedMethods(): array
+    {
+        return [
+                'authorize' => 'session',
+            ] + parent::getCachedMethods();
+    }
+
+    /**
+     * Load user account.
+     *
+     * Always creates user object. To check if user exists, use $this->exists().
+     *
+     * @param string $username
+     * @return UserObject
+     */
+    public function load($username): UserInterface
+    {
+        $username = (string)$username;
+
+        if ($username !== '') {
+            $key = $this->filterUsername($username);
+            $user = $this->get($key);
+            if ($user) {
+                return $user;
+            }
+        } else {
+            $key = '';
+        }
+
+        $directory = $this->getFlexDirectory();
+
+        /** @var UserObject $object */
+        $object = $directory->createObject(
+            [
+                'username' => $username,
+                'state' => 'enabled'
+            ],
+            $key
+        );
+
+        return $object;
+    }
+
+    /**
+     * Find a user by username, email, etc
+     *
+     * @param string $query the query to search for
+     * @param string|string[] $fields the fields to search
+     * @return UserObject
+     */
+    public function find($query, $fields = ['username', 'email']): UserInterface
+    {
+        if (is_string($query) && $query !== '') {
+            foreach ((array)$fields as $field) {
+                if ($field === 'key') {
+                    $user = $this->get($query);
+                } elseif ($field === 'storage_key') {
+                    $user = $this->withKeyField('storage_key')->get($query);
+                } elseif ($field === 'flex_key') {
+                    $user = $this->withKeyField('flex_key')->get($query);
+                } elseif ($field === 'username') {
+                    $user = $this->get($this->filterUsername($query));
+                } else {
+                    $user = parent::find($query, $field);
+                }
+                if ($user instanceof UserObject) {
+                    return $user;
+                }
+            }
+        }
+
+        return $this->load('');
+    }
+
+    /**
+     * Delete user account.
+     *
+     * @param string $username
+     * @return bool True if user account was found and was deleted.
+     */
+    public function delete($username): bool
+    {
+        $user = $this->load($username);
+
+        $exists = $user->exists();
+        if ($exists) {
+            $user->delete();
+        }
+
+        return $exists;
+    }
+
+    /**
+     * @param string $key
+     * @return string
+     */
+    protected function filterUsername(string $key): string
+    {
+        $storage = $this->getFlexDirectory()->getStorage();
+        if (method_exists($storage, 'normalizeKey')) {
+            return $storage->normalizeKey($key);
+        }
+
+        return mb_strtolower($key);
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Users/UserIndex.php b/system/src/Grav/Common/Flex/Types/Users/UserIndex.php
new file mode 100644
index 0000000000..868aad756a
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Users/UserIndex.php
@@ -0,0 +1,206 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Users;
+
+use Grav\Common\Debugger;
+use Grav\Common\File\CompiledYamlFile;
+use Grav\Common\Flex\FlexIndex;
+use Grav\Common\Grav;
+use Grav\Common\User\Interfaces\UserCollectionInterface;
+use Grav\Common\User\Interfaces\UserInterface;
+use Grav\Framework\Flex\Interfaces\FlexStorageInterface;
+use Monolog\Logger;
+use function count;
+use function is_string;
+
+/**
+ * Class UserIndex
+ * @package Grav\Common\Flex\Types\Users
+ *
+ * @extends FlexIndex<UserObject,UserCollection>
+ */
+class UserIndex extends FlexIndex implements UserCollectionInterface
+{
+    public const VERSION = parent::VERSION . '.2';
+
+    /**
+     * @param FlexStorageInterface $storage
+     * @return array
+     */
+    public static function loadEntriesFromStorage(FlexStorageInterface $storage): array
+    {
+        // Load saved index.
+        $index = static::loadIndex($storage);
+
+        $version = $index['version'] ?? 0;
+        $force = static::VERSION !== $version;
+
+        // TODO: Following check flex index to be out of sync after some saves, disabled until better solution is found.
+        //$timestamp = $index['timestamp'] ?? 0;
+        //if (!$force && $timestamp && $timestamp > time() - 1) {
+        //    return $index['index'];
+        //}
+
+        // Load up-to-date index.
+        $entries = parent::loadEntriesFromStorage($storage);
+
+        return static::updateIndexFile($storage, $index['index'], $entries, ['force_update' => $force]);
+    }
+
+    /**
+     * @param array $meta
+     * @param array $data
+     * @param FlexStorageInterface $storage
+     * @return void
+     */
+    public static function updateObjectMeta(array &$meta, array $data, FlexStorageInterface $storage): void
+    {
+        // Username can also be number and stored as such.
+        $key = (string)($data['username'] ?? $meta['key'] ?? $meta['storage_key']);
+        $meta['key'] = static::filterUsername($key, $storage);
+        $meta['email'] = isset($data['email']) ? mb_strtolower($data['email']) : null;
+    }
+
+    /**
+     * Load user account.
+     *
+     * Always creates user object. To check if user exists, use $this->exists().
+     *
+     * @param string $username
+     * @return UserObject
+     */
+    public function load($username): UserInterface
+    {
+        $username = (string)$username;
+
+        if ($username !== '') {
+            $key = static::filterUsername($username, $this->getFlexDirectory()->getStorage());
+            $user = $this->get($key);
+            if ($user) {
+                return $user;
+            }
+        } else {
+            $key = '';
+        }
+
+        $directory = $this->getFlexDirectory();
+
+        /** @var UserObject $object */
+        $object = $directory->createObject(
+            [
+                'username' => $username,
+                'state' => 'enabled'
+            ],
+            $key
+        );
+
+        return $object;
+    }
+
+    /**
+     * Delete user account.
+     *
+     * @param string $username
+     * @return bool True if user account was found and was deleted.
+     */
+    public function delete($username): bool
+    {
+        $user = $this->load($username);
+
+        $exists = $user->exists();
+        if ($exists) {
+            $user->delete();
+        }
+
+        return $exists;
+    }
+
+    /**
+     * Find a user by username, email, etc
+     *
+     * @param string $query the query to search for
+     * @param array $fields the fields to search
+     * @return UserObject
+     */
+    public function find($query, $fields = ['username', 'email']): UserInterface
+    {
+        if (is_string($query) && $query !== '') {
+            foreach ((array)$fields as $field) {
+                if ($field === 'key') {
+                    $user = $this->get($query);
+                } elseif ($field === 'storage_key') {
+                    $user = $this->withKeyField('storage_key')->get($query);
+                } elseif ($field === 'flex_key') {
+                    $user = $this->withKeyField('flex_key')->get($query);
+                } elseif ($field === 'email') {
+                    $email = mb_strtolower($query);
+                    $user = $this->withKeyField('email')->get($email);
+                } elseif ($field === 'username') {
+                    $username = static::filterUsername($query, $this->getFlexDirectory()->getStorage());
+                    $user = $this->get($username);
+                } else {
+                    $user = $this->__call('find', [$query, $field]);
+                }
+                if ($user) {
+                    return $user;
+                }
+            }
+        }
+
+        return $this->load('');
+    }
+
+    /**
+     * @param string $key
+     * @param FlexStorageInterface $storage
+     * @return string
+     */
+    protected static function filterUsername(string $key, FlexStorageInterface $storage): string
+    {
+        return method_exists($storage, 'normalizeKey') ? $storage->normalizeKey($key) : $key;
+    }
+
+    /**
+     * @param FlexStorageInterface $storage
+     * @return CompiledYamlFile|null
+     */
+    protected static function getIndexFile(FlexStorageInterface $storage)
+    {
+        // Load saved index file.
+        $grav = Grav::instance();
+        $locator = $grav['locator'];
+        $filename = $locator->findResource('user-data://flex/indexes/accounts.yaml', true, true);
+
+        return CompiledYamlFile::instance($filename);
+    }
+
+    /**
+     * @param array $entries
+     * @param array $added
+     * @param array $updated
+     * @param array $removed
+     */
+    protected static function onChanges(array $entries, array $added, array $updated, array $removed): void
+    {
+        $message = sprintf('Flex: User index updated, %d objects (%d added, %d updated, %d removed).', count($entries), count($added), count($updated), count($removed));
+
+        $grav = Grav::instance();
+
+        /** @var Logger $logger */
+        $logger = $grav['log'];
+        $logger->addDebug($message);
+
+        /** @var Debugger $debugger */
+        $debugger = $grav['debugger'];
+        $debugger->addMessage($message, 'debug');
+    }
+}
diff --git a/system/src/Grav/Common/Flex/Types/Users/UserObject.php b/system/src/Grav/Common/Flex/Types/Users/UserObject.php
new file mode 100644
index 0000000000..f6c9982d46
--- /dev/null
+++ b/system/src/Grav/Common/Flex/Types/Users/UserObject.php
@@ -0,0 +1,1059 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Flex\Types\Users;
+
+use Closure;
+use Countable;
+use Grav\Common\Config\Config;
+use Grav\Common\Data\Blueprint;
+use Grav\Common\Flex\FlexObject;
+use Grav\Common\Flex\Traits\FlexGravTrait;
+use Grav\Common\Flex\Traits\FlexObjectTrait;
+use Grav\Common\Flex\Types\Users\Traits\UserObjectLegacyTrait;
+use Grav\Common\Grav;
+use Grav\Common\Media\Interfaces\MediaCollectionInterface;
+use Grav\Common\Media\Interfaces\MediaUploadInterface;
+use Grav\Common\Page\Media;
+use Grav\Common\Page\Medium\MediumFactory;
+use Grav\Common\User\Access;
+use Grav\Common\User\Authentication;
+use Grav\Common\Flex\Types\UserGroups\UserGroupCollection;
+use Grav\Common\Flex\Types\UserGroups\UserGroupIndex;
+use Grav\Common\User\Interfaces\UserInterface;
+use Grav\Common\User\Traits\UserTrait;
+use Grav\Common\Utils;
+use Grav\Framework\Contracts\Relationships\ToOneRelationshipInterface;
+use Grav\Framework\File\Formatter\JsonFormatter;
+use Grav\Framework\File\Formatter\YamlFormatter;
+use Grav\Framework\Filesystem\Filesystem;
+use Grav\Framework\Flex\Flex;
+use Grav\Framework\Flex\FlexDirectory;
+use Grav\Framework\Flex\Storage\FileStorage;
+use Grav\Framework\Flex\Traits\FlexMediaTrait;
+use Grav\Framework\Flex\Traits\FlexRelationshipsTrait;
+use Grav\Framework\Form\FormFlashFile;
+use Grav\Framework\Media\MediaIdentifier;
+use Grav\Framework\Media\UploadedMediaObject;
+use Psr\Http\Message\UploadedFileInterface;
+use RocketTheme\Toolbox\Event\Event;
+use RocketTheme\Toolbox\File\FileInterface;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use function is_array;
+use function is_bool;
+use function is_object;
+
+/**
+ * Flex User
+ *
+ * Flex User is mostly compatible with the older User class, except on few key areas:
+ *
+ * - Constructor parameters have been changed. Old code creating a new user does not work.
+ * - Serializer has been changed -- existing sessions will be killed.
+ *
+ * @package Grav\Common\User
+ *
+ * @property string $username
+ * @property string $email
+ * @property string $fullname
+ * @property string $state
+ * @property array $groups
+ * @property array $access
+ * @property bool $authenticated
+ * @property bool $authorized
+ */
+class UserObject extends FlexObject implements UserInterface, Countable
+{
+    use FlexGravTrait;
+    use FlexObjectTrait;
+    use FlexMediaTrait {
+        getMedia as private getFlexMedia;
+        getMediaFolder as private getFlexMediaFolder;
+    }
+    use UserTrait;
+    use UserObjectLegacyTrait;
+    use FlexRelationshipsTrait;
+
+    /** @var Closure|null */
+    static public $authorizeCallable;
+    /** @var Closure|null */
+    static public $isAuthorizedCallable;
+
+    /** @var array|null */
+    protected $_uploads_original;
+    /** @var FileInterface|null */
+    protected $_storage;
+    /** @var UserGroupIndex */
+    protected $_groups;
+    /** @var Access */
+    protected $_access;
+    /** @var array|null */
+    protected $access;
+
+    /**
+     * @return array
+     */
+    public static function getCachedMethods(): array
+    {
+        return [
+            'authorize' => 'session',
+            'load' => false,
+            'find' => false,
+            'remove' => false,
+            'get' => true,
+            'set' => false,
+            'undef' => false,
+            'def' => false,
+        ] + parent::getCachedMethods();
+    }
+
+    /**
+     * UserObject constructor.
+     * @param array $elements
+     * @param string $key
+     * @param FlexDirectory $directory
+     * @param bool $validate
+     */
+    public function __construct(array $elements, $key, FlexDirectory $directory, bool $validate = false)
+    {
+        // User can only be authenticated via login.
+        unset($elements['authenticated'], $elements['authorized']);
+
+        // Define username if it's not set.
+        if (!isset($elements['username'])) {
+            $storageKey = $elements['__META']['storage_key'] ?? null;
+            $storage = $directory->getStorage();
+            if (null !== $storageKey && method_exists($storage, 'normalizeKey') && $key === $storage->normalizeKey($storageKey)) {
+                $elements['username'] = $storageKey;
+            } else {
+                $elements['username'] = $key;
+            }
+        }
+
+        // Define state if it isn't set.
+        if (!isset($elements['state'])) {
+            $elements['state'] = 'enabled';
+        }
+
+        parent::__construct($elements, $key, $directory, $validate);
+    }
+
+    public function __clone()
+    {
+        $this->_access = null;
+        $this->_groups = null;
+
+        parent::__clone();
+    }
+
+    /**
+     * @return void
+     */
+    public function onPrepareRegistration(): void
+    {
+        if (!$this->getProperty('access')) {
+            /** @var Config $config */
+            $config = Grav::instance()['config'];
+
+            $groups = $config->get('plugins.login.user_registration.groups', '');
+            $access = $config->get('plugins.login.user_registration.access', ['site' => ['login' => true]]);
+
+            $this->setProperty('groups', $groups);
+            $this->setProperty('access', $access);
+        }
+    }
+
+    /**
+     * Helper to get content editor will fall back if not set
+     *
+     * @return string
+     */
+    public function getContentEditor(): string
+    {
+        return $this->getProperty('content_editor', 'default');
+    }
+
+    /**
+     * Get value by using dot notation for nested arrays/objects.
+     *
+     * @example $value = $this->get('this.is.my.nested.variable');
+     *
+     * @param string  $name       Dot separated path to the requested value.
+     * @param mixed   $default    Default value (or null).
+     * @param string|null  $separator  Separator, defaults to '.'
+     * @return mixed  Value.
+     */
+    public function get($name, $default = null, $separator = null)
+    {
+        return $this->getNestedProperty($name, $default, $separator);
+    }
+
+    /**
+     * Set value by using dot notation for nested arrays/objects.
+     *
+     * @example $data->set('this.is.my.nested.variable', $value);
+     *
+     * @param string  $name       Dot separated path to the requested value.
+     * @param mixed   $value      New value.
+     * @param string|null  $separator  Separator, defaults to '.'
+     * @return $this
+     */
+    public function set($name, $value, $separator = null)
+    {
+        $this->setNestedProperty($name, $value, $separator);
+
+        return $this;
+    }
+
+    /**
+     * Unset value by using dot notation for nested arrays/objects.
+     *
+     * @example $data->undef('this.is.my.nested.variable');
+     *
+     * @param string  $name       Dot separated path to the requested value.
+     * @param string|null  $separator  Separator, defaults to '.'
+     * @return $this
+     */
+    public function undef($name, $separator = null)
+    {
+        $this->unsetNestedProperty($name, $separator);
+
+        return $this;
+    }
+
+    /**
+     * Set default value by using dot notation for nested arrays/objects.
+     *
+     * @example $data->def('this.is.my.nested.variable', 'default');
+     *
+     * @param string  $name       Dot separated path to the requested value.
+     * @param mixed   $default    Default value (or null).
+     * @param string|null  $separator  Separator, defaults to '.'
+     * @return $this
+     */
+    public function def($name, $default = null, $separator = null)
+    {
+        $this->defNestedProperty($name, $default, $separator);
+
+        return $this;
+    }
+
+    /**
+     * @param UserInterface|null $user
+     * @return bool
+     */
+    public function isMyself(?UserInterface $user = null): bool
+    {
+        if (null === $user) {
+            $user = $this->getActiveUser();
+            if ($user && !$user->authenticated) {
+                $user = null;
+            }
+        }
+
+        return $user && $this->username === $user->username;
+    }
+
+    /**
+     * Checks user authorization to the action.
+     *
+     * @param  string $action
+     * @param  string|null $scope
+     * @return bool|null
+     */
+    public function authorize(string $action, string $scope = null): ?bool
+    {
+        if ($scope === 'test') {
+            // Special scope to test user permissions.
+            $scope = null;
+        } else {
+            // User needs to be enabled.
+            if ($this->getProperty('state') !== 'enabled') {
+                return false;
+            }
+
+            // User needs to be logged in.
+            if (!$this->getProperty('authenticated')) {
+                return false;
+            }
+
+            if (strpos($action, 'login') === false && !$this->getProperty('authorized')) {
+                // User needs to be authorized (2FA).
+                return false;
+            }
+
+            // Workaround bug in Login::isUserAuthorizedForPage() <= Login v3.0.4
+            if ((string)(int)$action === $action) {
+                return false;
+            }
+        }
+
+        // Check custom application access.
+        $authorizeCallable = static::$authorizeCallable;
+        if ($authorizeCallable instanceof Closure) {
+            $callable = $authorizeCallable->bindTo($this, $this);
+            $authorized = $callable($action, $scope);
+            if (is_bool($authorized)) {
+                return $authorized;
+            }
+        }
+
+        // Check user access.
+        $access = $this->getAccess();
+        $authorized = $access->authorize($action, $scope);
+        if (is_bool($authorized)) {
+            return $authorized;
+        }
+
+        // Check group access.
+        $authorized = $this->getGroups()->authorize($action, $scope);
+        if (is_bool($authorized)) {
+            return $authorized;
+        }
+
+        // If any specific rule isn't hit, check if user is a superuser.
+        return $access->authorize('admin.super') === true;
+    }
+
+    /**
+     * @param string $property
+     * @param mixed $default
+     * @return mixed
+     */
+    public function getProperty($property, $default = null)
+    {
+        $value = parent::getProperty($property, $default);
+
+        if ($property === 'avatar') {
+            $settings = $this->getMediaFieldSettings($property);
+            $value = $this->parseFileProperty($value, $settings);
+        }
+
+        return $value;
+    }
+
+    /**
+     * @return UserGroupIndex
+     */
+    public function getRoles(): UserGroupIndex
+    {
+        return $this->getGroups();
+    }
+
+    /**
+     * Convert object into an array.
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        $array = $this->jsonSerialize();
+
+        $settings = $this->getMediaFieldSettings('avatar');
+        $array['avatar'] = $this->parseFileProperty($array['avatar'] ?? null, $settings);
+
+        return $array;
+    }
+
+    /**
+     * Convert object into YAML string.
+     *
+     * @param  int $inline  The level where you switch to inline YAML.
+     * @param  int $indent  The amount of spaces to use for indentation of nested nodes.
+     * @return string A YAML string representing the object.
+     */
+    public function toYaml($inline = 5, $indent = 2)
+    {
+        $yaml = new YamlFormatter(['inline' => $inline, 'indent' => $indent]);
+
+        return $yaml->encode($this->toArray());
+    }
+
+    /**
+     * Convert object into JSON string.
+     *
+     * @return string
+     */
+    public function toJson()
+    {
+        $json = new JsonFormatter();
+
+        return $json->encode($this->toArray());
+    }
+
+    /**
+     * Join nested values together by using blueprints.
+     *
+     * @param string  $name       Dot separated path to the requested value.
+     * @param mixed   $value      Value to be joined.
+     * @param string|null  $separator  Separator, defaults to '.'
+     * @return $this
+     * @throws RuntimeException
+     */
+    public function join($name, $value, $separator = null)
+    {
+        $separator = $separator ?? '.';
+        $old = $this->get($name, null, $separator);
+        if ($old !== null) {
+            if (!is_array($old)) {
+                throw new RuntimeException('Value ' . $old);
+            }
+
+            if (is_object($value)) {
+                $value = (array) $value;
+            } elseif (!is_array($value)) {
+                throw new RuntimeException('Value ' . $value);
+            }
+
+            $value = $this->getBlueprint()->mergeData($old, $value, $name, $separator);
+        }
+
+        $this->set($name, $value, $separator);
+
+        return $this;
+    }
+
+    /**
+     * Get nested structure containing default values defined in the blueprints.
+     *
+     * Fields without default value are ignored in the list.
+
+     * @return array
+     */
+    public function getDefaults()
+    {
+        return $this->getBlueprint()->getDefaults();
+    }
+
+    /**
+     * Set default values by using blueprints.
+     *
+     * @param string  $name       Dot separated path to the requested value.
+     * @param mixed   $value      Value to be joined.
+     * @param string|null  $separator  Separator, defaults to '.'
+     * @return $this
+     */
+    public function joinDefaults($name, $value, $separator = null)
+    {
+        if (is_object($value)) {
+            $value = (array) $value;
+        }
+
+        $old = $this->get($name, null, $separator);
+        if ($old !== null) {
+            $value = $this->getBlueprint()->mergeData($value, $old, $name, $separator ?? '.');
+        }
+
+        $this->setNestedProperty($name, $value, $separator);
+
+        return $this;
+    }
+
+    /**
+     * Get value from the configuration and join it with given data.
+     *
+     * @param string  $name       Dot separated path to the requested value.
+     * @param array|object $value Value to be joined.
+     * @param string  $separator  Separator, defaults to '.'
+     * @return array
+     * @throws RuntimeException
+     */
+    public function getJoined($name, $value, $separator = null)
+    {
+        if (is_object($value)) {
+            $value = (array) $value;
+        } elseif (!is_array($value)) {
+            throw new RuntimeException('Value ' . $value);
+        }
+
+        $old = $this->get($name, null, $separator);
+
+        if ($old === null) {
+            // No value set; no need to join data.
+            return $value;
+        }
+
+        if (!is_array($old)) {
+            throw new RuntimeException('Value ' . $old);
+        }
+
+        // Return joined data.
+        return $this->getBlueprint()->mergeData($old, $value, $name, $separator ?? '.');
+    }
+
+    /**
+     * Set default values to the configuration if variables were not set.
+     *
+     * @param array $data
+     * @return $this
+     */
+    public function setDefaults(array $data)
+    {
+        $this->setElements($this->getBlueprint()->mergeData($data, $this->toArray()));
+
+        return $this;
+    }
+
+    /**
+     * Validate by blueprints.
+     *
+     * @return $this
+     * @throws \Exception
+     */
+    public function validate()
+    {
+        $this->getBlueprint()->validate($this->toArray());
+
+        return $this;
+    }
+
+    /**
+     * Filter all items by using blueprints.
+     * @return $this
+     */
+    public function filter()
+    {
+        $this->setElements($this->getBlueprint()->filter($this->toArray()));
+
+        return $this;
+    }
+
+    /**
+     * Get extra items which haven't been defined in blueprints.
+     *
+     * @return array
+     */
+    public function extra()
+    {
+        return $this->getBlueprint()->extra($this->toArray());
+    }
+
+    /**
+     * Return unmodified data as raw string.
+     *
+     * NOTE: This function only returns data which has been saved to the storage.
+     *
+     * @return string
+     */
+    public function raw()
+    {
+        $file = $this->file();
+
+        return $file ? $file->raw() : '';
+    }
+
+    /**
+     * Set or get the data storage.
+     *
+     * @param FileInterface|null $storage Optionally enter a new storage.
+     * @return FileInterface|null
+     */
+    public function file(FileInterface $storage = null)
+    {
+        if (null !== $storage) {
+            $this->_storage = $storage;
+        }
+
+        return $this->_storage;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid(): bool
+    {
+        return $this->getProperty('state') !== null;
+    }
+
+    /**
+     * Save user
+     *
+     * @return static
+     */
+    public function save()
+    {
+        // TODO: We may want to handle this in the storage layer in the future.
+        $key = $this->getStorageKey();
+        if (!$key || strpos($key, '@@')) {
+            $storage = $this->getFlexDirectory()->getStorage();
+            if ($storage instanceof FileStorage) {
+                $this->setStorageKey($this->getKey());
+            }
+        }
+
+        $password = $this->getProperty('password') ?? $this->getProperty('password1');
+        if (null !== $password && '' !== $password) {
+            $password2 = $this->getProperty('password2');
+            if (!\is_string($password) || ($password2 && $password !== $password2)) {
+                throw new \RuntimeException('Passwords did not match.');
+            }
+
+            $this->setProperty('hashed_password', Authentication::create($password));
+        }
+        $this->unsetProperty('password');
+        $this->unsetProperty('password1');
+        $this->unsetProperty('password2');
+
+        // Backwards compatibility with older plugins.
+        $fireEvents = $this->isAdminSite() && $this->getFlexDirectory()->getConfig('object.compat.events', true);
+        $grav = $this->getContainer();
+        if ($fireEvents) {
+            $self = $this;
+            $grav->fireEvent('onAdminSave', new Event(['type' => 'flex', 'directory' => $this->getFlexDirectory(), 'object' => &$self]));
+            if ($self !== $this) {
+                throw new RuntimeException('Switching Flex User object during onAdminSave event is not supported! Please update plugin.');
+            }
+        }
+
+        $instance = parent::save();
+
+        // Backwards compatibility with older plugins.
+        if ($fireEvents) {
+            $grav->fireEvent('onAdminAfterSave', new Event(['type' => 'flex', 'directory' => $this->getFlexDirectory(), 'object' => $this]));
+        }
+
+        return $instance;
+    }
+
+    /**
+     * @return array
+     */
+    public function prepareStorage(): array
+    {
+        $elements = parent::prepareStorage();
+
+        // Do not save authorization information.
+        unset($elements['authenticated'], $elements['authorized']);
+
+        return $elements;
+    }
+
+    /**
+     * @return MediaCollectionInterface
+     */
+    public function getMedia()
+    {
+        /** @var Media $media */
+        $media = $this->getFlexMedia();
+
+        // Deal with shared avatar folder.
+        $path = $this->getAvatarFile();
+        if ($path && !$media[$path] && is_file($path)) {
+            $medium = MediumFactory::fromFile($path);
+            if ($medium) {
+                $media->add($path, $medium);
+                $name = Utils::basename($path);
+                if ($name !== $path) {
+                    $media->add($name, $medium);
+                }
+            }
+        }
+
+        return $media;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getMediaFolder(): ?string
+    {
+        $folder = $this->getFlexMediaFolder();
+
+        // Check for shared media
+        if (!$folder && !$this->getFlexDirectory()->getMediaFolder()) {
+            $this->_loadMedia = false;
+            $folder = $this->getBlueprint()->fields()['avatar']['destination'] ?? 'account://avatars';
+        }
+
+        return $folder;
+    }
+
+    /**
+     * @param string $name
+     * @return array|object|null
+     * @internal
+     */
+    public function initRelationship(string $name)
+    {
+        switch ($name) {
+            case 'media':
+                $list = [];
+                foreach ($this->getMedia()->all() as $filename => $object) {
+                    $list[] = $this->buildMediaObject(null, $filename, $object);
+                }
+
+                return $list;
+            case 'avatar':
+                return $this->buildMediaObject('avatar', basename($this->getAvatarUrl()), $this->getAvatarImage());
+        }
+
+        throw new \InvalidArgumentException(sprintf('%s: Relationship %s does not exist', $this->getFlexType(), $name));
+    }
+
+    /**
+     * @return bool Return true if relationships were updated.
+     */
+    protected function updateRelationships(): bool
+    {
+        $modified = $this->getRelationships()->getModified();
+        if ($modified) {
+            foreach ($modified as $relationship) {
+                $name = $relationship->getName();
+                switch ($name) {
+                    case 'avatar':
+                        \assert($relationship instanceof ToOneRelationshipInterface);
+                        $this->updateAvatarRelationship($relationship);
+                        break;
+                    default:
+                        throw new \InvalidArgumentException(sprintf('%s: Relationship %s cannot be modified', $this->getFlexType(), $name), 400);
+                }
+            }
+
+            $this->resetRelationships();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param ToOneRelationshipInterface $relationship
+     */
+    protected function updateAvatarRelationship(ToOneRelationshipInterface $relationship): void
+    {
+        $files = [];
+        $avatar = $this->getAvatarImage();
+        if ($avatar) {
+            $files['avatar'][$avatar->filename] = null;
+        }
+
+        $identifier = $relationship->getIdentifier();
+        if ($identifier) {
+            \assert($identifier instanceof MediaIdentifier);
+            $object = $identifier->getObject();
+            if ($object instanceof UploadedMediaObject) {
+                $uploadedFile = $object->getUploadedFile();
+                if ($uploadedFile) {
+                    $files['avatar'][$uploadedFile->getClientFilename()] = $uploadedFile;
+                }
+            }
+        }
+
+        $this->update([], $files);
+    }
+
+    /**
+     * @param string $name
+     * @return Blueprint
+     */
+    protected function doGetBlueprint(string $name = ''): Blueprint
+    {
+        $blueprint = $this->getFlexDirectory()->getBlueprint($name ? '.' . $name : $name);
+
+        // HACK: With folder storage we need to ignore the avatar destination.
+        if ($this->getFlexDirectory()->getMediaFolder()) {
+            $field = $blueprint->get('form/fields/avatar');
+            if ($field) {
+                unset($field['destination']);
+                $blueprint->set('form/fields/avatar', $field);
+            }
+        }
+
+        return $blueprint;
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param string $action
+     * @param string $scope
+     * @param bool $isMe
+     * @return bool|null
+     */
+    protected function isAuthorizedOverride(UserInterface $user, string $action, string $scope, bool $isMe = false): ?bool
+    {
+        // Check custom application access.
+        $isAuthorizedCallable = static::$isAuthorizedCallable;
+        if ($isAuthorizedCallable instanceof Closure) {
+            $callable = $isAuthorizedCallable->bindTo($this, $this);
+            $authorized = $callable($user, $action, $scope, $isMe);
+            if (is_bool($authorized)) {
+                return $authorized;
+            }
+        }
+
+        if ($user instanceof self && $user->getStorageKey() === $this->getStorageKey()) {
+            // User cannot delete his own account, otherwise he has full access.
+            return $action !== 'delete';
+        }
+
+        return parent::isAuthorizedOverride($user, $action, $scope, $isMe);
+    }
+
+    /**
+     * @return string|null
+     */
+    protected function getAvatarFile(): ?string
+    {
+        $avatars = $this->getElement('avatar');
+        if (is_array($avatars) && $avatars) {
+            $avatar = array_shift($avatars);
+
+            return $avatar['path'] ?? null;
+        }
+
+        return null;
+    }
+
+    /**
+     * Gets the associated media collection (original images).
+     *
+     * @return MediaCollectionInterface  Representation of associated media.
+     */
+    protected function getOriginalMedia()
+    {
+        $folder = $this->getMediaFolder();
+        if ($folder) {
+            $folder .= '/original';
+        }
+
+        return (new Media($folder ?? '', $this->getMediaOrder()))->setTimestamps();
+    }
+
+    /**
+     * @param array $files
+     * @return void
+     */
+    protected function setUpdatedMedia(array $files): void
+    {
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+
+        $media = $this->getMedia();
+        if (!$media instanceof MediaUploadInterface) {
+            return;
+        }
+
+        $filesystem = Filesystem::getInstance(false);
+
+        $list = [];
+        $list_original = [];
+        foreach ($files as $field => $group) {
+            // Ignore files without a field.
+            if ($field === '') {
+                continue;
+            }
+            $field = (string)$field;
+
+            // Load settings for the field.
+            $settings = $this->getMediaFieldSettings($field);
+            foreach ($group as $filename => $file) {
+                if ($file) {
+                    // File upload.
+                    $filename = $file->getClientFilename();
+
+                    /** @var FormFlashFile $file */
+                    $data = $file->jsonSerialize();
+                    unset($data['tmp_name'], $data['path']);
+                } else {
+                    // File delete.
+                    $data = null;
+                }
+
+                if ($file) {
+                    // Check file upload against media limits (except for max size).
+                    $filename = $media->checkUploadedFile($file, $filename, ['filesize' => 0] + $settings);
+                }
+
+                $self = $settings['self'];
+                if ($this->_loadMedia && $self) {
+                    $filepath = $filename;
+                } else {
+                    $filepath = "{$settings['destination']}/{$filename}";
+
+                    // For backwards compatibility we are always using relative path from the installation root.
+                    if ($locator->isStream($filepath)) {
+                        $filepath = $locator->findResource($filepath, false, true);
+                    }
+                }
+
+                // Special handling for original images.
+                if (strpos($field, '/original')) {
+                    if ($this->_loadMedia && $self) {
+                        $list_original[$filename] = [$file, $settings];
+                    }
+                    continue;
+                }
+
+                // Calculate path without the retina scaling factor.
+                $realpath = $filesystem->pathname($filepath) . str_replace(['@3x', '@2x'], '', Utils::basename($filepath));
+
+                $list[$filename] = [$file, $settings];
+
+                $path = str_replace('.', "\n", $field);
+                if (null !== $data) {
+                    $data['name'] = $filename;
+                    $data['path'] = $filepath;
+
+                    $this->setNestedProperty("{$path}\n{$realpath}", $data, "\n");
+                } else {
+                    $this->unsetNestedProperty("{$path}\n{$realpath}", "\n");
+                }
+            }
+        }
+
+        $this->clearMediaCache();
+
+        $this->_uploads = $list;
+        $this->_uploads_original = $list_original;
+    }
+
+    protected function saveUpdatedMedia(): void
+    {
+        $media = $this->getMedia();
+        if (!$media instanceof MediaUploadInterface) {
+            throw new RuntimeException('Internal error UO101');
+        }
+
+        // Upload/delete original sized images.
+        /**
+         * @var string $filename
+         * @var UploadedFileInterface|array|null $file
+         */
+        foreach ($this->_uploads_original ?? [] as $filename => $file) {
+            $filename = 'original/' . $filename;
+            if (is_array($file)) {
+                [$file, $settings] = $file;
+            } else {
+                $settings = null;
+            }
+            if ($file instanceof UploadedFileInterface) {
+                $media->copyUploadedFile($file, $filename, $settings);
+            } else {
+                $media->deleteFile($filename, $settings);
+            }
+        }
+
+        // Upload/delete altered files.
+        /**
+         * @var string $filename
+         * @var UploadedFileInterface|array|null $file
+         */
+        foreach ($this->getUpdatedMedia() as $filename => $file) {
+            if (is_array($file)) {
+                [$file, $settings] = $file;
+            } else {
+                $settings = null;
+            }
+            if ($file instanceof UploadedFileInterface) {
+                $media->copyUploadedFile($file, $filename, $settings);
+            } else {
+                $media->deleteFile($filename, $settings);
+            }
+        }
+
+        $this->setUpdatedMedia([]);
+        $this->clearMediaCache();
+    }
+
+    /**
+     * @return array
+     */
+    protected function doSerialize(): array
+    {
+        return [
+            'type' => $this->getFlexType(),
+            'key' => $this->getKey(),
+            'elements' => $this->jsonSerialize(),
+            'storage' => $this->getMetaData()
+        ];
+    }
+
+    /**
+     * @return UserGroupIndex
+     */
+    protected function getUserGroups()
+    {
+        $grav = Grav::instance();
+
+        /** @var Flex $flex */
+        $flex = $grav['flex'];
+
+        /** @var UserGroupCollection|null $groups */
+        $groups = $flex->getDirectory('user-groups');
+        if ($groups) {
+            /** @var UserGroupIndex $index */
+            $index = $groups->getIndex();
+
+            return $index;
+        }
+
+        return $grav['user_groups'];
+    }
+
+    /**
+     * @return UserGroupIndex
+     */
+    protected function getGroups()
+    {
+        if (null === $this->_groups) {
+            /** @var UserGroupIndex $groups */
+            $groups = $this->getUserGroups()->select((array)$this->getProperty('groups'));
+            $this->_groups = $groups;
+        }
+
+        return $this->_groups;
+    }
+
+    /**
+     * @return Access
+     */
+    protected function getAccess(): Access
+    {
+        if (null === $this->_access) {
+            $this->_access = new Access($this->getProperty('access'));
+        }
+
+        return $this->_access;
+    }
+
+    /**
+     * @param mixed $value
+     * @return array
+     */
+    protected function offsetLoad_access($value): array
+    {
+        if (!$value instanceof Access) {
+            $value = new Access($value);
+        }
+
+        return $value->jsonSerialize();
+    }
+
+    /**
+     * @param mixed $value
+     * @return array
+     */
+    protected function offsetPrepare_access($value): array
+    {
+        return $this->offsetLoad_access($value);
+    }
+
+    /**
+     * @param array|null $value
+     * @return array|null
+     */
+    protected function offsetSerialize_access(?array $value): ?array
+    {
+        return $value;
+    }
+}
diff --git a/system/src/Grav/Common/Form/FormFlash.php b/system/src/Grav/Common/Form/FormFlash.php
index b67313bd37..7acaf7fdc0 100644
--- a/system/src/Grav/Common/Form/FormFlash.php
+++ b/system/src/Grav/Common/Form/FormFlash.php
@@ -3,15 +3,21 @@
 /**
  * @package    Grav\Common\Form
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Form;
 
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\Utils;
 use Grav\Framework\Form\FormFlash as FrameworkFormFlash;
+use function is_array;
 
+/**
+ * Class FormFlash
+ * @package Grav\Common\Form
+ */
 class FormFlash extends FrameworkFormFlash
 {
     /**
@@ -26,7 +32,7 @@ public function getLegacyFiles(): array
                 continue;
             }
             foreach ($files as $file) {
-                if (\is_array($file)) {
+                if (is_array($file)) {
                     $file['tmp_name'] = $this->getTmpDir() . '/' . $file['tmp_name'];
                     $fields[$field][$file['path'] ?? $file['name']] = $file;
                 }
@@ -53,7 +59,7 @@ public function uploadFile(string $field, string $filename, array $upload): bool
         Folder::create($tmp_dir);
 
         $tmp_file = $upload['file']['tmp_name'];
-        $basename = basename($tmp_file);
+        $basename = Utils::basename($tmp_file);
 
         if (!move_uploaded_file($tmp_file, $tmp_dir . '/' . $basename)) {
             return false;
@@ -85,7 +91,7 @@ public function cropFile(string $field, string $filename, array $upload, array $
         Folder::create($tmp_dir);
 
         $tmp_file = $upload['file']['tmp_name'];
-        $basename = basename($tmp_file);
+        $basename = Utils::basename($tmp_file);
 
         if (!move_uploaded_file($tmp_file, $tmp_dir . '/' . $basename)) {
             return false;
diff --git a/system/src/Grav/Common/GPM/AbstractCollection.php b/system/src/Grav/Common/GPM/AbstractCollection.php
index a9e1ac9754..91fa69eb4a 100644
--- a/system/src/Grav/Common/GPM/AbstractCollection.php
+++ b/system/src/Grav/Common/GPM/AbstractCollection.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,13 +11,23 @@
 
 use Grav\Common\Iterator;
 
+/**
+ * Class AbstractCollection
+ * @package Grav\Common\GPM
+ */
 abstract class AbstractCollection extends Iterator
 {
+    /**
+     * @return string
+     */
     public function toJson()
     {
-        return json_encode($this->toArray());
+        return json_encode($this->toArray(), JSON_THROW_ON_ERROR);
     }
 
+    /**
+     * @return array
+     */
     public function toArray()
     {
         $items = [];
diff --git a/system/src/Grav/Common/GPM/Common/AbstractPackageCollection.php b/system/src/Grav/Common/GPM/Common/AbstractPackageCollection.php
index bc4ecab9d9..7b918e0efc 100644
--- a/system/src/Grav/Common/GPM/Common/AbstractPackageCollection.php
+++ b/system/src/Grav/Common/GPM/Common/AbstractPackageCollection.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,10 +11,18 @@
 
 use Grav\Common\Iterator;
 
+/**
+ * Class AbstractPackageCollection
+ * @package Grav\Common\GPM\Common
+ */
 abstract class AbstractPackageCollection extends Iterator
 {
+    /** @var string */
     protected $type;
 
+    /**
+     * @return string
+     */
     public function toJson()
     {
         $items = [];
@@ -23,9 +31,12 @@ public function toJson()
             $items[$name] = $package->toArray();
         }
 
-        return json_encode($items);
+        return json_encode($items, JSON_THROW_ON_ERROR);
     }
 
+    /**
+     * @return array
+     */
     public function toArray()
     {
         $items = [];
diff --git a/system/src/Grav/Common/GPM/Common/CachedCollection.php b/system/src/Grav/Common/GPM/Common/CachedCollection.php
index a6fca4db0d..c3b62e5cd2 100644
--- a/system/src/Grav/Common/GPM/Common/CachedCollection.php
+++ b/system/src/Grav/Common/GPM/Common/CachedCollection.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,10 +11,20 @@
 
 use Grav\Common\Iterator;
 
+/**
+ * Class CachedCollection
+ * @package Grav\Common\GPM\Common
+ */
 class CachedCollection extends Iterator
 {
-    protected static $cache;
-
+    /** @var array */
+    protected static $cache = [];
+
+    /**
+     * CachedCollection constructor.
+     *
+     * @param array $items
+     */
     public function __construct($items)
     {
         parent::__construct();
diff --git a/system/src/Grav/Common/GPM/Common/Package.php b/system/src/Grav/Common/GPM/Common/Package.php
index 40d3759128..5d960117c4 100644
--- a/system/src/Grav/Common/GPM/Common/Package.php
+++ b/system/src/Grav/Common/GPM/Common/Package.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,13 +11,19 @@
 
 use Grav\Common\Data\Data;
 
+/**
+ * @property string $name
+ */
 class Package
 {
-    /**
-     * @var Data
-     */
+    /** @var Data */
     protected $data;
 
+    /**
+     * Package constructor.
+     * @param Data $package
+     * @param string|null $type
+     */
     public function __construct(Data $package, $type = null)
     {
         $this->data = $package;
@@ -35,26 +41,49 @@ public function getData()
         return $this->data;
     }
 
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    #[\ReturnTypeWillChange]
     public function __get($key)
     {
         return $this->data->get($key);
     }
 
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @return void
+     */
+    #[\ReturnTypeWillChange]
     public function __set($key, $value)
     {
-        return $this->data->set($key, $value);
+        $this->data->set($key, $value);
     }
 
+    /**
+     * @param string $key
+     * @return bool
+     */
+    #[\ReturnTypeWillChange]
     public function __isset($key)
     {
         return isset($this->data->{$key});
     }
 
+    /**
+     * @return string
+     */
+    #[\ReturnTypeWillChange]
     public function __toString()
     {
         return $this->toJson();
     }
 
+    /**
+     * @return string
+     */
     public function toJson()
     {
         return $this->data->toJson();
diff --git a/system/src/Grav/Common/GPM/GPM.php b/system/src/Grav/Common/GPM/GPM.php
index 6c9e7b0e4a..4ca84e3f0f 100644
--- a/system/src/Grav/Common/GPM/GPM.php
+++ b/system/src/Grav/Common/GPM/GPM.php
@@ -3,44 +3,48 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\GPM;
 
+use Exception;
 use Grav\Common\Grav;
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\HTTP\Response;
 use Grav\Common\Inflector;
 use Grav\Common\Iterator;
 use Grav\Common\Utils;
 use RocketTheme\Toolbox\File\YamlFile;
+use RuntimeException;
+use stdClass;
+use function array_key_exists;
+use function count;
+use function in_array;
+use function is_array;
+use function is_object;
 
+/**
+ * Class GPM
+ * @package Grav\Common\GPM
+ */
 class GPM extends Iterator
 {
-    /**
-     * Local installed Packages
-     * @var Local\Packages
-     */
+    /** @var Local\Packages Local installed Packages */
     private $installed;
-
-    /**
-     * Remote available Packages
-     * @var Remote\Packages
-     */
+    /** @var Remote\Packages|null Remote available Packages */
     private $repository;
-
-    /**
-     * @var Remote\GravCore
-     */
-    public $grav;
-
-    /**
-     * Internal cache
-     * @var array
-     */
+    /** @var Remote\GravCore|null Remove Grav Packages */
+    private $grav;
+    /** @var bool */
+    private $refresh;
+    /** @var callable|null */
+    private $callback;
+
+    /** @var array Internal cache */
     protected $cache;
-
+    /** @var array */
     protected $install_paths = [
         'plugins' => 'user/plugins/%name%',
         'themes' => 'user/themes/%name%',
@@ -49,19 +53,54 @@ class GPM extends Iterator
 
     /**
      * Creates a new GPM instance with Local and Remote packages available
+     *
      * @param bool $refresh Applies to Remote Packages only and forces a refetch of data
-     * @param callable $callback Either a function or callback in array notation
+     * @param callable|null $callback Either a function or callback in array notation
      */
     public function __construct($refresh = false, $callback = null)
     {
         parent::__construct();
+
+        Folder::create(CACHE_DIR . '/gpm');
+
         $this->cache = [];
         $this->installed = new Local\Packages();
-        try {
-            $this->repository = new Remote\Packages($refresh, $callback);
-            $this->grav = new Remote\GravCore($refresh, $callback);
-        } catch (\Exception $e) {
+        $this->refresh = $refresh;
+        $this->callback = $callback;
+    }
+
+    /**
+     * Magic getter method
+     *
+     * @param string $offset Asset name value
+     * @return mixed Asset value
+     */
+    #[\ReturnTypeWillChange]
+    public function __get($offset)
+    {
+        switch ($offset) {
+            case 'grav':
+                return $this->getGrav();
         }
+
+        return parent::__get($offset);
+    }
+
+    /**
+     * Magic method to determine if the attribute is set
+     *
+     * @param string $offset Asset name value
+     * @return bool True if the value is set
+     */
+    #[\ReturnTypeWillChange]
+    public function __isset($offset)
+    {
+        switch ($offset) {
+            case 'grav':
+                return $this->getGrav() !== null;
+        }
+
+        return parent::__isset($offset);
     }
 
     /**
@@ -92,11 +131,13 @@ public function getInstallable($list_type_installed = ['plugins' => true, 'theme
             $items[$type] = $to_install;
             $items['total'] += count($to_install);
         }
+
         return $items;
     }
 
     /**
      * Returns the amount of locally installed packages
+     *
      * @return int Amount of installed packages
      */
     public function countInstalled()
@@ -110,29 +151,22 @@ public function countInstalled()
      * Return the instance of a specific Package
      *
      * @param  string $slug The slug of the Package
-     * @return Local\Package The instance of the Package
+     * @return Local\Package|null The instance of the Package
      */
     public function getInstalledPackage($slug)
     {
-        if (isset($this->installed['plugins'][$slug])) {
-            return $this->installed['plugins'][$slug];
-        }
-
-        if (isset($this->installed['themes'][$slug])) {
-            return $this->installed['themes'][$slug];
-        }
-
-        return null;
+        return $this->getInstalledPlugin($slug) ?? $this->getInstalledTheme($slug);
     }
 
     /**
      * Return the instance of a specific Plugin
+     *
      * @param  string $slug The slug of the Plugin
-     * @return Local\Package The instance of the Plugin
+     * @return Local\Package|null The instance of the Plugin
      */
     public function getInstalledPlugin($slug)
     {
-        return $this->installed['plugins'][$slug];
+        return $this->installed['plugins'][$slug] ?? null;
     }
 
     /**
@@ -144,33 +178,56 @@ public function getInstalledPlugins()
         return $this->installed['plugins'];
     }
 
+
+    /**
+     * Returns the plugin's enabled state
+     *
+     * @param  string $slug
+     * @return bool True if the Plugin is Enabled. False if manually set to enable:false. Null otherwise.
+     */
+    public function isPluginEnabled($slug): bool
+    {
+        $grav = Grav::instance();
+
+        return ($grav['config']['plugins'][$slug]['enabled'] ?? false) === true;
+    }
+
     /**
      * Checks if a Plugin is installed
+     *
      * @param  string $slug The slug of the Plugin
      * @return bool True if the Plugin has been installed. False otherwise
      */
-    public function isPluginInstalled($slug)
+    public function isPluginInstalled($slug): bool
     {
         return isset($this->installed['plugins'][$slug]);
     }
 
+    /**
+     * @param string $slug
+     * @return bool
+     */
     public function isPluginInstalledAsSymlink($slug)
     {
-        return $this->installed['plugins'][$slug]->symlink;
+        $plugin = $this->getInstalledPlugin($slug);
+
+        return (bool)($plugin->symlink ?? false);
     }
 
     /**
      * Return the instance of a specific Theme
+     *
      * @param  string $slug The slug of the Theme
-     * @return Local\Package The instance of the Theme
+     * @return Local\Package|null The instance of the Theme
      */
     public function getInstalledTheme($slug)
     {
-        return $this->installed['themes'][$slug];
+        return $this->installed['themes'][$slug] ?? null;
     }
 
     /**
      * Returns the Locally installed themes
+     *
      * @return Iterator The installed themes
      */
     public function getInstalledThemes()
@@ -178,40 +235,52 @@ public function getInstalledThemes()
         return $this->installed['themes'];
     }
 
+    /**
+     * Checks if a Theme is enabled
+     *
+     * @param  string $slug The slug of the Theme
+     * @return bool True if the Theme has been set to the default theme. False if installed, but not enabled. Null otherwise.
+     */
+    public function isThemeEnabled($slug): bool
+    {
+        $grav = Grav::instance();
+
+        $current_theme = $grav['config']['system']['pages']['theme'] ?? null;
+
+        return $current_theme === $slug;
+    }
+
     /**
      * Checks if a Theme is installed
+     *
      * @param  string $slug The slug of the Theme
      * @return bool True if the Theme has been installed. False otherwise
      */
-    public function isThemeInstalled($slug)
+    public function isThemeInstalled($slug): bool
     {
         return isset($this->installed['themes'][$slug]);
     }
 
     /**
      * Returns the amount of updates available
+     *
      * @return int Amount of available updates
      */
     public function countUpdates()
     {
-        $count = 0;
-
-        $count += count($this->getUpdatablePlugins());
-        $count += count($this->getUpdatableThemes());
-
-        return $count;
+        return count($this->getUpdatablePlugins()) + count($this->getUpdatableThemes());
     }
 
     /**
      * Returns an array of Plugins and Themes that can be updated.
      * Plugins and Themes are extended with the `available` property that relies to the remote version
+     *
      * @param array $list_type_update specifies what type of package to update
      * @return array Array of updatable Plugins and Themes.
      *               Format: ['total' => int, 'plugins' => array, 'themes' => array]
      */
     public function getUpdatable($list_type_update = ['plugins' => true, 'themes' => true])
     {
-
         $items = ['total' => 0];
         foreach ($list_type_update as $type => $type_updatable) {
             if ($type_updatable === false) {
@@ -222,18 +291,26 @@ public function getUpdatable($list_type_update = ['plugins' => true, 'themes' =>
             $items[$type] = $to_update;
             $items['total'] += count($to_update);
         }
+
         return $items;
     }
 
     /**
      * Returns an array of Plugins that can be updated.
      * The Plugins are extended with the `available` property that relies to the remote version
+     *
      * @return array Array of updatable Plugins
      */
     public function getUpdatablePlugins()
     {
         $items = [];
-        $repository = $this->repository['plugins'];
+
+        $repository = $this->getRepository();
+        if (null === $repository) {
+            return $items;
+        }
+
+        $plugins = $repository['plugins'];
 
         // local cache to speed things up
         if (isset($this->cache[__METHOD__])) {
@@ -241,18 +318,18 @@ public function getUpdatablePlugins()
         }
 
         foreach ($this->installed['plugins'] as $slug => $plugin) {
-            if (!isset($repository[$slug]) || $plugin->symlink || !$plugin->version || $plugin->gpm === false) {
+            if (!isset($plugins[$slug]) || $plugin->symlink || !$plugin->version || $plugin->gpm === false) {
                 continue;
             }
 
-            $local_version = $plugin->version ?: 'Unknown';
-            $remote_version = $repository[$slug]->version;
+            $local_version = $plugin->version ?? 'Unknown';
+            $remote_version = $plugins[$slug]->version;
 
             if (version_compare($local_version, $remote_version) < 0) {
-                $repository[$slug]->available = $remote_version;
-                $repository[$slug]->version = $local_version;
-                $repository[$slug]->type = $repository[$slug]->release_type;
-                $items[$slug] = $repository[$slug];
+                $plugins[$slug]->available = $remote_version;
+                $plugins[$slug]->version = $local_version;
+                $plugins[$slug]->type = $plugins[$slug]->release_type;
+                $items[$slug] = $plugins[$slug];
             }
         }
 
@@ -265,20 +342,24 @@ public function getUpdatablePlugins()
      * Get the latest release of a package from the GPM
      *
      * @param string $package_name
-     *
      * @return string|null
      */
     public function getLatestVersionOfPackage($package_name)
     {
-        $repository = $this->repository['plugins'];
-        if (isset($repository[$package_name])) {
-            return $repository[$package_name]->available ?: $repository[$package_name]->version;
+        $repository = $this->getRepository();
+        if (null === $repository) {
+            return null;
+        }
+
+        $plugins = $repository['plugins'];
+        if (isset($plugins[$package_name])) {
+            return $plugins[$package_name]->available ?: $plugins[$package_name]->version;
         }
 
         //Not a plugin, it's a theme?
-        $repository = $this->repository['themes'];
-        if (isset($repository[$package_name])) {
-            return $repository[$package_name]->available ?: $repository[$package_name]->version;
+        $themes = $repository['themes'];
+        if (isset($themes[$package_name])) {
+            return $themes[$package_name]->available ?: $themes[$package_name]->version;
         }
 
         return null;
@@ -286,6 +367,7 @@ public function getLatestVersionOfPackage($package_name)
 
     /**
      * Check if a Plugin or Theme is updatable
+     *
      * @param  string $slug The slug of the package
      * @return bool True if updatable. False otherwise or if not found
      */
@@ -296,6 +378,7 @@ public function isUpdatable($slug)
 
     /**
      * Checks if a Plugin is updatable
+     *
      * @param  string $plugin The slug of the Plugin
      * @return bool True if the Plugin is updatable. False otherwise
      */
@@ -307,12 +390,19 @@ public function isPluginUpdatable($plugin)
     /**
      * Returns an array of Themes that can be updated.
      * The Themes are extended with the `available` property that relies to the remote version
+     *
      * @return array Array of updatable Themes
      */
     public function getUpdatableThemes()
     {
         $items = [];
-        $repository = $this->repository['themes'];
+
+        $repository = $this->getRepository();
+        if (null === $repository) {
+            return $items;
+        }
+
+        $themes = $repository['themes'];
 
         // local cache to speed things up
         if (isset($this->cache[__METHOD__])) {
@@ -320,18 +410,18 @@ public function getUpdatableThemes()
         }
 
         foreach ($this->installed['themes'] as $slug => $plugin) {
-            if (!isset($repository[$slug]) || $plugin->symlink || !$plugin->version || $plugin->gpm === false) {
+            if (!isset($themes[$slug]) || $plugin->symlink || !$plugin->version || $plugin->gpm === false) {
                 continue;
             }
 
-            $local_version = $plugin->version ?: 'Unknown';
-            $remote_version = $repository[$slug]->version;
+            $local_version = $plugin->version ?? 'Unknown';
+            $remote_version = $themes[$slug]->version;
 
             if (version_compare($local_version, $remote_version) < 0) {
-                $repository[$slug]->available = $remote_version;
-                $repository[$slug]->version = $local_version;
-                $repository[$slug]->type = $repository[$slug]->release_type;
-                $items[$slug] = $repository[$slug];
+                $themes[$slug]->available = $remote_version;
+                $themes[$slug]->version = $local_version;
+                $themes[$slug]->type = $themes[$slug]->release_type;
+                $items[$slug] = $themes[$slug];
             }
         }
 
@@ -342,6 +432,7 @@ public function getUpdatableThemes()
 
     /**
      * Checks if a Theme is Updatable
+     *
      * @param  string $theme The slug of the Theme
      * @return bool True if the Theme is updatable. False otherwise
      */
@@ -354,20 +445,24 @@ public function isThemeUpdatable($theme)
      * Get the release type of a package (stable / testing)
      *
      * @param string $package_name
-     *
      * @return string|null
      */
     public function getReleaseType($package_name)
     {
-        $repository = $this->repository['plugins'];
-        if (isset($repository[$package_name])) {
-            return $repository[$package_name]->release_type;
+        $repository = $this->getRepository();
+        if (null === $repository) {
+            return null;
+        }
+
+        $plugins = $repository['plugins'];
+        if (isset($plugins[$package_name])) {
+            return $plugins[$package_name]->release_type;
         }
 
         //Not a plugin, it's a theme?
-        $repository = $this->repository['themes'];
-        if (isset($repository[$package_name])) {
-            return $repository[$package_name]->release_type;
+        $themes = $repository['themes'];
+        if (isset($themes[$package_name])) {
+            return $themes[$package_name]->release_type;
         }
 
         return null;
@@ -377,7 +472,6 @@ public function getReleaseType($package_name)
      * Returns true if the package latest release is stable
      *
      * @param string $package_name
-     *
      * @return bool
      */
     public function isStableRelease($package_name)
@@ -389,81 +483,107 @@ public function isStableRelease($package_name)
      * Returns true if the package latest release is testing
      *
      * @param string $package_name
-     *
      * @return bool
      */
     public function isTestingRelease($package_name)
     {
-        $hasTesting = isset($this->getInstalledPackage($package_name)->testing);
-        $testing = $hasTesting ? $this->getInstalledPackage($package_name)->testing : false;
+        $package = $this->getInstalledPackage($package_name);
+        $testing = $package->testing ?? false;
 
         return $this->getReleaseType($package_name) === 'testing' || $testing;
     }
 
     /**
      * Returns a Plugin from the repository
+     *
      * @param  string $slug The slug of the Plugin
-     * @return mixed  Package if found, NULL if not
+     * @return Remote\Package|null  Package if found, NULL if not
      */
     public function getRepositoryPlugin($slug)
     {
-        return @$this->repository['plugins'][$slug];
+        $packages = $this->getRepositoryPlugins();
+
+        return $packages ? ($packages[$slug] ?? null) : null;
     }
 
     /**
      * Returns the list of Plugins available in the repository
-     * @return Iterator The Plugins remotely available
+     *
+     * @return Iterator|null The Plugins remotely available
      */
     public function getRepositoryPlugins()
     {
-        return $this->repository['plugins'];
+        return $this->getRepository()['plugins'] ?? null;
     }
 
     /**
      * Returns a Theme from the repository
+     *
      * @param  string $slug The slug of the Theme
-     * @return mixed  Package if found, NULL if not
+     * @return Remote\Package|null  Package if found, NULL if not
      */
     public function getRepositoryTheme($slug)
     {
-        return @$this->repository['themes'][$slug];
+        $packages = $this->getRepositoryThemes();
+
+        return $packages ? ($packages[$slug] ?? null) : null;
     }
 
     /**
      * Returns the list of Themes available in the repository
-     * @return Iterator The Themes remotely available
+     *
+     * @return Iterator|null The Themes remotely available
      */
     public function getRepositoryThemes()
     {
-        return $this->repository['themes'];
+        return $this->getRepository()['themes'] ?? null;
     }
 
     /**
      * Returns the list of Plugins and Themes available in the repository
-     * @return Remote\Packages Available Plugins and Themes
+     *
+     * @return Remote\Packages|null Available Plugins and Themes
      *               Format: ['plugins' => array, 'themes' => array]
      */
     public function getRepository()
     {
+        if (null === $this->repository) {
+            try {
+                $this->repository = new Remote\Packages($this->refresh, $this->callback);
+            } catch (Exception $e) {}
+        }
+
         return $this->repository;
     }
 
+    /**
+     * Returns Grav version available in the repository
+     *
+     * @return Remote\GravCore|null
+     */
+    public function getGrav()
+    {
+        if (null === $this->grav) {
+            try {
+                $this->grav = new Remote\GravCore($this->refresh, $this->callback);
+            } catch (Exception $e) {}
+        }
+
+        return $this->grav;
+    }
+
     /**
      * Searches for a Package in the repository
+     *
      * @param  string $search Can be either the slug or the name
      * @param  bool $ignore_exception True if should not fire an exception (for use in Twig)
-     * @return Remote\Package|bool Package if found, FALSE if not
+     * @return Remote\Package|false Package if found, FALSE if not
      */
     public function findPackage($search, $ignore_exception = false)
     {
         $search = strtolower($search);
 
-        $found = $this->getRepositoryTheme($search);
-        if ($found) {
-            return $found;
-        }
-
-        $found = $this->getRepositoryPlugin($search);
+        $found = $this->getRepositoryPlugin($search) ?? $this->getRepositoryTheme($search);
         if ($found) {
             return $found;
         }
@@ -471,31 +591,27 @@ public function findPackage($search, $ignore_exception = false)
         $themes = $this->getRepositoryThemes();
         $plugins = $this->getRepositoryPlugins();
 
-        if (!$themes && !$plugins) {
-            if (!is_writable(ROOT_DIR . '/cache/gpm')) {
-                throw new \RuntimeException("The cache/gpm folder is not writable. Please check the folder permissions.");
+        if (null === $themes || null === $plugins) {
+            if (!is_writable(GRAV_ROOT . '/cache/gpm')) {
+                throw new RuntimeException('The cache/gpm folder is not writable. Please check the folder permissions.');
             }
 
             if ($ignore_exception) {
                 return false;
             }
 
-            throw new \RuntimeException("GPM not reachable. Please check your internet connection or check the Grav site is reachable");
+            throw new RuntimeException('GPM not reachable. Please check your internet connection or check the Grav site is reachable');
         }
 
-        if ($themes) {
-            foreach ($themes as $slug => $theme) {
-                if ($search == $slug || $search == $theme->name) {
-                    return $theme;
-                }
+        foreach ($themes as $slug => $theme) {
+            if ($search === $slug || $search === $theme->name) {
+                return $theme;
             }
         }
 
-        if ($plugins) {
-            foreach ($plugins as $slug => $plugin) {
-                if ($search == $slug || $search == $plugin->name) {
-                    return $plugin;
-                }
+        foreach ($plugins as $slug => $plugin) {
+            if ($search === $slug || $search === $plugin->name) {
+                return $plugin;
             }
         }
 
@@ -507,15 +623,19 @@ public function findPackage($search, $ignore_exception = false)
      *
      * @param string $package_file
      * @param string $tmp
-     * @return null|string
+     * @return string|null
      */
     public static function downloadPackage($package_file, $tmp)
     {
         $package = parse_url($package_file);
-        $filename = basename($package['path']);
+        if (!is_array($package)) {
+            throw new \RuntimeException("Malformed GPM URL: {$package_file}");
+        }
+
+        $filename = Utils::basename($package['path'] ?? '');
 
-        if (Grav::instance()['config']->get('system.gpm.official_gpm_only') && $package['host'] !== 'getgrav.org') {
-            throw new \RuntimeException("Only official GPM URLs are allowed. You can modify this behavior in the System configuration.");
+        if (Grav::instance()['config']->get('system.gpm.official_gpm_only') && ($package['host'] ?? null) !== 'getgrav.org') {
+            throw new RuntimeException('Only official GPM URLs are allowed. You can modify this behavior in the System configuration.');
         }
 
         $output = Response::get($package_file, []);
@@ -534,16 +654,16 @@ public static function downloadPackage($package_file, $tmp)
      *
      * @param string $package_file
      * @param string $tmp
-     * @return null|string
+     * @return string|null
      */
     public static function copyPackage($package_file, $tmp)
     {
         $package_file = realpath($package_file);
 
-        if (file_exists($package_file)) {
-            $filename = basename($package_file);
+        if ($package_file && file_exists($package_file)) {
+            $filename = Utils::basename($package_file);
             Folder::create($tmp);
-            copy(realpath($package_file), $tmp . DS . $filename);
+            copy($package_file, $tmp . DS . $filename);
             return $tmp . DS . $filename;
         }
 
@@ -554,15 +674,14 @@ public static function copyPackage($package_file, $tmp)
      * Try to guess the package type from the source files
      *
      * @param string $source
-     * @return bool|string
+     * @return string|false
      */
     public static function getPackageType($source)
     {
         $plugin_regex = '/^class\\s{1,}[a-zA-Z0-9]{1,}\\s{1,}extends.+Plugin/m';
         $theme_regex = '/^class\\s{1,}[a-zA-Z0-9]{1,}\\s{1,}extends.+Theme/m';
 
-        if (
-            file_exists($source . 'system/defines.php') &&
+        if (file_exists($source . 'system/defines.php') &&
             file_exists($source . 'system/config/system.yaml')
         ) {
             return 'grav';
@@ -574,15 +693,20 @@ public static function getPackageType($source)
         }
 
         // either theme or plugin
-        $name = basename($source);
+        $name = Utils::basename($source);
         if (Utils::contains($name, 'theme')) {
             return 'theme';
         }
         if (Utils::contains($name, 'plugin')) {
             return 'plugin';
         }
-        foreach (glob($source . '*.php') as $filename) {
+
+        $glob = glob($source . '*.php') ?: [];
+        foreach ($glob as $filename) {
             $contents = file_get_contents($filename);
+            if (!$contents) {
+                continue;
+            }
             if (preg_match($theme_regex, $contents)) {
                 return 'theme';
             }
@@ -599,19 +723,22 @@ public static function getPackageType($source)
      * Try to guess the package name from the source files
      *
      * @param string $source
-     * @return bool|string
+     * @return string|false
      */
     public static function getPackageName($source)
     {
         $ignore_yaml_files = ['blueprints', 'languages'];
 
-        foreach (glob($source . '*.yaml') as $filename) {
-            $name = strtolower(basename($filename, '.yaml'));
+        $glob = glob($source . '*.yaml') ?: [];
+        foreach ($glob as $filename) {
+            $name = strtolower(Utils::basename($filename, '.yaml'));
             if (in_array($name, $ignore_yaml_files)) {
                 continue;
             }
+
             return $name;
         }
+
         return false;
     }
 
@@ -619,7 +746,7 @@ public static function getPackageName($source)
      * Find/Parse the blueprint file
      *
      * @param string $source
-     * @return array|bool
+     * @return array|false
      */
     public static function getBlueprints($source)
     {
@@ -651,11 +778,13 @@ public static function getInstallPath($type, $name)
         } else {
             $install_path = $locator->findResource('plugins://', false) . DS . $name;
         }
+
         return $install_path;
     }
 
     /**
      * Searches for a list of Packages in the repository
+     *
      * @param  array $searches An array of either slugs or names
      * @return array Array of found Packages
      *                        Format: ['total' => int, 'not_found' => array, <found-slugs>]
@@ -695,7 +824,7 @@ public function findPackages($searches = [])
                     $type = 'plugins';
                 }
 
-                $not_found = new \stdClass();
+                $not_found = new stdClass();
                 $not_found->name = $inflector::camelize($search);
                 $not_found->slug = $search;
                 $not_found->package_type = $type;
@@ -712,7 +841,6 @@ public function findPackages($searches = [])
      * Return the list of packages that have the passed one as dependency
      *
      * @param string $slug The slug name of the package
-     *
      * @return array
      */
     public function getPackagesThatDependOnPackage($slug)
@@ -721,23 +849,21 @@ public function getPackagesThatDependOnPackage($slug)
         $themes = $this->getInstalledThemes();
         $packages = array_merge($plugins->toArray(), $themes->toArray());
 
-        $dependent_packages = [];
-
+        $list = [];
         foreach ($packages as $package_name => $package) {
-            if (isset($package['dependencies'])) {
-                foreach ($package['dependencies'] as $dependency) {
-                    if (is_array($dependency) && isset($dependency['name'])) {
-                        $dependency = $dependency['name'];
-                    }
+            $dependencies = $package['dependencies'] ?? [];
+            foreach ($dependencies as $dependency) {
+                if (is_array($dependency) && isset($dependency['name'])) {
+                    $dependency = $dependency['name'];
+                }
 
-                    if ($dependency === $slug) {
-                        $dependent_packages[] = $package_name;
-                    }
+                if ($dependency === $slug) {
+                    $list[] = $package_name;
                 }
             }
         }
 
-        return $dependent_packages;
+        return $list;
     }
 
 
@@ -746,12 +872,11 @@ public function getPackagesThatDependOnPackage($slug)
      *
      * @param string $package_slug
      * @param string $dependency_slug
-     *
-     * @return mixed
+     * @return mixed|null
      */
     public function getVersionOfDependencyRequiredByPackage($package_slug, $dependency_slug)
     {
-        $dependencies = $this->getInstalledPackage($package_slug)->dependencies;
+        $dependencies = $this->getInstalledPackage($package_slug)->dependencies ?? [];
         foreach ($dependencies as $dependency) {
             if (isset($dependency[$dependency_slug])) {
                 return $dependency[$dependency_slug];
@@ -768,35 +893,28 @@ public function getVersionOfDependencyRequiredByPackage($package_slug, $dependen
      * @param string $slug
      * @param string $version_with_operator
      * @param array $ignore_packages_list
-     *
      * @return bool
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
-    public function checkNoOtherPackageNeedsThisDependencyInALowerVersion(
-        $slug,
-        $version_with_operator,
-        $ignore_packages_list
-    ) {
-
+    public function checkNoOtherPackageNeedsThisDependencyInALowerVersion($slug, $version_with_operator, $ignore_packages_list)
+    {
         // check if any of the currently installed package need this in a lower version than the one we need. In case, abort and tell which package
         $dependent_packages = $this->getPackagesThatDependOnPackage($slug);
         $version = $this->calculateVersionNumberFromDependencyVersion($version_with_operator);
 
         if (count($dependent_packages)) {
             foreach ($dependent_packages as $dependent_package) {
-                $other_dependency_version_with_operator = $this->getVersionOfDependencyRequiredByPackage($dependent_package,
-                    $slug);
+                $other_dependency_version_with_operator = $this->getVersionOfDependencyRequiredByPackage($dependent_package, $slug);
                 $other_dependency_version = $this->calculateVersionNumberFromDependencyVersion($other_dependency_version_with_operator);
 
                 // check version is compatible with the one needed by the current package
                 if ($this->versionFormatIsNextSignificantRelease($other_dependency_version_with_operator)) {
-                    $compatible = $this->checkNextSignificantReleasesAreCompatible($version,
-                        $other_dependency_version);
-                    if (!$compatible) {
-                        if (!in_array($dependent_package, $ignore_packages_list, true)) {
-                            throw new \RuntimeException("Package <cyan>$slug</cyan> is required in an older version by package <cyan>$dependent_package</cyan>. This package needs a newer version, and because of this it cannot be installed. The <cyan>$dependent_package</cyan> package must be updated to use a newer release of <cyan>$slug</cyan>.",
-                                2);
-                        }
+                    $compatible = $this->checkNextSignificantReleasesAreCompatible($version, $other_dependency_version);
+                    if (!$compatible && !in_array($dependent_package, $ignore_packages_list, true)) {
+                        throw new RuntimeException(
+                            "Package <cyan>$slug</cyan> is required in an older version by package <cyan>$dependent_package</cyan>. This package needs a newer version, and because of this it cannot be installed. The <cyan>$dependent_package</cyan> package must be updated to use a newer release of <cyan>$slug</cyan>.",
+                            2
+                        );
                     }
                 }
             }
@@ -809,14 +927,14 @@ public function checkNoOtherPackageNeedsThisDependencyInALowerVersion(
      * Check the passed packages list can be updated
      *
      * @param array $packages_names_list
-     *
-     * @throws \Exception
+     * @return void
+     * @throws Exception
      */
     public function checkPackagesCanBeInstalled($packages_names_list)
     {
         foreach ($packages_names_list as $package_name) {
-            $this->checkNoOtherPackageNeedsThisDependencyInALowerVersion($package_name,
-                $this->getLatestVersionOfPackage($package_name), $packages_names_list);
+            $latest = $this->getLatestVersionOfPackage($package_name);
+            $this->checkNoOtherPackageNeedsThisDependencyInALowerVersion($package_name, $latest, $packages_names_list);
         }
     }
 
@@ -829,27 +947,25 @@ public function checkPackagesCanBeInstalled($packages_names_list)
      * `update` means the package is already installed and must be updated as a dependency needs a higher version.
      *
      * @param array $packages
-     *
-     * @return mixed
-     * @throws \Exception
+     * @return array
+     * @throws RuntimeException
      */
     public function getDependencies($packages)
     {
         $dependencies = $this->calculateMergedDependenciesOfPackages($packages);
         foreach ($dependencies as $dependency_slug => $dependencyVersionWithOperator) {
-            if (\in_array($dependency_slug, $packages, true)) {
+            $dependency_slug = (string)$dependency_slug;
+            if (in_array($dependency_slug, $packages, true)) {
                 unset($dependencies[$dependency_slug]);
                 continue;
             }
 
             // Check PHP version
             if ($dependency_slug === 'php') {
-                $current_php_version = phpversion();
-                if (version_compare($this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator),
-                        $current_php_version) === 1
-                ) {
+                $testVersion = $this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator);
+                if (version_compare($testVersion, PHP_VERSION) === 1) {
                     //Needs a Grav update first
-                    throw new \RuntimeException("<red>One of the packages require PHP {$dependencies['php']}. Please update PHP to resolve this");
+                    throw new RuntimeException("<red>One of the packages require PHP {$dependencies['php']}. Please update PHP to resolve this");
                 }
 
                 unset($dependencies[$dependency_slug]);
@@ -858,11 +974,10 @@ public function getDependencies($packages)
 
             //First, check for Grav dependency. If a dependency requires Grav > the current version, abort and tell.
             if ($dependency_slug === 'grav') {
-                if (version_compare($this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator),
-                        GRAV_VERSION) === 1
-                ) {
+                $testVersion = $this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator);
+                if (version_compare($testVersion, GRAV_VERSION) === 1) {
                     //Needs a Grav update first
-                    throw new \RuntimeException("<red>One of the packages require Grav {$dependencies['grav']}. Please update Grav to the latest release.");
+                    throw new RuntimeException("<red>One of the packages require Grav {$dependencies['grav']}. Please update Grav to the latest release.");
                 }
 
                 unset($dependencies[$dependency_slug]);
@@ -886,15 +1001,15 @@ public function getDependencies($packages)
                 $currentlyInstalledVersion = $package_yaml['version'];
 
                 // if requirement is next significant release, check is compatible with currently installed version, might not be
-                if ($this->versionFormatIsNextSignificantRelease($dependencyVersionWithOperator)) {
-                    if ($this->firstVersionIsLower($dependencyVersion, $currentlyInstalledVersion)) {
-                        $compatible = $this->checkNextSignificantReleasesAreCompatible($dependencyVersion,
-                            $currentlyInstalledVersion);
+                if ($this->versionFormatIsNextSignificantRelease($dependencyVersionWithOperator)
+                    && $this->firstVersionIsLower($dependencyVersion, $currentlyInstalledVersion)) {
+                    $compatible = $this->checkNextSignificantReleasesAreCompatible($dependencyVersion, $currentlyInstalledVersion);
 
-                        if (!$compatible) {
-                            throw new \RuntimeException('Dependency <cyan>' . $dependency_slug . '</cyan> is required in an older version than the one installed. This package must be updated. Please get in touch with its developer.',
-                                2);
-                        }
+                    if (!$compatible) {
+                        throw new RuntimeException(
+                            'Dependency <cyan>' . $dependency_slug . '</cyan> is required in an older version than the one installed. This package must be updated. Please get in touch with its developer.',
+                            2
+                        );
                     }
                 }
 
@@ -903,19 +1018,19 @@ public function getDependencies($packages)
 
                 if ($this->firstVersionIsLower($latestRelease, $dependencyVersion)) {
                     //throw an exception if a required version cannot be found in the GPM yet
-                    throw new \RuntimeException('Dependency <cyan>' . $package_yaml['name'] . '</cyan> is required in version <cyan>' . $dependencyVersion . '</cyan> which is higher than the latest release, <cyan>' . $latestRelease . '</cyan>. Try running `bin/gpm -f index` to force a refresh of the GPM cache',
-                        1);
+                    throw new RuntimeException(
+                        'Dependency <cyan>' . $package_yaml['name'] . '</cyan> is required in version <cyan>' . $dependencyVersion . '</cyan> which is higher than the latest release, <cyan>' . $latestRelease . '</cyan>. Try running `bin/gpm -f index` to force a refresh of the GPM cache',
+                        1
+                    );
                 }
 
                 if ($this->firstVersionIsLower($currentlyInstalledVersion, $dependencyVersion)) {
                     $dependencies[$dependency_slug] = 'update';
+                } elseif ($currentlyInstalledVersion === $latestRelease) {
+                    unset($dependencies[$dependency_slug]);
                 } else {
-                    if ($currentlyInstalledVersion == $latestRelease) {
-                        unset($dependencies[$dependency_slug]);
-                    } else {
-                        // an update is not strictly required mark as 'ignore'
-                        $dependencies[$dependency_slug] = 'ignore';
-                    }
+                    // an update is not strictly required mark as 'ignore'
+                    $dependencies[$dependency_slug] = 'ignore';
                 }
             } else {
                 $dependencyVersion = $this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator);
@@ -924,12 +1039,16 @@ public function getDependencies($packages)
                 if ($this->versionFormatIsNextSignificantRelease($dependencyVersionWithOperator)) {
                     $latestVersionOfPackage = $this->getLatestVersionOfPackage($dependency_slug);
                     if ($this->firstVersionIsLower($dependencyVersion, $latestVersionOfPackage)) {
-                        $compatible = $this->checkNextSignificantReleasesAreCompatible($dependencyVersion,
-                            $latestVersionOfPackage);
+                        $compatible = $this->checkNextSignificantReleasesAreCompatible(
+                            $dependencyVersion,
+                            $latestVersionOfPackage
+                        );
 
                         if (!$compatible) {
-                            throw new \Exception('Dependency <cyan>' . $dependency_slug . '</cyan> is required in an older version than the latest release available, and it cannot be installed. This package must be updated. Please get in touch with its developer.',
-                                2);
+                            throw new RuntimeException(
+                                'Dependency <cyan>' . $dependency_slug . '</cyan> is required in an older version than the latest release available, and it cannot be installed. This package must be updated. Please get in touch with its developer.',
+                                2
+                            );
                         }
                     }
                 }
@@ -944,14 +1063,26 @@ public function getDependencies($packages)
         return $dependencies;
     }
 
+    /**
+     * @param array $dependencies_slugs
+     * @return void
+     */
     public function checkNoOtherPackageNeedsTheseDependenciesInALowerVersion($dependencies_slugs)
     {
         foreach ($dependencies_slugs as $dependency_slug) {
-            $this->checkNoOtherPackageNeedsThisDependencyInALowerVersion($dependency_slug,
-                $this->getLatestVersionOfPackage($dependency_slug), $dependencies_slugs);
+            $this->checkNoOtherPackageNeedsThisDependencyInALowerVersion(
+                $dependency_slug,
+                $this->getLatestVersionOfPackage($dependency_slug),
+                $dependencies_slugs
+            );
         }
     }
 
+    /**
+     * @param string $firstVersion
+     * @param string $secondVersion
+     * @return bool
+     */
     private function firstVersionIsLower($firstVersion, $secondVersion)
     {
         return version_compare($firstVersion, $secondVersion) === -1;
@@ -961,83 +1092,69 @@ private function firstVersionIsLower($firstVersion, $secondVersion)
      * Calculates and merges the dependencies of a package
      *
      * @param string $packageName The package information
-     *
      * @param array $dependencies The dependencies array
-     *
      * @return array
-     * @throws \Exception
      */
     private function calculateMergedDependenciesOfPackage($packageName, $dependencies)
     {
         $packageData = $this->findPackage($packageName);
 
-        //Check for dependencies
-        if (isset($packageData->dependencies)) {
-            foreach ($packageData->dependencies as $dependency) {
-                $current_package_name = $dependency['name'];
-                if (isset($dependency['version'])) {
-                    $current_package_version_information = $dependency['version'];
-                }
+        if (empty($packageData->dependencies)) {
+            return $dependencies;
+        }
 
-                if (!isset($dependencies[$current_package_name])) {
-                    // Dependency added for the first time
+        foreach ($packageData->dependencies as $dependency) {
+            $dependencyName = $dependency['name'] ?? null;
+            if (!$dependencyName) {
+                continue;
+            }
 
-                    if (!isset($current_package_version_information)) {
-                        $dependencies[$current_package_name] = '*';
-                    } else {
-                        $dependencies[$current_package_name] = $current_package_version_information;
-                    }
+            $dependencyVersion = $dependency['version'] ?? '*';
 
-                    //Factor in the package dependencies too
-                    $dependencies = $this->calculateMergedDependenciesOfPackage($current_package_name, $dependencies);
-                } else {
-                    // Dependency already added by another package
-                    //if this package requires a version higher than the currently stored one, store this requirement instead
-                    if (isset($current_package_version_information) && $current_package_version_information !== '*') {
+            if (!isset($dependencies[$dependencyName])) {
+                // Dependency added for the first time
+                $dependencies[$dependencyName] = $dependencyVersion;
 
-                        $currently_stored_version_information = $dependencies[$current_package_name];
-                        $currently_stored_version_number = $this->calculateVersionNumberFromDependencyVersion($currently_stored_version_information);
+                //Factor in the package dependencies too
+                $dependencies = $this->calculateMergedDependenciesOfPackage($dependencyName, $dependencies);
+            } elseif ($dependencyVersion !== '*') {
+                // Dependency already added by another package
+                // If this package requires a version higher than the currently stored one, store this requirement instead
+                $currentDependencyVersion = $dependencies[$dependencyName];
+                $currently_stored_version_number = $this->calculateVersionNumberFromDependencyVersion($currentDependencyVersion);
 
-                        $currently_stored_version_is_in_next_significant_release_format = false;
-                        if ($this->versionFormatIsNextSignificantRelease($currently_stored_version_information)) {
-                            $currently_stored_version_is_in_next_significant_release_format = true;
-                        }
+                $currently_stored_version_is_in_next_significant_release_format = false;
+                if ($this->versionFormatIsNextSignificantRelease($currentDependencyVersion)) {
+                    $currently_stored_version_is_in_next_significant_release_format = true;
+                }
 
-                        if (!$currently_stored_version_number) {
-                            $currently_stored_version_number = '*';
-                        }
+                if (!$currently_stored_version_number) {
+                    $currently_stored_version_number = '*';
+                }
 
-                        $current_package_version_number = $this->calculateVersionNumberFromDependencyVersion($current_package_version_information);
-                        if (!$current_package_version_number) {
-                            throw new \RuntimeException('Bad format for version of dependency ' . $current_package_name . ' for package ' . $packageName,
-                                1);
-                        }
+                $current_package_version_number = $this->calculateVersionNumberFromDependencyVersion($dependencyVersion);
+                if (!$current_package_version_number) {
+                    throw new RuntimeException("Bad format for version of dependency {$dependencyName} for package {$packageName}", 1);
+                }
 
-                        $current_package_version_is_in_next_significant_release_format = false;
-                        if ($this->versionFormatIsNextSignificantRelease($current_package_version_information)) {
-                            $current_package_version_is_in_next_significant_release_format = true;
-                        }
+                $current_package_version_is_in_next_significant_release_format = false;
+                if ($this->versionFormatIsNextSignificantRelease($dependencyVersion)) {
+                    $current_package_version_is_in_next_significant_release_format = true;
+                }
 
-                        //If I had stored '*', change right away with the more specific version required
-                        if ($currently_stored_version_number === '*') {
-                            $dependencies[$current_package_name] = $current_package_version_information;
-                        } else {
-                            if (!$currently_stored_version_is_in_next_significant_release_format && !$current_package_version_is_in_next_significant_release_format) {
-                                //Comparing versions equals or higher, a simple version_compare is enough
-                                if (version_compare($currently_stored_version_number,
-                                        $current_package_version_number) === -1
-                                ) { //Current package version is higher
-                                    $dependencies[$current_package_name] = $current_package_version_information;
-                                }
-                            } else {
-                                $compatible = $this->checkNextSignificantReleasesAreCompatible($currently_stored_version_number,
-                                    $current_package_version_number);
-                                if (!$compatible) {
-                                    throw new \RuntimeException('Dependency ' . $current_package_name . ' is required in two incompatible versions',
-                                        2);
-                                }
-                            }
-                        }
+                //If I had stored '*', change right away with the more specific version required
+                if ($currently_stored_version_number === '*') {
+                    $dependencies[$dependencyName] = $dependencyVersion;
+                } elseif (!$currently_stored_version_is_in_next_significant_release_format && !$current_package_version_is_in_next_significant_release_format) {
+                    //Comparing versions equals or higher, a simple version_compare is enough
+                    if (version_compare($currently_stored_version_number, $current_package_version_number) === -1) {
+                        //Current package version is higher
+                        $dependencies[$dependencyName] = $dependencyVersion;
+                    }
+                } else {
+                    $compatible = $this->checkNextSignificantReleasesAreCompatible($currently_stored_version_number, $current_package_version_number);
+                    if (!$compatible) {
+                        throw new RuntimeException("Dependency {$dependencyName} is required in two incompatible versions", 2);
                     }
                 }
             }
@@ -1050,9 +1167,7 @@ private function calculateMergedDependenciesOfPackage($packageName, $dependencie
      * Calculates and merges the dependencies of the passed packages
      *
      * @param array $packages
-     *
-     * @return mixed
-     * @throws \Exception
+     * @return array
      */
     public function calculateMergedDependenciesOfPackages($packages)
     {
@@ -1075,8 +1190,7 @@ public function calculateMergedDependenciesOfPackages($packages)
      *      $versionInformation == '' => returns null
      *
      * @param string $version
-     *
-     * @return null|string
+     * @return string|null
      */
     public function calculateVersionNumberFromDependencyVersion($version)
     {
@@ -1102,7 +1216,6 @@ public function calculateVersionNumberFromDependencyVersion($version)
      * Example: returns true for $version: '~2.0'
      *
      * @param string $version
-     *
      * @return bool
      */
     public function versionFormatIsNextSignificantRelease($version): bool
@@ -1116,7 +1229,6 @@ public function versionFormatIsNextSignificantRelease($version): bool
      * Example: returns true for $version: '>=2.0'
      *
      * @param string $version
-     *
      * @return bool
      */
     public function versionFormatIsEqualOrHigher($version): bool
@@ -1134,7 +1246,6 @@ public function versionFormatIsEqualOrHigher($version): bool
      *
      * @param string $version1 the version string (e.g. '2.0.0' or '1.0')
      * @param string $version2 the version string (e.g. '2.0.0' or '1.0')
-     *
      * @return bool
      */
     public function checkNextSignificantReleasesAreCompatible($version1, $version2): bool
@@ -1142,13 +1253,13 @@ public function checkNextSignificantReleasesAreCompatible($version1, $version2):
         $version1array = explode('.', $version1);
         $version2array = explode('.', $version2);
 
-        if (\count($version1array) > \count($version2array)) {
-            list($version1array, $version2array) = [$version2array, $version1array];
+        if (count($version1array) > count($version2array)) {
+            [$version1array, $version2array] = [$version2array, $version1array];
         }
 
         $i = 0;
-        while ($i < \count($version1array) - 1) {
-            if ($version1array[$i] != $version2array[$i]) {
+        while ($i < count($version1array) - 1) {
+            if ($version1array[$i] !== $version2array[$i]) {
                 return false;
             }
             $i++;
@@ -1156,5 +1267,4 @@ public function checkNextSignificantReleasesAreCompatible($version1, $version2):
 
         return true;
     }
-
 }
diff --git a/system/src/Grav/Common/GPM/Installer.php b/system/src/Grav/Common/GPM/Installer.php
index cd5116383f..8a1a5303e5 100644
--- a/system/src/Grav/Common/GPM/Installer.php
+++ b/system/src/Grav/Common/GPM/Installer.php
@@ -3,15 +3,26 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\GPM;
 
+use DirectoryIterator;
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
+use Grav\Common\Utils;
+use RuntimeException;
+use ZipArchive;
+use function count;
+use function in_array;
+use function is_string;
 
+/**
+ * Class Installer
+ * @package Grav\Common\GPM
+ */
 class Installer
 {
     /** @const No error */
@@ -33,31 +44,19 @@ class Installer
     /** @const Invalid source file */
     public const INVALID_SOURCE = 128;
 
-    /**
-     * Destination folder on which validation checks are applied
-     * @var string
-     */
+    /** @var string Destination folder on which validation checks are applied */
     protected static $target;
 
-    /**
-     * @var int Error Code
-     */
+    /** @var int|string Error code or string */
     protected static $error = 0;
 
-    /**
-     * @var int Zip Error Code
-     */
+    /** @var int Zip Error Code */
     protected static $error_zip = 0;
 
-    /**
-     * @var string Post install message
-     */
+    /** @var string Post install message */
     protected static $message = '';
 
-    /**
-     * Default options for the install
-     * @var array
-     */
+    /** @var array Default options for the install */
     protected static $options = [
         'overwrite'       => true,
         'ignore_symlinks' => true,
@@ -74,7 +73,7 @@ class Installer
      * @param  string $zip the local path to ZIP package
      * @param  string $destination The local path to the Grav Instance
      * @param  array $options Options to use for installing. ie, ['install_path' => 'user/themes/antimatter']
-     * @param  string $extracted The local path to the extacted ZIP package
+     * @param  string|null $extracted The local path to the extacted ZIP package
      * @param  bool $keepExtracted True if you want to keep the original files
      * @return bool True if everything went fine, False otherwise.
      */
@@ -84,8 +83,10 @@ public static function install($zip, $destination, $options = [], $extracted = n
         $options = array_merge(self::$options, $options);
         $install_path = rtrim($destination . DS . ltrim($options['install_path'], DS), DS);
 
-        if (!self::isGravInstance($destination) || !self::isValidDestination($install_path,
-                $options['exclude_checks'])
+        if (!self::isGravInstance($destination) || !self::isValidDestination(
+            $install_path,
+            $options['exclude_checks']
+        )
         ) {
             return false;
         }
@@ -135,7 +136,10 @@ public static function install($zip, $destination, $options = [], $extracted = n
         }
 
         if (!$options['sophisticated']) {
-            if ($options['theme']) {
+            $isTheme = $options['theme'] ?? false;
+            // Make sure that themes are always being copied, even if option was not set!
+            $isTheme = $isTheme || preg_match('|/themes/[^/]+|ui', $install_path);
+            if ($isTheme) {
                 self::copyInstall($extracted, $install_path);
             } else {
                 self::moveInstall($extracted, $install_path);
@@ -160,7 +164,6 @@ public static function install($zip, $destination, $options = [], $extracted = n
         self::$error = self::OK;
 
         return true;
-
     }
 
     /**
@@ -168,11 +171,11 @@ public static function install($zip, $destination, $options = [], $extracted = n
      *
      * @param string $zip_file
      * @param string $destination
-     * @return bool|string
+     * @return string|false
      */
     public static function unZip($zip_file, $destination)
     {
-        $zip = new \ZipArchive();
+        $zip = new ZipArchive();
         $archive = $zip->open($zip_file);
 
         if ($archive === true) {
@@ -188,7 +191,11 @@ public static function unZip($zip_file, $destination)
                 return false;
             }
 
-            $package_folder_name = preg_replace('#\./$#', '', $zip->getNameIndex(0));
+            $package_folder_name = $zip->getNameIndex(0);
+            if ($package_folder_name === false) {
+                throw new \RuntimeException('Bad package file: ' . Utils::basename($zip_file));
+            }
+            $package_folder_name = preg_replace('#\./$#', '', $package_folder_name);
             $zip->close();
 
             return $destination . '/' . $package_folder_name;
@@ -196,6 +203,7 @@ public static function unZip($zip_file, $destination)
 
         self::$error = self::ZIP_EXTRACT_ERROR;
         self::$error_zip = $archive;
+
         return false;
     }
 
@@ -204,23 +212,20 @@ public static function unZip($zip_file, $destination)
      *
      * @param string $installer_file_folder The folder path that contains install.php
      * @param bool $is_install True if install, false if removal
-     *
-     * @return null|string
+     * @return string|null
      */
     private static function loadInstaller($installer_file_folder, $is_install)
     {
-        $installer = null;
-
         $installer_file_folder = rtrim($installer_file_folder, DS);
 
         $install_file = $installer_file_folder . DS . 'install.php';
 
-        if (file_exists($install_file)) {
-            require_once $install_file;
-        } else {
+        if (!file_exists($install_file)) {
             return null;
         }
 
+        require_once $install_file;
+
         if ($is_install) {
             $slug = '';
             if (($pos = strpos($installer_file_folder, 'grav-plugin-')) !== false) {
@@ -243,19 +248,18 @@ private static function loadInstaller($installer_file_folder, $is_install)
             return $class_name;
         }
 
-        $class_name_alphanumeric = preg_replace('/[^a-zA-Z0-9]+/', '', $class_name);
+        $class_name_alphanumeric = preg_replace('/[^a-zA-Z0-9]+/', '', $class_name) ?? $class_name;
 
         if (class_exists($class_name_alphanumeric)) {
             return $class_name_alphanumeric;
         }
 
-        return $installer;
+        return null;
     }
 
     /**
      * @param string            $source_path
      * @param string            $install_path
-     *
      * @return bool
      */
     public static function moveInstall($source_path, $install_path)
@@ -272,13 +276,12 @@ public static function moveInstall($source_path, $install_path)
     /**
      * @param string            $source_path
      * @param string            $install_path
-     *
      * @return bool
      */
     public static function copyInstall($source_path, $install_path)
     {
         if (empty($source_path)) {
-            throw new \RuntimeException("Directory $source_path is missing");
+            throw new RuntimeException("Directory $source_path is missing");
         }
 
         Folder::rcopy($source_path, $install_path);
@@ -291,14 +294,12 @@ public static function copyInstall($source_path, $install_path)
      * @param string            $install_path
      * @param array             $ignores
      * @param bool              $keep_source
-     *
      * @return bool
      */
     public static function sophisticatedInstall($source_path, $install_path, $ignores = [], $keep_source = false)
     {
-        foreach (new \DirectoryIterator($source_path) as $file) {
-
-            if ($file->isLink() || $file->isDot() || \in_array($file->getFilename(), $ignores, true)) {
+        foreach (new DirectoryIterator($source_path) as $file) {
+            if ($file->isLink() || $file->isDot() || in_array($file->getFilename(), $ignores, true)) {
                 continue;
             }
 
@@ -313,7 +314,8 @@ public static function sophisticatedInstall($source_path, $install_path, $ignore
                 }
 
                 if ($file->getFilename() === 'bin') {
-                    foreach (glob($path . DS . '*') as $bin_file) {
+                    $glob = glob($path . DS . '*') ?: [];
+                    foreach ($glob as $bin_file) {
                         @chmod($bin_file, 0755);
                     }
                 }
@@ -331,7 +333,6 @@ public static function sophisticatedInstall($source_path, $install_path, $ignore
      *
      * @param  string $path    The slug of the package(s)
      * @param  array  $options Options to use for uninstalling
-     *
      * @return bool True if everything went fine, False otherwise.
      */
     public static function uninstall($path, $options = [])
@@ -373,7 +374,6 @@ public static function uninstall($path, $options = [])
      *
      * @param  string $destination The directory to run validations at
      * @param  array  $exclude     An array of constants to exclude from the validation
-     *
      * @return bool True if validation passed. False otherwise
      */
     public static function isValidDestination($destination, $exclude = [])
@@ -391,7 +391,7 @@ public static function isValidDestination($destination, $exclude = [])
             self::$error = self::NOT_DIRECTORY;
         }
 
-        if (\count($exclude) && \in_array(self::$error, $exclude, true)) {
+        if (count($exclude) && in_array(self::$error, $exclude, true)) {
             return true;
         }
 
@@ -402,7 +402,6 @@ public static function isValidDestination($destination, $exclude = [])
      * Validates if the given path is a Grav Instance
      *
      * @param  string $target The local path to the Grav Instance
-     *
      * @return bool True if is a Grav Instance. False otherwise
      */
     public static function isGravInstance($target)
@@ -410,8 +409,7 @@ public static function isGravInstance($target)
         self::$error = 0;
         self::$target = $target;
 
-        if (
-            !file_exists($target . DS . 'index.php') ||
+        if (!file_exists($target . DS . 'index.php') ||
             !file_exists($target . DS . 'bin') ||
             !file_exists($target . DS . 'user') ||
             !file_exists($target . DS . 'system' . DS . 'config' . DS . 'system.yaml')
@@ -424,6 +422,7 @@ public static function isGravInstance($target)
 
     /**
      * Returns the last message added by the installer
+     *
      * @return string The message
      */
     public static function getMessage()
@@ -433,6 +432,7 @@ public static function getMessage()
 
     /**
      * Returns the last error occurred in a string message format
+     *
      * @return string The message of the last error
      */
     public static function lastErrorMsg()
@@ -473,36 +473,36 @@ public static function lastErrorMsg()
             case self::ZIP_EXTRACT_ERROR:
                 $msg = 'Unable to extract the package. ';
                 if (self::$error_zip) {
-                    switch(self::$error_zip) {
-                        case \ZipArchive::ER_EXISTS:
+                    switch (self::$error_zip) {
+                        case ZipArchive::ER_EXISTS:
                             $msg .= 'File already exists.';
                             break;
 
-                        case \ZipArchive::ER_INCONS:
+                        case ZipArchive::ER_INCONS:
                             $msg .= 'Zip archive inconsistent.';
                             break;
 
-                        case \ZipArchive::ER_MEMORY:
+                        case ZipArchive::ER_MEMORY:
                             $msg .= 'Memory allocation failure.';
                             break;
 
-                        case \ZipArchive::ER_NOENT:
+                        case ZipArchive::ER_NOENT:
                             $msg .= 'No such file.';
                             break;
 
-                        case \ZipArchive::ER_NOZIP:
+                        case ZipArchive::ER_NOZIP:
                             $msg .= 'Not a zip archive.';
                             break;
 
-                        case \ZipArchive::ER_OPEN:
+                        case ZipArchive::ER_OPEN:
                             $msg .= "Can't open file.";
                             break;
 
-                        case \ZipArchive::ER_READ:
+                        case ZipArchive::ER_READ:
                             $msg .= 'Read error.';
                             break;
 
-                        case \ZipArchive::ER_SEEK:
+                        case ZipArchive::ER_SEEK:
                             $msg .= 'Seek error.';
                             break;
                     }
@@ -523,6 +523,7 @@ public static function lastErrorMsg()
 
     /**
      * Returns the last error code of the occurred error
+     *
      * @return int|string The code of the last error
      */
     public static function lastErrorCode()
@@ -534,8 +535,8 @@ public static function lastErrorCode()
      * Allows to manually set an error
      *
      * @param int|string $error the Error code
+     * @return void
      */
-
     public static function setError($error)
     {
         self::$error = $error;
diff --git a/system/src/Grav/Common/GPM/Licenses.php b/system/src/Grav/Common/GPM/Licenses.php
index 14c9258321..e932bd4f76 100644
--- a/system/src/Grav/Common/GPM/Licenses.php
+++ b/system/src/Grav/Common/GPM/Licenses.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,6 +11,8 @@
 
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Grav;
+use RocketTheme\Toolbox\File\FileInterface;
+use function is_string;
 
 /**
  * Class Licenses
@@ -19,23 +21,16 @@
  */
 class Licenses
 {
-
-    /**
-     * Regex to validate the format of a License
-     *
-     * @var string
-     */
+    /** @var string Regex to validate the format of a License */
     protected static $regex = '^(?:[A-F0-9]{8}-){3}(?:[A-F0-9]{8}){1}$';
-
+    /** @var FileInterface */
     protected static $file;
 
-
     /**
      * Returns the license for a Premium package
      *
      * @param string $slug
      * @param string $license
-     *
      * @return bool
      */
     public static function set($slug, $license)
@@ -48,7 +43,7 @@ public static function set($slug, $license)
             return false;
         }
 
-        if (!\is_string($license)) {
+        if (!is_string($license)) {
             if (isset($data['licenses'][$slug])) {
                 unset($data['licenses'][$slug]);
             } else {
@@ -67,21 +62,21 @@ public static function set($slug, $license)
     /**
      * Returns the license for a Premium package
      *
-     * @param string $slug
-     *
-     * @return array|string
+     * @param string|null $slug
+     * @return string[]|string
      */
     public static function get($slug = null)
     {
         $licenses = self::getLicenseFile();
         $data = (array)$licenses->content();
         $licenses->free();
-        $slug = strtolower($slug);
 
-        if (!$slug) {
+        if (null === $slug) {
             return $data['licenses'] ?? [];
         }
 
+        $slug = strtolower($slug);
+
         return $data['licenses'][$slug] ?? '';
     }
 
@@ -89,8 +84,7 @@ public static function get($slug = null)
     /**
      * Validates the License format
      *
-     * @param string $license
-     *
+     * @param string|null $license
      * @return bool
      */
     public static function validate($license = null)
@@ -99,16 +93,15 @@ public static function validate($license = null)
             return false;
         }
 
-        return preg_match('#' . self::$regex. '#', $license);
+        return (bool)preg_match('#' . self::$regex. '#', $license);
     }
 
     /**
      * Get the License File object
      *
-     * @return \RocketTheme\Toolbox\File\FileInterface
+     * @return FileInterface
      */
     public static function getLicenseFile()
-
     {
         if (!isset(self::$file)) {
             $path = Grav::instance()['locator']->findResource('user-data://') . '/licenses.yaml';
diff --git a/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php b/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php
index be565c9c96..bc7ceab5e3 100644
--- a/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php
+++ b/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,8 +11,17 @@
 
 use Grav\Common\GPM\Common\AbstractPackageCollection as BaseCollection;
 
+/**
+ * Class AbstractPackageCollection
+ * @package Grav\Common\GPM\Local
+ */
 abstract class AbstractPackageCollection extends BaseCollection
 {
+    /**
+     * AbstractPackageCollection constructor.
+     *
+     * @param array $items
+     */
     public function __construct($items)
     {
         parent::__construct();
diff --git a/system/src/Grav/Common/GPM/Local/Package.php b/system/src/Grav/Common/GPM/Local/Package.php
index ff797a78c5..08444a76df 100644
--- a/system/src/Grav/Common/GPM/Local/Package.php
+++ b/system/src/Grav/Common/GPM/Local/Package.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,11 +11,22 @@
 
 use Grav\Common\Data\Data;
 use Grav\Common\GPM\Common\Package as BasePackage;
+use Parsedown;
 
+/**
+ * Class Package
+ * @package Grav\Common\GPM\Local
+ */
 class Package extends BasePackage
 {
+    /** @var array */
     protected $settings;
 
+    /**
+     * Package constructor.
+     * @param Data $package
+     * @param string|null $package_type
+     */
     public function __construct(Data $package, $package_type = null)
     {
         $data = new Data($package->blueprints()->toArray());
@@ -23,7 +34,7 @@ public function __construct(Data $package, $package_type = null)
 
         $this->settings = $package->toArray();
 
-        $html_description = \Parsedown::instance()->line($this->__get('description'));
+        $html_description = Parsedown::instance()->line($this->__get('description'));
         $this->data->set('slug', $package->__get('slug'));
         $this->data->set('description_html', $html_description);
         $this->data->set('description_plain', strip_tags($html_description));
@@ -31,10 +42,10 @@ public function __construct(Data $package, $package_type = null)
     }
 
     /**
-     * @return mixed
+     * @return bool
      */
     public function isEnabled()
     {
-        return $this->settings['enabled'];
+        return (bool)$this->settings['enabled'];
     }
 }
diff --git a/system/src/Grav/Common/GPM/Local/Packages.php b/system/src/Grav/Common/GPM/Local/Packages.php
index 14a0b0b47b..b63b93b546 100644
--- a/system/src/Grav/Common/GPM/Local/Packages.php
+++ b/system/src/Grav/Common/GPM/Local/Packages.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,6 +11,10 @@
 
 use Grav\Common\GPM\Common\CachedCollection;
 
+/**
+ * Class Packages
+ * @package Grav\Common\GPM\Local
+ */
 class Packages extends CachedCollection
 {
     public function __construct()
diff --git a/system/src/Grav/Common/GPM/Local/Plugins.php b/system/src/Grav/Common/GPM/Local/Plugins.php
index 19adfb88ea..a1626f8bac 100644
--- a/system/src/Grav/Common/GPM/Local/Plugins.php
+++ b/system/src/Grav/Common/GPM/Local/Plugins.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,11 +11,13 @@
 
 use Grav\Common\Grav;
 
+/**
+ * Class Plugins
+ * @package Grav\Common\GPM\Local
+ */
 class Plugins extends AbstractPackageCollection
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $type = 'plugins';
 
     /**
diff --git a/system/src/Grav/Common/GPM/Local/Themes.php b/system/src/Grav/Common/GPM/Local/Themes.php
index 8607e6b7f2..d153794398 100644
--- a/system/src/Grav/Common/GPM/Local/Themes.php
+++ b/system/src/Grav/Common/GPM/Local/Themes.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,11 +11,13 @@
 
 use Grav\Common\Grav;
 
+/**
+ * Class Themes
+ * @package Grav\Common\GPM\Local
+ */
 class Themes extends AbstractPackageCollection
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $type = 'themes';
 
     /**
@@ -23,6 +25,9 @@ class Themes extends AbstractPackageCollection
      */
     public function __construct()
     {
-        parent::__construct(Grav::instance()['themes']->all());
+        /** @var \Grav\Common\Themes $themes */
+        $themes = Grav::instance()['themes'];
+
+        parent::__construct($themes->all());
     }
 }
diff --git a/system/src/Grav/Common/GPM/Remote/AbstractPackageCollection.php b/system/src/Grav/Common/GPM/Remote/AbstractPackageCollection.php
index 429c5b1dc5..d8663dc8d1 100644
--- a/system/src/Grav/Common/GPM/Remote/AbstractPackageCollection.php
+++ b/system/src/Grav/Common/GPM/Remote/AbstractPackageCollection.php
@@ -3,47 +3,46 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\GPM\Remote;
 
 use Grav\Common\Grav;
+use Grav\Common\HTTP\Response;
 use Grav\Common\GPM\Common\AbstractPackageCollection as BaseCollection;
-use Grav\Common\GPM\Response;
 use \Doctrine\Common\Cache\FilesystemCache;
+use RuntimeException;
 
+/**
+ * Class AbstractPackageCollection
+ * @package Grav\Common\GPM\Remote
+ */
 class AbstractPackageCollection extends BaseCollection
 {
-    /**
-     * The cached data previously fetched
-     * @var string
-     */
+    /** @var string The cached data previously fetched */
     protected $raw;
-
-    /**
-     * The lifetime to store the entry in seconds
-     * @var int
-     */
-    private $lifetime = 86400;
-
+    /** @var string */
     protected $repository;
-
+    /** @var FilesystemCache */
     protected $cache;
 
+    /** @var int The lifetime to store the entry in seconds */
+    private $lifetime = 86400;
+
     /**
      * AbstractPackageCollection constructor.
      *
-     * @param null $repository
+     * @param string|null $repository
      * @param bool $refresh
-     * @param null $callback
+     * @param callable|null $callback
      */
     public function __construct($repository = null, $refresh = false, $callback = null)
     {
         parent::__construct();
         if ($repository === null) {
-            throw new \RuntimeException('A repository is required to indicate the origin of the remote collection');
+            throw new RuntimeException('A repository is required to indicate the origin of the remote collection');
         }
 
         $channel = Grav::instance()['config']->get('system.gpm.releases', 'stable');
@@ -55,7 +54,7 @@ public function __construct($repository = null, $refresh = false, $callback = nu
 
         $this->fetch($refresh, $callback);
         foreach (json_decode($this->raw, true) as $slug => $data) {
-            // Temporarily fix for using multisites
+            // Temporarily fix for using multi-sites
             if (isset($data['install_path'])) {
                 $path = preg_replace('~^user/~i', 'user://', $data['install_path']);
                 $data['install_path'] = Grav::instance()['locator']->findResource($path, false, true);
@@ -64,6 +63,11 @@ public function __construct($repository = null, $refresh = false, $callback = nu
         }
     }
 
+    /**
+     * @param bool $refresh
+     * @param callable|null $callback
+     * @return string
+     */
     public function fetch($refresh = false, $callback = null)
     {
         if (!$this->raw || $refresh) {
diff --git a/system/src/Grav/Common/GPM/Remote/GravCore.php b/system/src/Grav/Common/GPM/Remote/GravCore.php
index 1d30120d02..2998975cfe 100644
--- a/system/src/Grav/Common/GPM/Remote/GravCore.php
+++ b/system/src/Grav/Common/GPM/Remote/GravCore.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,20 +11,30 @@
 
 use Grav\Common\Grav;
 use \Doctrine\Common\Cache\FilesystemCache;
+use InvalidArgumentException;
 
+/**
+ * Class GravCore
+ * @package Grav\Common\GPM\Remote
+ */
 class GravCore extends AbstractPackageCollection
 {
+    /** @var string */
     protected $repository = 'https://getgrav.org/downloads/grav.json';
-    private $data;
 
+    /** @var array */
+    private $data;
+    /** @var string */
     private $version;
+    /** @var string */
     private $date;
+    /** @var string|null */
     private $min_php;
 
     /**
      * @param bool $refresh
-     * @param null $callback
-     * @throws \InvalidArgumentException
+     * @param callable|null $callback
+     * @throws InvalidArgumentException
      */
     public function __construct($refresh = false, $callback = null)
     {
@@ -61,8 +71,7 @@ public function getAssets()
     /**
      * Returns the changelog list for each version of Grav
      *
-     * @param string $diff the version number to start the diff from
-     *
+     * @param string|null $diff the version number to start the diff from
      * @return array changelog list for each version
      */
     public function getChangelog($diff = null)
@@ -118,14 +127,15 @@ public function getVersion()
     /**
      * Returns the minimum PHP version
      *
-     * @return null|string
+     * @return string
      */
     public function getMinPHPVersion()
     {
         // If non min set, assume current PHP version
         if (null === $this->min_php) {
-            $this->min_php = phpversion();
+            $this->min_php = PHP_VERSION;
         }
+
         return $this->min_php;
     }
 
diff --git a/system/src/Grav/Common/GPM/Remote/Package.php b/system/src/Grav/Common/GPM/Remote/Package.php
index 196e92bd9e..519325551e 100644
--- a/system/src/Grav/Common/GPM/Remote/Package.php
+++ b/system/src/Grav/Common/GPM/Remote/Package.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,16 +12,55 @@
 use Grav\Common\Data\Data;
 use Grav\Common\GPM\Common\Package as BasePackage;
 
+/**
+ * Class Package
+ * @package Grav\Common\GPM\Remote
+ */
 class Package extends BasePackage implements \JsonSerializable
 {
+    /**
+     * Package constructor.
+     * @param array $package
+     * @param string|null $package_type
+     */
     public function __construct($package, $package_type = null)
     {
         $data = new Data($package);
         parent::__construct($data, $package_type);
     }
 
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
-        return $this->data;
+        return $this->data->toArray();
+    }
+
+    /**
+     * Returns the changelog list for each version of a package
+     *
+     * @param string|null $diff the version number to start the diff from
+     * @return array changelog list for each version
+     */
+    public function getChangelog($diff = null)
+    {
+        if (!$diff) {
+            return $this->data['changelog'];
+        }
+
+        $diffLog = [];
+        foreach ((array)$this->data['changelog'] as $version => $changelog) {
+            preg_match("/[\w\-.]+/", $version, $cleanVersion);
+
+            if (!$cleanVersion || version_compare($diff, $cleanVersion[0], '>=')) {
+                continue;
+            }
+
+            $diffLog[$version] = $changelog;
+        }
+
+        return $diffLog;
     }
 }
diff --git a/system/src/Grav/Common/GPM/Remote/Packages.php b/system/src/Grav/Common/GPM/Remote/Packages.php
index 46bc31fff3..0ac2ef967d 100644
--- a/system/src/Grav/Common/GPM/Remote/Packages.php
+++ b/system/src/Grav/Common/GPM/Remote/Packages.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,8 +11,17 @@
 
 use Grav\Common\GPM\Common\CachedCollection;
 
+/**
+ * Class Packages
+ * @package Grav\Common\GPM\Remote
+ */
 class Packages extends CachedCollection
 {
+    /**
+     * Packages constructor.
+     * @param bool $refresh
+     * @param callable|null $callback
+     */
     public function __construct($refresh = false, $callback = null)
     {
         $items = [
diff --git a/system/src/Grav/Common/GPM/Remote/Plugins.php b/system/src/Grav/Common/GPM/Remote/Plugins.php
index 1d905e3785..8383cd7820 100644
--- a/system/src/Grav/Common/GPM/Remote/Plugins.php
+++ b/system/src/Grav/Common/GPM/Remote/Plugins.php
@@ -3,25 +3,27 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\GPM\Remote;
 
+/**
+ * Class Plugins
+ * @package Grav\Common\GPM\Remote
+ */
 class Plugins extends AbstractPackageCollection
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $type = 'plugins';
-
+    /** @var string */
     protected $repository = 'https://getgrav.org/downloads/plugins.json';
 
     /**
      * Local Plugins Constructor
      * @param bool $refresh
-     * @param callable $callback Either a function or callback in array notation
+     * @param callable|null $callback Either a function or callback in array notation
      */
     public function __construct($refresh = false, $callback = null)
     {
diff --git a/system/src/Grav/Common/GPM/Remote/Themes.php b/system/src/Grav/Common/GPM/Remote/Themes.php
index 8024b40c6d..a8ee9fae22 100644
--- a/system/src/Grav/Common/GPM/Remote/Themes.php
+++ b/system/src/Grav/Common/GPM/Remote/Themes.php
@@ -3,25 +3,27 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\GPM\Remote;
 
+/**
+ * Class Themes
+ * @package Grav\Common\GPM\Remote
+ */
 class Themes extends AbstractPackageCollection
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $type = 'themes';
-
+    /** @var string */
     protected $repository = 'https://getgrav.org/downloads/themes.json';
 
     /**
      * Local Themes Constructor
      * @param bool $refresh
-     * @param callable $callback Either a function or callback in array notation
+     * @param callable|null $callback Either a function or callback in array notation
      */
     public function __construct($refresh = false, $callback = null)
     {
diff --git a/system/src/Grav/Common/GPM/Response.php b/system/src/Grav/Common/GPM/Response.php
index 72276076db..98654b6a1b 100644
--- a/system/src/Grav/Common/GPM/Response.php
+++ b/system/src/Grav/Common/GPM/Response.php
@@ -1,434 +1,3 @@
 <?php
-
-/**
- * @package    Grav\Common\GPM
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\GPM;
-
-use Grav\Common\Utils;
-use Grav\Common\Grav;
-
-class Response
-{
-    /**
-     * The callback for the progress
-     *
-     * @var callable    Either a function or callback in array notation
-     */
-    public static $callback = null;
-
-    /**
-     * Which method to use for HTTP calls, can be 'curl', 'fopen' or 'auto'. Auto is default and fopen is the preferred method
-     *
-     * @var string
-     */
-    private static $method = 'auto';
-
-    /**
-     * Default parameters for `curl` and `fopen`
-     *
-     * @var array
-     */
-    private static $defaults = [
-
-        'curl'  => [
-            CURLOPT_REFERER        => 'Grav GPM',
-            CURLOPT_USERAGENT      => 'Grav GPM',
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_FAILONERROR    => true,
-            CURLOPT_TIMEOUT        => 15,
-            CURLOPT_HEADER         => false,
-            //CURLOPT_SSL_VERIFYPEER => true, // this is set in the constructor since it's a setting
-            /**
-             * Example of callback parameters from within your own class
-             */
-            //CURLOPT_NOPROGRESS     => false,
-            //CURLOPT_PROGRESSFUNCTION => [$this, 'progress']
-        ],
-        'fopen' => [
-            'method'           => 'GET',
-            'user_agent'       => 'Grav GPM',
-            'max_redirects'    => 5,
-            'follow_location'  => 1,
-            'timeout'          => 15,
-            /* // this is set in the constructor since it's a setting
-            'ssl'              => [
-                'verify_peer'      => true,
-                'verify_peer_name' => true,
-            ],
-            */
-            /**
-             * Example of callback parameters from within your own class
-             */
-            //'notification' => [$this, 'progress']
-        ]
-    ];
-
-    /**
-     * Sets the preferred method to use for making HTTP calls.
-     *
-     * @param string $method Default is `auto`
-     *
-     * @return Response
-     */
-    public static function setMethod($method = 'auto')
-    {
-        if (!\in_array($method, ['auto', 'curl', 'fopen'], true)) {
-            $method = 'auto';
-        }
-
-        self::$method = $method;
-
-        return new self();
-    }
-
-    /**
-     * Makes a request to the URL by using the preferred method
-     *
-     * @param  string   $uri      URL to call
-     * @param  array    $options  An array of parameters for both `curl` and `fopen`
-     * @param  callable $callback Either a function or callback in array notation
-     *
-     * @return string The response of the request
-     */
-    public static function get($uri = '', $options = [], $callback = null)
-    {
-        if (!self::isCurlAvailable() && !self::isFopenAvailable()) {
-            throw new \RuntimeException('Could not start an HTTP request. `allow_url_open` is disabled and `cURL` is not available');
-        }
-
-        // check if this function is available, if so use it to stop any timeouts
-        try {
-            if (function_exists('set_time_limit') && !Utils::isFunctionDisabled('set_time_limit')) {
-                set_time_limit(0);
-            }
-        } catch (\Exception $e) {
-        }
-
-        $config = Grav::instance()['config'];
-        $overrides = [];
-
-        // Override CA Bundle
-        $caPathOrFile = \Composer\CaBundle\CaBundle::getSystemCaRootBundlePath();
-        if (is_dir($caPathOrFile) || (is_link($caPathOrFile) && is_dir(readlink($caPathOrFile)))) {
-            $overrides['curl'][CURLOPT_CAPATH] = $caPathOrFile;
-            $overrides['fopen']['ssl']['capath'] = $caPathOrFile;
-        } else {
-            $overrides['curl'][CURLOPT_CAINFO] = $caPathOrFile;
-            $overrides['fopen']['ssl']['cafile'] = $caPathOrFile;
-        }
-
-        // SSL Verify Peer and Proxy Setting
-        $settings = [
-            'method'      => $config->get('system.gpm.method', self::$method),
-            'verify_peer' => $config->get('system.gpm.verify_peer', true),
-            // `system.proxy_url` is for fallback
-            // introduced with 1.1.0-beta.1 probably safe to remove at some point
-            'proxy_url'   => $config->get('system.gpm.proxy_url', $config->get('system.proxy_url', false)),
-        ];
-
-        if (!$settings['verify_peer']) {
-            $overrides = array_replace_recursive([], $overrides, [
-                'curl' => [
-                    CURLOPT_SSL_VERIFYPEER => $settings['verify_peer']
-                ],
-                'fopen' => [
-                    'ssl' => [
-                        'verify_peer' => $settings['verify_peer'],
-                        'verify_peer_name' => $settings['verify_peer'],
-                    ]
-                ]
-            ]);
-        }
-
-        // Proxy Setting
-        if ($settings['proxy_url']) {
-            $proxy = parse_url($settings['proxy_url']);
-            $fopen_proxy = ($proxy['scheme'] ?: 'http') . '://' . $proxy['host'] . (isset($proxy['port']) ? ':' . $proxy['port'] : '');
-
-            $overrides = array_replace_recursive([], $overrides, [
-                'curl' => [
-                    CURLOPT_PROXY => $proxy['host'],
-                    CURLOPT_PROXYTYPE => 'HTTP'
-                ],
-                'fopen' => [
-                    'proxy'           => $fopen_proxy,
-                    'request_fulluri' => true
-                ]
-            ]);
-
-            if (isset($proxy['port'])) {
-                $overrides['curl'][CURLOPT_PROXYPORT] = $proxy['port'];
-            }
-
-            if (isset($proxy['user'], $proxy['pass'])) {
-                $fopen_auth = $auth = base64_encode($proxy['user'] . ':' . $proxy['pass']);
-                $overrides['curl'][CURLOPT_PROXYUSERPWD] = $proxy['user'] . ':' . $proxy['pass'];
-                $overrides['fopen']['header'] = "Proxy-Authorization: Basic $fopen_auth";
-            }
-        }
-
-        $options = array_replace_recursive(self::$defaults, $options, $overrides);
-        $method  = 'get' . ucfirst(strtolower($settings['method']));
-
-        self::$callback = $callback;
-        return static::$method($uri, $options, $callback);
-    }
-
-    /**
-     * Checks if cURL is available
-     *
-     * @return bool
-     */
-    public static function isCurlAvailable()
-    {
-        return function_exists('curl_version');
-    }
-
-    /**
-     * Checks if the remote fopen request is enabled in PHP
-     *
-     * @return bool
-     */
-    public static function isFopenAvailable()
-    {
-        return preg_match('/1|yes|on|true/i', ini_get('allow_url_fopen'));
-    }
-
-    /**
-     * Is this a remote file or not
-     *
-     * @param string $file
-     * @return bool
-     */
-    public static function isRemote($file)
-    {
-        return (bool) filter_var($file, FILTER_VALIDATE_URL);
-    }
-
-    /**
-     * Progress normalized for cURL and Fopen
-     * Accepts a variable length of arguments passed in by stream method
-     */
-    public static function progress()
-    {
-        static $filesize = null;
-
-        $args           = func_get_args();
-        $isCurlResource = is_resource($args[0]) && get_resource_type($args[0]) === 'curl';
-
-        $notification_code = !$isCurlResource ? $args[0] : false;
-        $bytes_transferred = $isCurlResource ? $args[2] : $args[4];
-
-        if ($isCurlResource) {
-            $filesize = $args[1];
-        } elseif ($notification_code == STREAM_NOTIFY_FILE_SIZE_IS) {
-            $filesize = $args[5];
-        }
-
-        if ($bytes_transferred > 0) {
-            if ($notification_code == STREAM_NOTIFY_PROGRESS | STREAM_NOTIFY_COMPLETED || $isCurlResource) {
-
-                $progress = [
-                    'code'        => $notification_code,
-                    'filesize'    => $filesize,
-                    'transferred' => $bytes_transferred,
-                    'percent'     => $filesize <= 0 ? '-' : round(($bytes_transferred * 100) / $filesize, 1)
-                ];
-
-                if (self::$callback !== null) {
-                    call_user_func(self::$callback, $progress);
-                }
-            }
-        }
-    }
-
-    /**
-     * Automatically picks the preferred method
-     *
-     * @return string The response of the request
-     */
-    private static function getAuto()
-    {
-        if (!ini_get('open_basedir') && self::isFopenAvailable()) {
-            return self::getFopen(func_get_args());
-        }
-
-        if (self::isCurlAvailable()) {
-            return self::getCurl(func_get_args());
-        }
-
-        return null;
-    }
-
-    /**
-     * Starts a HTTP request via fopen
-     *
-     * @return string The response of the request
-     */
-    private static function getFopen()
-    {
-        if (\count($args = func_get_args()) === 1) {
-            $args = $args[0];
-        }
-
-        $uri      = $args[0];
-        $options  = $args[1] ?? [];
-        $callback = $args[2] ?? null;
-
-        if ($callback) {
-            $options['fopen']['notification'] = ['self', 'progress'];
-        }
-
-        if (isset($options['fopen']['ssl'])) {
-            $ssl = $options['fopen']['ssl'];
-            unset($options['fopen']['ssl']);
-
-            $stream  = stream_context_create([
-                'http' => $options['fopen'],
-                'ssl' => $ssl
-            ], $options['fopen']);
-        } else {
-            $stream  = stream_context_create(['http' => $options['fopen']], $options['fopen']);
-        }
-
-
-        $content = @file_get_contents($uri, false, $stream);
-
-        if ($content === false) {
-            $code = null;
-            // Function file_get_contents() creates local variable $http_response_header, check it
-            if (isset($http_response_header)) {
-                $code = explode(' ', $http_response_header[0] ?? '')[1] ?? null;
-            }
-
-            switch ($code) {
-                case '404':
-                    throw new \RuntimeException('Page not found');
-                case '401':
-                    throw new \RuntimeException('Invalid LICENSE');
-                default:
-                    throw new \RuntimeException("Error while trying to download (code: {$code}): {$uri}\n");
-            }
-        }
-
-        return $content;
-    }
-
-    /**
-     * Starts a HTTP request via cURL
-     *
-     * @return string The response of the request
-     */
-    private static function getCurl()
-    {
-        $args = func_get_args();
-        $args = count($args) > 1 ? $args : array_shift($args);
-
-        $uri      = $args[0];
-        $options  = $args[1] ?? [];
-        $callback = $args[2] ?? null;
-
-        $ch = curl_init($uri);
-
-        $response = static::curlExecFollow($ch, $options, $callback);
-        $errno = curl_errno($ch);
-
-        if ($errno) {
-            $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-            $error_message = curl_strerror($errno) . "\n" . curl_error($ch);
-
-            switch ($code) {
-                case '404':
-                    throw new \RuntimeException('Page not found');
-                case '401':
-                    throw new \RuntimeException('Invalid LICENSE');
-                default:
-                    throw new \RuntimeException("Error while trying to download (code: $code): $uri \nMessage: $error_message");
-            }
-        }
-
-        curl_close($ch);
-
-        return $response;
-    }
-
-    /**
-     * @param resource $ch
-     * @param array $options
-     * @param bool $callback
-     *
-     * @return bool|mixed
-     */
-    private static function curlExecFollow($ch, $options, $callback)
-    {
-        if ($callback) {
-            curl_setopt_array(
-                $ch,
-                [
-                    CURLOPT_NOPROGRESS       => false,
-                    CURLOPT_PROGRESSFUNCTION => ['self', 'progress']
-                ]
-            );
-        }
-
-        // no open_basedir set, we can proceed normally
-        if (!ini_get('open_basedir')) {
-            curl_setopt_array($ch, $options['curl']);
-            return curl_exec($ch);
-        }
-
-        $max_redirects = $options['curl'][CURLOPT_MAXREDIRS] ?? 5;
-        $options['curl'][CURLOPT_FOLLOWLOCATION] = false;
-
-        // open_basedir set but no redirects to follow, we can disable followlocation and proceed normally
-        curl_setopt_array($ch, $options['curl']);
-        if ($max_redirects <= 0) {
-            return curl_exec($ch);
-        }
-
-        $uri = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
-        $rch = curl_copy_handle($ch);
-
-        curl_setopt($rch, CURLOPT_HEADER, true);
-        curl_setopt($rch, CURLOPT_NOBODY, true);
-        curl_setopt($rch, CURLOPT_FORBID_REUSE, false);
-        curl_setopt($rch, CURLOPT_RETURNTRANSFER, true);
-
-        do {
-            curl_setopt($rch, CURLOPT_URL, $uri);
-            $header = curl_exec($rch);
-
-            if (curl_errno($rch)) {
-                $code = 0;
-            } else {
-                $code = (int)curl_getinfo($rch, CURLINFO_HTTP_CODE);
-                if ($code === 301 || $code === 302 || $code === 303) {
-                    preg_match('/Location:(.*?)\n/', $header, $matches);
-                    $uri = trim(array_pop($matches));
-                } else {
-                    $code = 0;
-                }
-            }
-        } while ($code && --$max_redirects);
-
-        curl_close($rch);
-
-        if (!$max_redirects) {
-            if ($max_redirects === null) {
-                trigger_error('Too many redirects. When following redirects, libcurl hit the maximum amount.', E_USER_WARNING);
-            }
-
-            return false;
-        }
-
-        curl_setopt($ch, CURLOPT_URL, $uri);
-
-        return curl_exec($ch);
-    }
-}
+// Create alias for the deprecated class.
+class_alias(\Grav\Common\HTTP\Response::class, \Grav\Common\GPM\Response::class);
diff --git a/system/src/Grav/Common/GPM/Upgrader.php b/system/src/Grav/Common/GPM/Upgrader.php
index 5d9406d5a1..b3e68696d5 100644
--- a/system/src/Grav/Common/GPM/Upgrader.php
+++ b/system/src/Grav/Common/GPM/Upgrader.php
@@ -3,13 +3,14 @@
 /**
  * @package    Grav\Common\GPM
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\GPM;
 
 use Grav\Common\GPM\Remote\GravCore;
+use InvalidArgumentException;
 
 /**
  * Class Upgrader
@@ -18,21 +19,18 @@
  */
 class Upgrader
 {
-    /**
-     * Remote details about latest Grav version
-     *
-     * @var GravCore
-     */
+    /** @var GravCore Remote details about latest Grav version */
     private $remote;
 
+    /** @var string|null */
     private $min_php;
 
     /**
      * Creates a new GPM instance with Local and Remote packages available
      *
      * @param boolean  $refresh  Applies to Remote Packages only and forces a refetch of data
-     * @param callable $callback Either a function or callback in array notation
-     * @throws \InvalidArgumentException
+     * @param callable|null $callback Either a function or callback in array notation
+     * @throws InvalidArgumentException
      */
     public function __construct($refresh = false, $callback = null)
     {
@@ -82,8 +80,7 @@ public function getAssets()
     /**
      * Returns the changelog list for each version of Grav
      *
-     * @param string $diff the version number to start the diff from
-     *
+     * @param string|null $diff the version number to start the diff from
      * @return array return the changelog list for each version
      */
     public function getChangelog($diff = null)
@@ -98,8 +95,7 @@ public function getChangelog($diff = null)
      */
     public function meetsRequirements()
     {
-        $current_php_version = phpversion();
-        if (version_compare($current_php_version, $this->minPHPVersion(), '<')) {
+        if (version_compare(PHP_VERSION, $this->minPHPVersion(), '<')) {
             return false;
         }
 
@@ -109,20 +105,21 @@ public function meetsRequirements()
     /**
      * Get minimum PHP version from remote
      *
-     * @return null
+     * @return string
      */
     public function minPHPVersion()
     {
         if (null === $this->min_php) {
             $this->min_php = $this->remote->getMinPHPVersion();
         }
+
         return $this->min_php;
     }
 
     /**
      * Checks if the currently installed Grav is upgradable to a newer version
      *
-     * @return boolean True if it's upgradable, False otherwise.
+     * @return bool True if it's upgradable, False otherwise.
      */
     public function isUpgradable()
     {
@@ -132,9 +129,8 @@ public function isUpgradable()
     /**
      * Checks if Grav is currently symbolically linked
      *
-     * @return boolean True if Grav is symlinked, False otherwise.
+     * @return bool True if Grav is symlinked, False otherwise.
      */
-
     public function isSymlink()
     {
         return $this->remote->isSymlink();
diff --git a/system/src/Grav/Common/Getters.php b/system/src/Grav/Common/Getters.php
index e69116e15f..ed03499d13 100644
--- a/system/src/Grav/Common/Getters.php
+++ b/system/src/Grav/Common/Getters.php
@@ -3,27 +3,32 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
-abstract class Getters implements \ArrayAccess, \Countable
+use ArrayAccess;
+use Countable;
+use function count;
+
+/**
+ * Class Getters
+ * @package Grav\Common
+ */
+abstract class Getters implements ArrayAccess, Countable
 {
-    /**
-     * Define variable used in getters.
-     *
-     * @var string
-     */
+    /** @var string Define variable used in getters. */
     protected $gettersVariable = null;
 
     /**
      * Magic setter method
      *
-     * @param mixed $offset Medium name value
+     * @param int|string $offset Medium name value
      * @param mixed $value  Medium value
      */
+    #[\ReturnTypeWillChange]
     public function __set($offset, $value)
     {
         $this->offsetSet($offset, $value);
@@ -32,10 +37,10 @@ public function __set($offset, $value)
     /**
      * Magic getter method
      *
-     * @param  mixed $offset Medium name value
-     *
+     * @param  int|string $offset Medium name value
      * @return mixed         Medium value
      */
+    #[\ReturnTypeWillChange]
     public function __get($offset)
     {
         return $this->offsetGet($offset);
@@ -44,10 +49,10 @@ public function __get($offset)
     /**
      * Magic method to determine if the attribute is set
      *
-     * @param  mixed $offset Medium name value
-     *
+     * @param  int|string $offset Medium name value
      * @return boolean         True if the value is set
      */
+    #[\ReturnTypeWillChange]
     public function __isset($offset)
     {
         return $this->offsetExists($offset);
@@ -56,18 +61,19 @@ public function __isset($offset)
     /**
      * Magic method to unset the attribute
      *
-     * @param mixed $offset The name value to unset
+     * @param int|string $offset The name value to unset
      */
+    #[\ReturnTypeWillChange]
     public function __unset($offset)
     {
         $this->offsetUnset($offset);
     }
 
     /**
-     * @param mixed $offset
-     *
+     * @param int|string $offset
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         if ($this->gettersVariable) {
@@ -80,10 +86,10 @@ public function offsetExists($offset)
     }
 
     /**
-     * @param mixed $offset
-     *
+     * @param int|string $offset
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         if ($this->gettersVariable) {
@@ -96,9 +102,10 @@ public function offsetGet($offset)
     }
 
     /**
-     * @param mixed $offset
+     * @param int|string $offset
      * @param mixed $value
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if ($this->gettersVariable) {
@@ -110,8 +117,9 @@ public function offsetSet($offset, $value)
     }
 
     /**
-     * @param mixed $offset
+     * @param int|string $offset
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         if ($this->gettersVariable) {
@@ -125,14 +133,15 @@ public function offsetUnset($offset)
     /**
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         if ($this->gettersVariable) {
             $var = $this->gettersVariable;
-            return \count($this->{$var});
+            return count($this->{$var});
         }
 
-        return \count($this->toArray());
+        return count($this->toArray());
     }
 
     /**
diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 009d57de56..d2fce73512 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -3,25 +3,24 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use Composer\Autoload\ClassLoader;
 use Grav\Common\Config\Config;
 use Grav\Common\Config\Setup;
+use Grav\Common\Helpers\Exif;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Page\Medium\ImageMedium;
 use Grav\Common\Page\Medium\Medium;
+use Grav\Common\Page\Pages;
 use Grav\Common\Processors\AssetsProcessor;
 use Grav\Common\Processors\BackupsProcessor;
-use Grav\Common\Processors\ConfigurationProcessor;
 use Grav\Common\Processors\DebuggerAssetsProcessor;
-use Grav\Common\Processors\DebuggerProcessor;
-use Grav\Common\Processors\ErrorsProcessor;
 use Grav\Common\Processors\InitializeProcessor;
-use Grav\Common\Processors\LoggerProcessor;
 use Grav\Common\Processors\PagesProcessor;
 use Grav\Common\Processors\PluginsProcessor;
 use Grav\Common\Processors\RenderProcessor;
@@ -30,13 +29,45 @@
 use Grav\Common\Processors\TasksProcessor;
 use Grav\Common\Processors\ThemesProcessor;
 use Grav\Common\Processors\TwigProcessor;
+use Grav\Common\Scheduler\Scheduler;
+use Grav\Common\Service\AccountsServiceProvider;
+use Grav\Common\Service\AssetsServiceProvider;
+use Grav\Common\Service\BackupsServiceProvider;
+use Grav\Common\Service\ConfigServiceProvider;
+use Grav\Common\Service\ErrorServiceProvider;
+use Grav\Common\Service\FilesystemServiceProvider;
+use Grav\Common\Service\FlexServiceProvider;
+use Grav\Common\Service\InflectorServiceProvider;
+use Grav\Common\Service\LoggerServiceProvider;
+use Grav\Common\Service\OutputServiceProvider;
+use Grav\Common\Service\PagesServiceProvider;
+use Grav\Common\Service\RequestServiceProvider;
+use Grav\Common\Service\SessionServiceProvider;
+use Grav\Common\Service\StreamsServiceProvider;
+use Grav\Common\Service\TaskServiceProvider;
+use Grav\Common\Twig\Twig;
 use Grav\Framework\DI\Container;
 use Grav\Framework\Psr7\Response;
+use Grav\Framework\RequestHandler\Middlewares\MultipartRequestSupport;
 use Grav\Framework\RequestHandler\RequestHandler;
+use Grav\Framework\Route\Route;
+use Grav\Framework\Session\Messages;
+use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use RocketTheme\Toolbox\Event\Event;
-use RocketTheme\Toolbox\Event\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use function array_key_exists;
+use function call_user_func_array;
+use function function_exists;
+use function get_class;
+use function in_array;
+use function is_array;
+use function is_callable;
+use function is_int;
+use function is_string;
+use function strlen;
 
 /**
  * Grav container is the heart of Grav.
@@ -45,14 +76,10 @@
  */
 class Grav extends Container
 {
-    /**
-     * @var string Processed output for the page.
-     */
+    /** @var string Processed output for the page. */
     public $output;
 
-    /**
-     * @var static The singleton instance
-     */
+    /** @var static The singleton instance */
     protected static $instance;
 
     /**
@@ -60,40 +87,38 @@ class Grav extends Container
      *            to the dependency injection container.
      */
     protected static $diMap = [
-        'Grav\Common\Service\AccountsServiceProvider',
-        'Grav\Common\Service\AssetsServiceProvider',
-        'Grav\Common\Service\BackupsServiceProvider',
-        'Grav\Common\Service\ConfigServiceProvider',
-        'Grav\Common\Service\ErrorServiceProvider',
-        'Grav\Common\Service\FilesystemServiceProvider',
-        'Grav\Common\Service\InflectorServiceProvider',
-        'Grav\Common\Service\LoggerServiceProvider',
-        'Grav\Common\Service\OutputServiceProvider',
-        'Grav\Common\Service\PagesServiceProvider',
-        'Grav\Common\Service\RequestServiceProvider',
-        'Grav\Common\Service\SessionServiceProvider',
-        'Grav\Common\Service\StreamsServiceProvider',
-        'Grav\Common\Service\TaskServiceProvider',
-        'browser'    => 'Grav\Common\Browser',
-        'cache'      => 'Grav\Common\Cache',
-        'events'     => 'RocketTheme\Toolbox\Event\EventDispatcher',
-        'exif'       => 'Grav\Common\Helpers\Exif',
-        'plugins'    => 'Grav\Common\Plugins',
-        'scheduler'  => 'Grav\Common\Scheduler\Scheduler',
-        'taxonomy'   => 'Grav\Common\Taxonomy',
-        'themes'     => 'Grav\Common\Themes',
-        'twig'       => 'Grav\Common\Twig\Twig',
-        'uri'        => 'Grav\Common\Uri',
+        AccountsServiceProvider::class,
+        AssetsServiceProvider::class,
+        BackupsServiceProvider::class,
+        ConfigServiceProvider::class,
+        ErrorServiceProvider::class,
+        FilesystemServiceProvider::class,
+        FlexServiceProvider::class,
+        InflectorServiceProvider::class,
+        LoggerServiceProvider::class,
+        OutputServiceProvider::class,
+        PagesServiceProvider::class,
+        RequestServiceProvider::class,
+        SessionServiceProvider::class,
+        StreamsServiceProvider::class,
+        TaskServiceProvider::class,
+        'browser'    => Browser::class,
+        'cache'      => Cache::class,
+        'events'     => EventDispatcher::class,
+        'exif'       => Exif::class,
+        'plugins'    => Plugins::class,
+        'scheduler'  => Scheduler::class,
+        'taxonomy'   => Taxonomy::class,
+        'themes'     => Themes::class,
+        'twig'       => Twig::class,
+        'uri'        => Uri::class,
     ];
 
     /**
      * @var array All middleware processors that are processed in $this->process()
      */
     protected $middleware = [
-        'configurationProcessor',
-        'loggerProcessor',
-        'errorsProcessor',
-        'debuggerProcessor',
+        'multipartRequestSupport',
         'initializeProcessor',
         'pluginsProcessor',
         'themesProcessor',
@@ -108,14 +133,18 @@ class Grav extends Container
         'renderProcessor',
     ];
 
+    /** @var array */
     protected $initialized = [];
 
     /**
      * Reset the Grav instance.
+     *
+     * @return void
      */
-    public static function resetInstance()
+    public static function resetInstance(): void
     {
         if (self::$instance) {
+            // @phpstan-ignore-next-line
             self::$instance = null;
         }
     }
@@ -124,13 +153,19 @@ public static function resetInstance()
      * Return the Grav instance. Create it if it's not already instanced
      *
      * @param array $values
-     *
      * @return Grav
      */
     public static function instance(array $values = [])
     {
-        if (!self::$instance) {
+        if (null === self::$instance) {
             self::$instance = static::load($values);
+
+            /** @var ClassLoader|null $loader */
+            $loader = self::$instance['loader'] ?? null;
+            if ($loader) {
+                // Load fix for Deferred Twig Extension
+                $loader->addPsr4('Phive\\Twig\\Extensions\\Deferred\\', LIB_DIR . 'Phive/Twig/Extensions/Deferred/', true);
+            }
         } elseif ($values) {
             $instance = self::$instance;
             foreach ($values as $key => $value) {
@@ -142,9 +177,25 @@ public static function instance(array $values = [])
     }
 
     /**
-     * Setup Grav instance using specific environment.
+     * Get Grav version.
      *
-     * Initializes Grav streams by
+     * @return string
+     */
+    public function getVersion(): string
+    {
+        return GRAV_VERSION;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isSetup(): bool
+    {
+        return isset($this->initialized['setup']);
+    }
+
+    /**
+     * Setup Grav instance using specific environment.
      *
      * @param string|null $environment
      * @return $this
@@ -157,23 +208,47 @@ public function setup(string $environment = null)
 
         $this->initialized['setup'] = true;
 
-        $this->measureTime('_setup', 'Site Setup', function () use ($environment) {
-            // Force environment if passed to the method.
-            if ($environment) {
-                Setup::$environment = $environment;
-            }
+        // Force environment if passed to the method.
+        if ($environment) {
+            Setup::$environment = $environment;
+        }
 
-            $this['setup'];
-            $this['streams'];
-        });
+        // Initialize setup and streams.
+        $this['setup'];
+        $this['streams'];
+
+        return $this;
+    }
+
+    /**
+     * Initialize CLI environment.
+     *
+     * Call after `$grav->setup($environment)`
+     *
+     * - Load configuration
+     * - Initialize logger
+     * - Disable debugger
+     * - Set timezone, locale
+     * - Load plugins (call PluginsLoadedEvent)
+     * - Set Pages and Users type to be used in the site
+     *
+     * This method WILL NOT initialize assets, twig or pages.
+     *
+     * @return $this
+     */
+    public function initializeCli()
+    {
+        InitializeProcessor::initializeCli($this);
 
         return $this;
     }
 
     /**
      * Process a request
+     *
+     * @return void
      */
-    public function process()
+    public function process(): void
     {
         if (isset($this->initialized['process'])) {
             return;
@@ -186,17 +261,8 @@ public function process()
 
         $container = new Container(
             [
-                'configurationProcessor' => function () {
-                    return new ConfigurationProcessor($this);
-                },
-                'loggerProcessor' => function () {
-                    return new LoggerProcessor($this);
-                },
-                'errorsProcessor' => function () {
-                    return new ErrorsProcessor($this);
-                },
-                'debuggerProcessor' => function () {
-                    return new DebuggerProcessor($this);
+                'multipartRequestSupport' => function () {
+                    return new MultipartRequestSupport();
                 },
                 'initializeProcessor' => function () {
                     return new InitializeProcessor($this);
@@ -237,80 +303,201 @@ public function process()
             ]
         );
 
-        $default = function (ServerRequestInterface $request) {
-            return new Response(404);
+        $default = static function () {
+            return new Response(404, ['Expires' => 0, 'Cache-Control' => 'no-store, max-age=0'], 'Not Found');
         };
 
-        /** @var Debugger $debugger */
-        $debugger = $this['debugger'];
-
         $collection = new RequestHandler($this->middleware, $default, $container);
 
         $response = $collection->handle($this['request']);
+        $body = $response->getBody();
+
+        /** @var Messages $messages */
+        $messages = $this['messages'];
+
+        // Prevent caching if session messages were displayed in the page.
+        $noCache = $messages->isCleared();
+        if ($noCache) {
+            $response = $response->withHeader('Cache-Control', 'no-store, max-age=0');
+        }
+
+        // Handle ETag and If-None-Match headers.
+        if ($response->getHeaderLine('ETag') === '1') {
+            $etag = md5($body);
+            $response = $response->withHeader('ETag', '"' . $etag . '"');
+
+            $search = trim($this['request']->getHeaderLine('If-None-Match'), '"');
+            if ($noCache === false && $search === $etag) {
+                $response = $response->withStatus(304);
+                $body = '';
+            }
+        }
 
+        // Echo page content.
         $this->header($response);
-        echo $response->getBody();
+        echo $body;
 
-        $debugger->render();
+        $this['debugger']->render();
 
-        register_shutdown_function([$this, 'shutdown']);
+        // Response object can turn off all shutdown processing. This can be used for example to speed up AJAX responses.
+        // Note that using this feature will also turn off response compression.
+        if ($response->getHeaderLine('Grav-Internal-SkipShutdown') !== '1') {
+            register_shutdown_function([$this, 'shutdown']);
+        }
     }
 
     /**
-     * Set the system locale based on the language and configuration
+     * Clean any output buffers. Useful when exiting from the application.
+     *
+     * Please use $grav->close() and $grav->redirect() instead of calling this one!
+     *
+     * @return void
      */
-    public function setLocale()
+    public function cleanOutputBuffers(): void
     {
-        // Initialize Locale if set and configured.
-        if ($this['language']->enabled() && $this['config']->get('system.languages.override_locale')) {
-            $language = $this['language']->getLanguage();
-            setlocale(LC_ALL, \strlen($language) < 3 ? ($language . '_' . strtoupper($language)) : $language);
-        } elseif ($this['config']->get('system.default_locale')) {
-            setlocale(LC_ALL, $this['config']->get('system.default_locale'));
+        // Make sure nothing extra gets written to the response.
+        while (ob_get_level()) {
+            ob_end_clean();
         }
+        // Work around PHP bug #8218 (8.0.17 & 8.1.4).
+        header_remove('Content-Encoding');
     }
 
     /**
-     * Redirect browser to another location.
+     * Terminates Grav request with a response.
      *
-     * @param string $route Internal route.
-     * @param int    $code  Redirection code (30x)
+     * Please use this method instead of calling `die();` or `exit();`. Note that you need to create a response object.
+     *
+     * @param ResponseInterface $response
+     * @return never-return
      */
-    public function redirect($route, $code = null)
+    public function close(ResponseInterface $response): void
     {
-        /** @var Uri $uri */
-        $uri = $this['uri'];
+        $this->cleanOutputBuffers();
 
-        //Check for code in route
-        $regex = '/.*(\[(30[1-7])\])$/';
-        preg_match($regex, $route, $matches);
-        if ($matches) {
-            $route = str_replace($matches[1], '', $matches[0]);
-            $code = $matches[2];
+        // Close the session.
+        if (isset($this['session'])) {
+            $this['session']->close();
         }
 
-        if ($code === null) {
-            $code = $this['config']->get('system.pages.redirect_default_code', 302);
+        /** @var ServerRequestInterface $request */
+        $request = $this['request'];
+
+        /** @var Debugger $debugger */
+        $debugger = $this['debugger'];
+        $response = $debugger->logRequest($request, $response);
+
+        $body = $response->getBody();
+
+        /** @var Messages $messages */
+        $messages = $this['messages'];
+
+        // Prevent caching if session messages were displayed in the page.
+        $noCache = $messages->isCleared();
+        if ($noCache) {
+            $response = $response->withHeader('Cache-Control', 'no-store, max-age=0');
         }
 
-        if (isset($this['session'])) {
-            $this['session']->close();
+        // Handle ETag and If-None-Match headers.
+        if ($response->getHeaderLine('ETag') === '1') {
+            $etag = md5($body);
+            $response = $response->withHeader('ETag', '"' . $etag . '"');
+
+            $search = trim($this['request']->getHeaderLine('If-None-Match'), '"');
+            if ($noCache === false && $search === $etag) {
+                $response = $response->withStatus(304);
+                $body = '';
+            }
         }
 
-        if ($uri->isExternal($route)) {
-            $url = $route;
-        } else {
-            $url = rtrim($uri->rootUrl(), '/') . '/';
+        // Echo page content.
+        $this->header($response);
+        echo $body;
+        exit();
+    }
 
-            if ($this['config']->get('system.pages.redirect_trailing_slash', true)) {
-                $url .= trim($route, '/'); // Remove trailing slash
+    /**
+     * @param ResponseInterface $response
+     * @return never-return
+     * @deprecated 1.7 Use $grav->close() instead.
+     */
+    public function exit(ResponseInterface $response): void
+    {
+        $this->close($response);
+    }
+
+    /**
+     * Terminates Grav request and redirects browser to another location.
+     *
+     * Please use this method instead of calling `header("Location: {$url}", true, 302); exit();`.
+     *
+     * @param Route|string $route Internal route.
+     * @param int|null $code  Redirection code (30x)
+     * @return never-return
+     */
+    public function redirect($route, $code = null): void
+    {
+        $response = $this->getRedirectResponse($route, $code);
+
+        $this->close($response);
+    }
+
+    /**
+     * Returns redirect response object from Grav.
+     *
+     * @param Route|string $route Internal route.
+     * @param int|null $code  Redirection code (30x)
+     * @return ResponseInterface
+     */
+    public function getRedirectResponse($route, $code = null): ResponseInterface
+    {
+        /** @var Uri $uri */
+        $uri = $this['uri'];
+
+        if (is_string($route)) {
+            // Clean route for redirect
+            $route = preg_replace("#^\/[\\\/]+\/#", '/', $route);
+
+            if (null === $code) {
+                // Check for redirect code in the route: e.g. /new/[301], /new[301]/route or /new[301].html
+                $regex = '/.*(\[(30[1-7])\])(.\w+|\/.*?)?$/';
+                preg_match($regex, $route, $matches);
+                if ($matches) {
+                    $route = str_replace($matches[1], '', $matches[0]);
+                    $code = $matches[2];
+                }
+            }
+
+            if ($uri::isExternal($route)) {
+                $url = $route;
             } else {
-                $url .= ltrim($route, '/'); // Support trailing slash default routes
+                $url = rtrim($uri->rootUrl(), '/') . '/';
+
+                if ($this['config']->get('system.pages.redirect_trailing_slash', true)) {
+                    $url .= trim($route, '/'); // Remove trailing slash
+                } else {
+                    $url .= ltrim($route, '/'); // Support trailing slash default routes
+                }
             }
+        } elseif ($route instanceof Route) {
+            $url = $route->toString(true);
+        } else {
+            throw new InvalidArgumentException('Bad $route');
         }
 
-        header("Location: {$url}", true, $code);
-        exit();
+        if ($code < 300 || $code > 399) {
+            $code = null;
+        }
+
+        if ($code === null) {
+            $code = $this['config']->get('system.pages.redirect_default_code', 302);
+        }
+
+        if ($uri->extension() === 'json') {
+            return new Response(200, ['Content-Type' => 'application/json'], json_encode(['code' => $code, 'redirect' => $url], JSON_THROW_ON_ERROR));
+        }
+
+        return new Response($code, ['Location' => $url]);
     }
 
     /**
@@ -318,8 +505,9 @@ public function redirect($route, $code = null)
      *
      * @param string $route Internal route.
      * @param int    $code  Redirection code (30x)
+     * @return void
      */
-    public function redirectLangSafe($route, $code = null)
+    public function redirectLangSafe($route, $code = null): void
     {
         if (!$this['uri']->isExternal($route)) {
             $this->redirect($this['pages']->route($route), $code);
@@ -332,8 +520,9 @@ public function redirectLangSafe($route, $code = null)
      * Set response header.
      *
      * @param ResponseInterface|null $response
+     * @return void
      */
-    public function header(ResponseInterface $response = null)
+    public function header(ResponseInterface $response = null): void
     {
         if (null === $response) {
             /** @var PageInterface $page */
@@ -343,36 +532,86 @@ public function header(ResponseInterface $response = null)
 
         header("HTTP/{$response->getProtocolVersion()} {$response->getStatusCode()} {$response->getReasonPhrase()}");
         foreach ($response->getHeaders() as $key => $values) {
+            // Skip internal Grav headers.
+            if (strpos($key, 'Grav-Internal-') === 0) {
+                continue;
+            }
             foreach ($values as $i => $value) {
                 header($key . ': ' . $value, $i === 0);
             }
         }
     }
 
+    /**
+     * Set the system locale based on the language and configuration
+     *
+     * @return void
+     */
+    public function setLocale(): void
+    {
+        // Initialize Locale if set and configured.
+        if ($this['language']->enabled() && $this['config']->get('system.languages.override_locale')) {
+            $language = $this['language']->getLanguage();
+            setlocale(LC_ALL, strlen($language) < 3 ? ($language . '_' . strtoupper($language)) : $language);
+        } elseif ($this['config']->get('system.default_locale')) {
+            setlocale(LC_ALL, $this['config']->get('system.default_locale'));
+        }
+    }
+
+    /**
+     * @param object $event
+     * @return object
+     */
+    public function dispatchEvent($event)
+    {
+        /** @var EventDispatcherInterface $events */
+        $events = $this['events'];
+        $eventName = get_class($event);
+
+        $timestamp = microtime(true);
+        $event = $events->dispatch($event);
+
+        /** @var Debugger $debugger */
+        $debugger = $this['debugger'];
+        $debugger->addEvent($eventName, $event, $events, $timestamp);
+
+        return $event;
+    }
+
     /**
      * Fires an event with optional parameters.
      *
      * @param  string $eventName
-     * @param  Event  $event
-     *
+     * @param  Event|null $event
      * @return Event
      */
     public function fireEvent($eventName, Event $event = null)
     {
-        /** @var EventDispatcher $events */
+        /** @var EventDispatcherInterface $events */
         $events = $this['events'];
+        if (null === $event) {
+            $event = new Event();
+        }
 
-        return $events->dispatch($eventName, $event);
+        $timestamp = microtime(true);
+        $events->dispatch($event, $eventName);
+
+        /** @var Debugger $debugger */
+        $debugger = $this['debugger'];
+        $debugger->addEvent($eventName, $event, $events, $timestamp);
+
+        return $event;
     }
 
     /**
      * Set the final content length for the page and flush the buffer
      *
+     * @return void
      */
-    public function shutdown()
+    public function shutdown(): void
     {
         // Prevent user abort allowing onShutdown event to run without interruptions.
-        if (\function_exists('ignore_user_abort')) {
+        if (function_exists('ignore_user_abort')) {
             @ignore_user_abort(true);
         }
 
@@ -381,32 +620,33 @@ public function shutdown()
             $this['session']->close();
         }
 
-        if ($this['config']->get('system.debugger.shutdown.close_connection', true)) {
+        /** @var Config $config */
+        $config = $this['config'];
+        if ($config->get('system.debugger.shutdown.close_connection', true)) {
             // Flush the response and close the connection to allow time consuming tasks to be performed without leaving
             // the connection to the client open. This will make page loads to feel much faster.
 
             // FastCGI allows us to flush all response data to the client and finish the request.
-            $success = \function_exists('fastcgi_finish_request') ? @fastcgi_finish_request() : false;
-
+            $success = function_exists('fastcgi_finish_request') ? @fastcgi_finish_request() : false;
             if (!$success) {
                 // Unfortunately without FastCGI there is no way to force close the connection.
                 // We need to ask browser to close the connection for us.
-                if ($this['config']->get('system.cache.gzip')) {
-                    // Flush gzhandler buffer if gzip setting was enabled.
-                    ob_end_flush();
 
-                } else {
+                if ($config->get('system.cache.gzip')) {
+                    // Flush gzhandler buffer if gzip setting was enabled to get the size of the compressed output.
+                    ob_end_flush();
+                } elseif ($config->get('system.cache.allow_webserver_gzip')) {
+                    // Let web server to do the hard work.
+                    header('Content-Encoding: identity');
+                } elseif (function_exists('apache_setenv')) {
                     // Without gzip we have no other choice than to prevent server from compressing the output.
                     // This action turns off mod_deflate which would prevent us from closing the connection.
-                    if ($this['config']->get('system.cache.allow_webserver_gzip')) {
-                        header('Content-Encoding: identity');
-                    } else {
-                        header('Content-Encoding: none');
-                    }
-
+                    @apache_setenv('no-gzip', '1');
+                } else {
+                    // Fall back to unknown content encoding, it prevents most servers from deflating the content.
+                    header('Content-Encoding: none');
                 }
 
-
                 // Get length and close the connection.
                 header('Content-Length: ' . ob_get_length());
                 header('Connection: close');
@@ -427,11 +667,17 @@ public function shutdown()
      * Used to call closures.
      *
      * Source: http://stackoverflow.com/questions/419804/closures-as-class-members
+     *
+     * @param string $method
+     * @param array $args
+     * @return mixed|null
      */
+    #[\ReturnTypeWillChange]
     public function __call($method, $args)
     {
-        $closure = $this->{$method};
-        \call_user_func_array($closure, $args);
+        $closure = $this->{$method} ?? null;
+
+        return is_callable($closure) ? $closure(...$args) : null;
     }
 
     /**
@@ -456,7 +702,6 @@ public function measureTime(string $timerId, string $timerTitle, callable $callb
      * Initialize and return a Grav instance
      *
      * @param  array $values
-     *
      * @return static
      */
     protected static function load(array $values)
@@ -470,9 +715,7 @@ protected static function load(array $values)
             return $container;
         };
 
-        $container->measureTime('_services', 'Services', function () use ($container) {
-            $container->registerServices();
-        });
+        $container->registerServices();
 
         return $container;
     }
@@ -485,10 +728,10 @@ protected static function load(array $values)
      *
      * @return void
      */
-    protected function registerServices()
+    protected function registerServices(): void
     {
         foreach (self::$diMap as $serviceKey => $serviceClass) {
-            if (\is_int($serviceKey)) {
+            if (is_int($serviceKey)) {
                 $this->register(new $serviceClass);
             } else {
                 $this[$serviceKey] = function ($c) use ($serviceClass) {
@@ -502,10 +745,14 @@ protected function registerServices()
      * This attempts to find media, other files, and download them
      *
      * @param string $path
+     * @return PageInterface|false
      */
     public function fallbackUrl($path)
     {
-        $this->fireEvent('onPageFallBackUrl');
+        $path_parts = Utils::pathinfo($path);
+        if (!is_array($path_parts)) {
+            return false;
+        }
 
         /** @var Uri $uri */
         $uri = $this['uri'];
@@ -513,35 +760,46 @@ public function fallbackUrl($path)
         /** @var Config $config */
         $config = $this['config'];
 
-        $uri_extension = strtolower($uri->extension());
-        $fallback_types = $config->get('system.media.allowed_fallback_types', null);
+        /** @var Pages $pages */
+        $pages = $this['pages'];
+        $page = $pages->find($path_parts['dirname'], true);
+
+        $uri_extension = strtolower($uri->extension() ?? '');
+        $fallback_types = $config->get('system.media.allowed_fallback_types');
         $supported_types = $config->get('media.types');
 
+        $parsed_url = parse_url(rawurldecode($uri->basename()));
+        $media_file = $parsed_url['path'];
+
+        $event = new Event([
+            'uri' => $uri,
+            'page' => &$page,
+            'filename' => &$media_file,
+            'extension' => $uri_extension,
+            'allowed_fallback_types' => &$fallback_types,
+            'media_types' => &$supported_types
+        ]);
+
+        $this->fireEvent('onPageFallBackUrl', $event);
+
         // Check whitelist first, then ensure extension is a valid media type
-        if (!empty($fallback_types) && !\in_array($uri_extension, $fallback_types, true)) {
+        if (!empty($fallback_types) && !in_array($uri_extension, $fallback_types, true)) {
             return false;
         }
         if (!array_key_exists($uri_extension, $supported_types)) {
             return false;
         }
 
-        $path_parts = pathinfo($path);
-
-        /** @var PageInterface $page */
-        $page = $this['pages']->dispatch($path_parts['dirname'], true);
-
         if ($page) {
             $media = $page->media()->all();
-            $parsed_url = parse_url(rawurldecode($uri->basename()));
-            $media_file = $parsed_url['path'];
 
             // if this is a media object, try actions first
             if (isset($media[$media_file])) {
                 /** @var Medium $medium */
                 $medium = $media[$media_file];
                 foreach ($uri->query(null, true) as $action => $params) {
-                    if (\in_array($action, ImageMedium::$magic_actions, true)) {
-                        \call_user_func_array([&$medium, $action], explode(',', $params));
+                    if (in_array($action, ImageMedium::$magic_actions, true)) {
+                        call_user_func_array([&$medium, $action], explode(',', $params));
                     }
                 }
                 Utils::download($medium->path(), false);
@@ -550,26 +808,22 @@ public function fallbackUrl($path)
             // unsupported media type, try to download it...
             if ($uri_extension) {
                 $extension = $uri_extension;
+            } elseif (isset($path_parts['extension'])) {
+                $extension = $path_parts['extension'];
             } else {
-                if (isset($path_parts['extension'])) {
-                    $extension = $path_parts['extension'];
-                } else {
-                    $extension = null;
-                }
+                $extension = null;
             }
 
             if ($extension) {
                 $download = true;
-                if (\in_array(ltrim($extension, '.'), $config->get('system.media.unsupported_inline_types', []), true)) {
+                if (in_array(ltrim($extension, '.'), $config->get('system.media.unsupported_inline_types', []), true)) {
                     $download = false;
                 }
                 Utils::download($page->path() . DIRECTORY_SEPARATOR . $uri->basename(), $download);
             }
-
-            // Nothing found
-            return false;
         }
 
-        return $page;
+        // Nothing found
+        return false;
     }
 }
diff --git a/system/src/Grav/Common/GravTrait.php b/system/src/Grav/Common/GravTrait.php
index a82c23a9ed..5416286127 100644
--- a/system/src/Grav/Common/GravTrait.php
+++ b/system/src/Grav/Common/GravTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,6 +14,7 @@
  */
 trait GravTrait
 {
+    /** @var Grav */
     protected static $grav;
 
     /**
@@ -24,7 +25,7 @@ public static function getGrav()
     {
         user_error(__TRAIT__ . ' is deprecated since Grav 1.4, use Grav::instance() instead', E_USER_DEPRECATED);
 
-        if (!self::$grav) {
+        if (null === self::$grav) {
             self::$grav = Grav::instance();
         }
 
diff --git a/system/src/Grav/Common/HTTP/Client.php b/system/src/Grav/Common/HTTP/Client.php
new file mode 100644
index 0000000000..c85d6b2957
--- /dev/null
+++ b/system/src/Grav/Common/HTTP/Client.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * @package    Grav\Common\HTTP
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\HTTP;
+
+use Grav\Common\Grav;
+use Symfony\Component\HttpClient\CurlHttpClient;
+use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Component\HttpClient\HttpOptions;
+use Symfony\Component\HttpClient\NativeHttpClient;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+class Client
+{
+    /** @var callable    The callback for the progress, either a function or callback in array notation */
+    public static $callback = null;
+    /** @var string[] */
+    private static $headers = [
+        'User-Agent' => 'Grav CMS'
+    ];
+
+    public static function getClient(array $overrides = [], int $connections = 6, callable $callback = null): HttpClientInterface
+    {
+        $config = Grav::instance()['config'];
+        $options = static::getOptions();
+
+        // Use callback if provided
+        if ($callback) {
+            self::$callback = $callback;
+            $options->setOnProgress([Client::class, 'progress']);
+        }
+
+        $settings = array_merge($options->toArray(), $overrides);
+        $preferred_method = $config->get('system.http.method');
+        // Try old GPM setting if value is the same as system default
+        if ($preferred_method === 'auto') {
+            $preferred_method = $config->get('system.gpm.method', 'auto');
+        }
+
+        switch ($preferred_method) {
+            case 'curl':
+                $client = new CurlHttpClient($settings, $connections);
+                break;
+            case 'fopen':
+            case 'native':
+                $client = new NativeHttpClient($settings, $connections);
+                break;
+            default:
+                $client = HttpClient::create($settings, $connections);
+        }
+
+        return $client;
+    }
+
+    /**
+     * Get HTTP Options
+     *
+     * @return HttpOptions
+     */
+    public static function getOptions(): HttpOptions
+    {
+        $config = Grav::instance()['config'];
+        $referer = defined('GRAV_CLI') ? 'grav_cli' : Grav::instance()['uri']->rootUrl(true);
+
+        $options = new HttpOptions();
+
+        // Set default Headers
+        $options->setHeaders(array_merge([ 'Referer' => $referer ], self::$headers));
+
+        // Disable verify Peer if required
+        $verify_peer = $config->get('system.http.verify_peer');
+        // Try old GPM setting if value is default
+        if ($verify_peer === true) {
+            $verify_peer = $config->get('system.gpm.verify_peer', null) ?? $verify_peer;
+        }
+        $options->verifyPeer($verify_peer);
+
+        // Set verify Host
+        $verify_host = $config->get('system.http.verify_host', true);
+        $options->verifyHost($verify_host);
+
+        // New setting and must be enabled for Proxy to work
+        if ($config->get('system.http.enable_proxy', true)) {
+            // Set proxy url if provided
+            $proxy_url = $config->get('system.http.proxy_url', $config->get('system.gpm.proxy_url', null));
+            if ($proxy_url !== null) {
+                $options->setProxy($proxy_url);
+            }
+
+            // Certificate
+            $proxy_cert = $config->get('system.http.proxy_cert_path', null);
+            if ($proxy_cert !== null) {
+                $options->setCaPath($proxy_cert);
+            }
+        }
+
+        return $options;
+    }
+
+    /**
+     * Progress normalized for cURL and Fopen
+     * Accepts a variable length of arguments passed in by stream method
+     *
+     * @return void
+     */
+    public static function progress(int $bytes_transferred, int $filesize, array $info)
+    {
+
+        if ($bytes_transferred > 0) {
+            $percent = $filesize <= 0 ? 0 : (int)(($bytes_transferred * 100) / $filesize);
+
+            $progress = [
+                'code'        => $info['http_code'],
+                'filesize'    => $filesize,
+                'transferred' => $bytes_transferred,
+                'percent'     => $percent < 100 ? $percent : 100
+            ];
+
+            if (self::$callback !== null) {
+                call_user_func(self::$callback, $progress);
+            }
+        }
+    }
+}
diff --git a/system/src/Grav/Common/HTTP/Response.php b/system/src/Grav/Common/HTTP/Response.php
new file mode 100644
index 0000000000..4a5bc8bb2e
--- /dev/null
+++ b/system/src/Grav/Common/HTTP/Response.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * @package    Grav\Common\HTTP
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\HTTP;
+
+use Exception;
+use Grav\Common\Utils;
+use Grav\Common\Grav;
+use Symfony\Component\HttpClient\CurlHttpClient;
+use Symfony\Component\HttpClient\Exception\TransportException;
+use Symfony\Component\HttpClient\HttpClient;
+use Symfony\Component\HttpClient\HttpOptions;
+use Symfony\Component\HttpClient\NativeHttpClient;
+use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
+use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
+use function call_user_func;
+use function defined;
+
+/**
+ * Class Response
+ * @package Grav\Common\GPM
+ */
+class Response
+{
+    /**
+     * Backwards compatible helper method
+     *
+     * @param string $uri
+     * @param array $overrides
+     * @param callable|null $callback
+     * @return string
+     * @throws TransportExceptionInterface|RedirectionExceptionInterface|ServerExceptionInterface|TransportExceptionInterface|ClientExceptionInterface
+     */
+    public static function get(string $uri = '', array $overrides = [], callable $callback = null): string
+    {
+        $response = static::request('GET', $uri, $overrides, $callback);
+        return $response->getContent();
+    }
+
+
+    /**
+     * Makes a request to the URL by using the preferred method
+     *
+     * @param string $method method to call such as GET, PUT, etc
+     * @param string $uri URL to call
+     * @param array $overrides An array of parameters for both `curl` and `fopen`
+     * @param callable|null $callback Either a function or callback in array notation
+     * @return ResponseInterface
+     * @throws TransportExceptionInterface
+     */
+    public static function request(string $method, string $uri, array $overrides = [], callable $callback = null): ResponseInterface
+    {
+        if (empty($method)) {
+            throw new TransportException('missing method (GET, PUT, etc.)');
+        }
+
+        if (empty($uri)) {
+            throw new TransportException('missing URI');
+        }
+
+        // check if this function is available, if so use it to stop any timeouts
+        try {
+            if (Utils::functionExists('set_time_limit')) {
+                @set_time_limit(0);
+            }
+        } catch (Exception $e) {}
+
+        $client = Client::getClient($overrides, 6, $callback);
+
+        return $client->request($method, $uri);
+    }
+
+
+    /**
+     * Is this a remote file or not
+     *
+     * @param string $file
+     * @return bool
+     */
+    public static function isRemote($file): bool
+    {
+        return (bool) filter_var($file, FILTER_VALIDATE_URL);
+    }
+
+
+}
diff --git a/system/src/Grav/Common/Helpers/Base32.php b/system/src/Grav/Common/Helpers/Base32.php
index f138557027..0d1c21ae0b 100644
--- a/system/src/Grav/Common/Helpers/Base32.php
+++ b/system/src/Grav/Common/Helpers/Base32.php
@@ -3,15 +3,26 @@
 /**
  * @package    Grav\Common\Helpers
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Helpers;
 
+use function chr;
+use function count;
+use function ord;
+use function strlen;
+
+/**
+ * Class Base32
+ * @package Grav\Common\Helpers
+ */
 class Base32
 {
+    /** @var string */
     protected static $base32Chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';
+    /** @var array */
     protected static $base32Lookup = [
         0xFF,0xFF,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, // '0', '1', '2', '3', '4', '5', '6', '7'
         0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, // '8', '9', ':', ';', '<', '=', '>', '?'
@@ -33,17 +44,18 @@ class Base32
      */
     public static function encode($bytes)
     {
-        $i = 0; $index = 0;
+        $i = 0;
+        $index = 0;
         $base32 = '';
-        $bytesLen = \strlen($bytes);
+        $bytesLen = strlen($bytes);
 
         while ($i < $bytesLen) {
-            $currByte = \ord($bytes[$i]);
+            $currByte = ord($bytes[$i]);
 
             /* Is the current digit going to span a byte boundary? */
             if ($index > 3) {
                 if (($i + 1) < $bytesLen) {
-                    $nextByte = \ord($bytes[$i+1]);
+                    $nextByte = ord($bytes[$i+1]);
                 } else {
                     $nextByte = 0;
                 }
@@ -75,15 +87,15 @@ public static function encode($bytes)
     public static function decode($base32)
     {
         $bytes = [];
-        $base32Len = \strlen($base32);
-        $base32LookupLen = \count(self::$base32Lookup);
+        $base32Len = strlen($base32);
+        $base32LookupLen = count(self::$base32Lookup);
 
         for ($i = $base32Len * 5 / 8 - 1; $i >= 0; --$i) {
             $bytes[] = 0;
         }
 
         for ($i = 0, $index = 0, $offset = 0; $i < $base32Len; $i++) {
-            $lookup = \ord($base32[$i]) - \ord('0');
+            $lookup = ord($base32[$i]) - ord('0');
 
             /* Skip chars outside the lookup table */
             if ($lookup < 0 || $lookup >= $base32LookupLen) {
@@ -102,7 +114,7 @@ public static function decode($base32)
                 if ($index === 0) {
                     $bytes[$offset] |= $digit;
                     $offset++;
-                    if ($offset >= \count($bytes)) {
+                    if ($offset >= count($bytes)) {
                         break;
                     }
                 } else {
@@ -112,7 +124,7 @@ public static function decode($base32)
                 $index = ($index + 5) % 8;
                 $bytes[$offset] |= ($digit >> $index);
                 $offset++;
-                if ($offset >= \count($bytes)) {
+                if ($offset >= count($bytes)) {
                     break;
                 }
                 $bytes[$offset] |= $digit << (8 - $index);
@@ -121,7 +133,7 @@ public static function decode($base32)
 
         $bites = '';
         foreach ($bytes as $byte) {
-            $bites .= \chr($byte);
+            $bites .= chr($byte);
         }
 
         return $bites;
diff --git a/system/src/Grav/Common/Helpers/Excerpts.php b/system/src/Grav/Common/Helpers/Excerpts.php
index f07c3aa5ab..a62c7e5f43 100644
--- a/system/src/Grav/Common/Helpers/Excerpts.php
+++ b/system/src/Grav/Common/Helpers/Excerpts.php
@@ -3,16 +3,24 @@
 /**
  * @package    Grav\Common\Helpers
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Helpers;
 
+use DOMDocument;
+use DOMElement;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Page\Markdown\Excerpts as ExcerptsObject;
+use Grav\Common\Page\Medium\Link;
 use Grav\Common\Page\Medium\Medium;
+use function is_array;
 
+/**
+ * Class Excerpts
+ * @package Grav\Common\Helpers
+ */
 class Excerpts
 {
     /**
@@ -25,6 +33,9 @@ class Excerpts
     public static function processImageHtml($html, PageInterface $page = null)
     {
         $excerpt = static::getExcerptFromHtml($html, 'img');
+        if (null === $excerpt) {
+            return '';
+        }
 
         $original_src = $excerpt['element']['attributes']['src'];
         $excerpt['element']['attributes']['href'] = $original_src;
@@ -32,7 +43,7 @@ public static function processImageHtml($html, PageInterface $page = null)
         $excerpt = static::processLinkExcerpt($excerpt, $page, 'image');
 
         $excerpt['element']['attributes']['src'] = $excerpt['element']['attributes']['href'];
-        unset ($excerpt['element']['attributes']['href']);
+        unset($excerpt['element']['attributes']['href']);
 
         $excerpt = static::processImageExcerpt($excerpt, $page);
 
@@ -43,6 +54,29 @@ public static function processImageHtml($html, PageInterface $page = null)
         return $html;
     }
 
+    /**
+     * Process Grav page link URL from HTML tag
+     *
+     * @param string $html              HTML tag e.g. `<a href="../foo">Page Link</a>`
+     * @param PageInterface|null $page  Page, defaults to the current page object
+     * @return string                   Returns final HTML string
+     */
+    public static function processLinkHtml($html, PageInterface $page = null)
+    {
+        $excerpt = static::getExcerptFromHtml($html, 'a');
+        if (null === $excerpt) {
+            return '';
+        }
+
+        $original_href = $excerpt['element']['attributes']['href'];
+        $excerpt = static::processLinkExcerpt($excerpt, $page, 'link');
+        $excerpt['element']['attributes']['data-href'] = $original_href;
+
+        $html = static::getHtmlFromExcerpt($excerpt);
+
+        return $html;
+    }
+
     /**
      * Get an Excerpt array from a chunk of HTML
      *
@@ -52,22 +86,34 @@ public static function processImageHtml($html, PageInterface $page = null)
      */
     public static function getExcerptFromHtml($html, $tag)
     {
-        $doc = new \DOMDocument();
-        $doc->loadHTML($html);
-        $images = $doc->getElementsByTagName($tag);
+        $doc = new DOMDocument('1.0', 'UTF-8');
+        $internalErrors = libxml_use_internal_errors(true);
+        $doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
+        libxml_use_internal_errors($internalErrors);
+
+        $elements = $doc->getElementsByTagName($tag);
         $excerpt = null;
+        $inner = [];
 
-        foreach ($images as $image) {
+        foreach ($elements as $element) {
             $attributes = [];
-            foreach ($image->attributes as $name => $value) {
+            foreach ($element->attributes as $name => $value) {
                 $attributes[$name] = $value->value;
             }
             $excerpt = [
                 'element' => [
-                    'name'       => $image->tagName,
+                    'name'       => $element->tagName,
                     'attributes' => $attributes
                 ]
             ];
+
+            foreach ($element->childNodes as $node) {
+                    $inner[] = $doc->saveHTML($node);
+            }
+
+            $excerpt = array_merge_recursive($excerpt, ['element' => ['text' => implode('', $inner)]]);
+
+
         }
 
         return $excerpt;
@@ -95,7 +141,7 @@ public static function getHtmlFromExcerpt($excerpt)
 
         if (isset($element['text'])) {
             $html .= '>';
-            $html .= $element['text'];
+            $html .= is_array($element['text']) ? static::getHtmlFromExcerpt(['element' => $element['text']]) : $element['text'];
             $html .= '</'.$element['name'].'>';
         } else {
             $html .= ' />';
@@ -139,7 +185,7 @@ public static function processImageExcerpt(array $excerpt, PageInterface $page =
      * @param Medium $medium
      * @param string|array $url
      * @param PageInterface|null $page  Page, defaults to the current page object
-     * @return Medium
+     * @return Medium|Link
      */
     public static function processMediaActions($medium, $url, PageInterface $page = null)
     {
diff --git a/system/src/Grav/Common/Helpers/Exif.php b/system/src/Grav/Common/Helpers/Exif.php
index 15aff66777..a7dc973307 100644
--- a/system/src/Grav/Common/Helpers/Exif.php
+++ b/system/src/Grav/Common/Helpers/Exif.php
@@ -3,39 +3,46 @@
 /**
  * @package    Grav\Common\Helpers
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Helpers;
 
 use Grav\Common\Grav;
+use PHPExif\Reader\Reader;
+use RuntimeException;
+use function function_exists;
 
+/**
+ * Class Exif
+ * @package Grav\Common\Helpers
+ */
 class Exif
 {
+    /** @var Reader */
     public $reader;
 
     /**
      * Exif constructor.
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function __construct()
     {
         if (Grav::instance()['config']->get('system.media.auto_metadata_exif')) {
-            if (function_exists('exif_read_data') && class_exists('\PHPExif\Reader\Reader')) {
-                $this->reader = \PHPExif\Reader\Reader::factory(\PHPExif\Reader\Reader::TYPE_NATIVE);
+            if (function_exists('exif_read_data') && class_exists(Reader::class)) {
+                $this->reader = Reader::factory(Reader::TYPE_NATIVE);
             } else {
-                throw new \RuntimeException('Please enable the Exif extension for PHP or disable Exif support in Grav system configuration');
+                throw new RuntimeException('Please enable the Exif extension for PHP or disable Exif support in Grav system configuration');
             }
         }
     }
 
+    /**
+     * @return Reader
+     */
     public function getReader()
     {
-        if ($this->reader) {
-            return $this->reader;
-        }
-
-        return false;
+        return $this->reader;
     }
 }
diff --git a/system/src/Grav/Common/Helpers/LogViewer.php b/system/src/Grav/Common/Helpers/LogViewer.php
index 397fb17544..cf5ffe9af5 100644
--- a/system/src/Grav/Common/Helpers/LogViewer.php
+++ b/system/src/Grav/Common/Helpers/LogViewer.php
@@ -3,14 +3,24 @@
 /**
  * @package    Grav\Common\Helpers
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Helpers;
 
+use DateTime;
+use function array_slice;
+use function is_array;
+use function is_string;
+
+/**
+ * Class LogViewer
+ * @package Grav\Common\Helpers
+ */
 class LogViewer
 {
+    /** @var string */
     protected $pattern = '/\[(?P<date>.*)\] (?P<logger>\w+).(?P<level>\w+): (?P<message>.*[^ ]+) (?P<context>[^ ]+) (?P<extra>[^ ]+)/';
 
     /**
@@ -24,7 +34,7 @@ class LogViewer
     public function objectTail($filepath, $lines = 1, $desc = true)
     {
         $data = $this->tail($filepath, $lines);
-        $tailed_log = explode(PHP_EOL, $data);
+        $tailed_log = $data ? explode(PHP_EOL, $data) : [];
         $line_objects = [];
 
         foreach ($tailed_log as $line) {
@@ -39,21 +49,24 @@ public function objectTail($filepath, $lines = 1, $desc = true)
      *
      * @param string $filepath
      * @param int $lines
-     * @return bool|string
+     * @return string|false
      */
-    public function tail($filepath, $lines = 1) {
-
-        $f = @fopen($filepath, "rb");
-        if ($f === false) return false;
+    public function tail($filepath, $lines = 1)
+    {
+        $f = $filepath ? @fopen($filepath, 'rb') : false;
+        if ($f === false) {
+            return false;
+        }
 
-        else $buffer = ($lines < 2 ? 64 : ($lines < 10 ? 512 : 4096));
+        $buffer = ($lines < 2 ? 64 : ($lines < 10 ? 512 : 4096));
 
         fseek($f, -1, SEEK_END);
-        if (fread($f, 1) != "\n") $lines -= 1;
+        if (fread($f, 1) !== "\n") {
+            --$lines;
+        }
 
         // Start reading
         $output = '';
-        $chunk = '';
         // While we would like more
         while (ftell($f) > 0 && $lines >= 0) {
             // Figure out how far back we should jump
@@ -61,7 +74,11 @@ public function tail($filepath, $lines = 1) {
             // Do the jump (backwards, relative to where we are)
             fseek($f, -$seek, SEEK_CUR);
             // Read a chunk and prepend it to our output
-            $output = ($chunk = fread($f, $seek)) . $output;
+            $chunk = fread($f, $seek);
+            if ($chunk === false) {
+                throw new \RuntimeException('Cannot read file');
+            }
+            $output = $chunk . $output;
             // Jump back to where we started reading
             fseek($f, -mb_strlen($chunk, '8bit'), SEEK_CUR);
             // Decrease our line counter
@@ -83,7 +100,7 @@ public function tail($filepath, $lines = 1) {
      * Helper class to get level color
      *
      * @param string $level
-     * @return mixed|string
+     * @return string
      */
     public static function levelColor($level)
     {
@@ -108,12 +125,13 @@ public static function levelColor($level)
      */
     public function parse($line)
     {
-        if( !is_string($line) || strlen($line) === 0) {
-            return array();
+        if (!is_string($line) || $line === '') {
+            return [];
         }
+
         preg_match($this->pattern, $line, $data);
         if (!isset($data['date'])) {
-            return array();
+            return [];
         }
 
         preg_match('/(.*)- Trace:(.*)/', $data['message'], $matches);
@@ -122,15 +140,15 @@ public function parse($line)
             $data['trace'] = trim($matches[2]);
         }
 
-        return array(
-            'date' => \DateTime::createFromFormat('Y-m-d H:i:s', $data['date']),
+        return [
+            'date' => DateTime::createFromFormat('Y-m-d H:i:s', $data['date']),
             'logger' => $data['logger'],
             'level' => $data['level'],
             'message' => $data['message'],
-            'trace' => isset($data['trace']) ? $this->parseTrace($data['trace']) : null,
+            'trace' => isset($data['trace']) ? self::parseTrace($data['trace']) : null,
             'context' => json_decode($data['context'], true),
             'extra' => json_decode($data['extra'], true)
-        );
+        ];
     }
 
     /**
@@ -143,7 +161,7 @@ public function parse($line)
     public static function parseTrace($trace, $rows = 10)
     {
         $lines = array_filter(preg_split('/#\d*/m', $trace));
+
         return array_slice($lines, 0, $rows);
     }
-
 }
diff --git a/system/src/Grav/Common/Helpers/Truncator.php b/system/src/Grav/Common/Helpers/Truncator.php
index d116bb3418..03c3eeaaba 100644
--- a/system/src/Grav/Common/Helpers/Truncator.php
+++ b/system/src/Grav/Common/Helpers/Truncator.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Helpers
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,6 +15,8 @@
 use DOMNode;
 use DOMWordsIterator;
 use DOMLettersIterator;
+use function in_array;
+use function strlen;
 
 /**
  * This file is part of https://github.com/Bluetel-Solutions/twig-truncate-extension
@@ -25,11 +27,11 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
-class Truncator {
-
+class Truncator
+{
     /**
      * Safely truncates HTML by a given number of words.
+     *
      * @param  string  $html     Input HTML.
      * @param  int     $limit    Limit to how many words we preserve.
      * @param  string  $ellipsis String to use as ellipsis (if any).
@@ -49,10 +51,8 @@ public static function truncateWords($html, $limit = 0, $ellipsis = '')
         $words = new DOMWordsIterator($container);
         $truncated = false;
         foreach ($words as $word) {
-
             // If we have exceeded the limit, we delete the remainder of the content.
             if ($words->key() >= $limit) {
-
                 // Grab current position.
                 $currentWordPosition = $words->currentWordPosition();
                 $curNode = $currentWordPosition[0];
@@ -75,7 +75,6 @@ public static function truncateWords($html, $limit = 0, $ellipsis = '')
 
                 break;
             }
-
         }
 
         // Return original HTML if not truncated.
@@ -88,6 +87,7 @@ public static function truncateWords($html, $limit = 0, $ellipsis = '')
 
     /**
      * Safely truncates HTML by a given number of letters.
+     *
      * @param  string  $html     Input HTML.
      * @param  int     $limit    Limit to how many letters we preserve.
      * @param  string  $ellipsis String to use as ellipsis (if any).
@@ -107,10 +107,8 @@ public static function truncateLetters($html, $limit = 0, $ellipsis = '')
         $letters = new DOMLettersIterator($container);
         $truncated = false;
         foreach ($letters as $letter) {
-
             // If we have exceeded the limit, we want to delete the remainder of this document.
             if ($letters->key() >= $limit) {
-
                 $currentText = $letters->currentTextPosition();
                 $currentText[0]->nodeValue = mb_substr($currentText[0]->nodeValue, 0, $currentText[1] + 1);
                 self::removeProceedingNodes($currentText[0], $container);
@@ -135,8 +133,9 @@ public static function truncateLetters($html, $limit = 0, $ellipsis = '')
 
     /**
      * Builds a DOMDocument object from a string containing HTML.
+     *
      * @param string $html HTML to load
-     * @returns DOMDocument Returns a DOMDocument object.
+     * @return DOMDocument Returns a DOMDocument object.
      */
     public static function htmlToDomDocument($html)
     {
@@ -160,12 +159,14 @@ public static function htmlToDomDocument($html)
 
     /**
      * Removes all nodes after the current node.
+     *
      * @param  DOMNode|DOMElement $domNode
      * @param  DOMNode|DOMElement $topNode
      * @return void
      */
     private static function removeProceedingNodes($domNode, $topNode)
     {
+        /** @var DOMNode|null $nextNode */
         $nextNode = $domNode->nextSibling;
 
         if ($nextNode !== null) {
@@ -190,25 +191,25 @@ private static function removeProceedingNodes($domNode, $topNode)
      * Clean extra code
      *
      * @param DOMDocument $doc
-     * @param $container
+     * @param DOMNode $container
      * @return string
      */
-    private static function getCleanedHTML(DOMDocument $doc, $container)
+    private static function getCleanedHTML(DOMDocument $doc, DOMNode $container)
     {
         while ($doc->firstChild) {
             $doc->removeChild($doc->firstChild);
         }
 
-        while ($container->firstChild ) {
+        while ($container->firstChild) {
             $doc->appendChild($container->firstChild);
         }
 
-        $html = trim($doc->saveHTML());
-        return $html;
+        return trim($doc->saveHTML());
     }
 
     /**
      * Inserts an ellipsis
+     *
      * @param  DOMNode|DOMElement $domNode  Element to insert after.
      * @param  string             $ellipsis Text used to suffix our document.
      * @return void
@@ -221,12 +222,13 @@ private static function insertEllipsis($domNode, $ellipsis)
             // Append as text node to parent instead
             $textNode = new DOMText($ellipsis);
 
-            if ($domNode->parentNode->parentNode->nextSibling) {
+            /** @var DOMNode|null $nextSibling */
+            $nextSibling = $domNode->parentNode->parentNode->nextSibling;
+            if ($nextSibling) {
                 $domNode->parentNode->parentNode->insertBefore($textNode, $domNode->parentNode->parentNode->nextSibling);
             } else {
                 $domNode->parentNode->parentNode->appendChild($textNode);
             }
-
         } else {
             // Append to current node
             $domNode->nodeValue = rtrim($domNode->nodeValue) . $ellipsis;
@@ -234,7 +236,12 @@ private static function insertEllipsis($domNode, $ellipsis)
     }
 
     /**
-     *
+     * @param string $text
+     * @param int $length
+     * @param string $ending
+     * @param bool $exact
+     * @param bool $considerHtml
+     * @return string
      */
     public function truncate(
         $text,
@@ -248,11 +255,13 @@ public function truncate(
             if (strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
                 return $text;
             }
+
             // splits all html-tags to scanable lines
             preg_match_all('/(<.+?>)?([^<>]*)/s', $text, $lines, PREG_SET_ORDER);
             $total_length = strlen($ending);
-            $open_tags = array();
             $truncate = '';
+            $open_tags = [];
+
             foreach ($lines as $line_matchings) {
                 // if there is any html-tag in this line, handle it and add it (uncounted) to the output
                 if (!empty($line_matchings[1])) {
@@ -260,14 +269,14 @@ public function truncate(
                     if (preg_match('/^<(\s*.+?\/\s*|\s*(img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param)(\s.+?)?)>$/is', $line_matchings[1])) {
                         // do nothing
                         // if tag is a closing tag
-                    } else if (preg_match('/^<\s*\/([^\s]+?)\s*>$/s', $line_matchings[1], $tag_matchings)) {
+                    } elseif (preg_match('/^<\s*\/([^\s]+?)\s*>$/s', $line_matchings[1], $tag_matchings)) {
                         // delete tag from $open_tags list
                         $pos = array_search($tag_matchings[1], $open_tags);
                         if ($pos !== false) {
                             unset($open_tags[$pos]);
                         }
                         // if tag is an opening tag
-                    } else if (preg_match('/^<\s*([^\s>!]+).*?>$/s', $line_matchings[1], $tag_matchings)) {
+                    } elseif (preg_match('/^<\s*([^\s>!]+).*?>$/s', $line_matchings[1], $tag_matchings)) {
                         // add tag to the beginning of $open_tags list
                         array_unshift($open_tags, strtolower($tag_matchings[1]));
                     }
@@ -301,35 +310,35 @@ public function truncate(
                     $total_length += $content_length;
                 }
                 // if the maximum length is reached, get off the loop
-                if($total_length>= $length) {
+                if ($total_length>= $length) {
                     break;
                 }
             }
         } else {
             if (strlen($text) <= $length) {
                 return $text;
-            } else {
-                $truncate = substr($text, 0, $length - strlen($ending));
             }
+
+            $truncate = substr($text, 0, $length - strlen($ending));
         }
         // if the words shouldn't be cut in the middle...
         if (!$exact) {
             // ...search the last occurance of a space...
             $spacepos = strrpos($truncate, ' ');
-            if (isset($spacepos)) {
+            if (false !== $spacepos) {
                 // ...and cut the text in this position
                 $truncate = substr($truncate, 0, $spacepos);
             }
         }
         // add the defined ending to the text
         $truncate .= $ending;
-        if($considerHtml) {
+        if (isset($open_tags)) {
             // close all unclosed html-tags
             foreach ($open_tags as $tag) {
                 $truncate .= '</' . $tag . '>';
             }
         }
+
         return $truncate;
     }
-
 }
diff --git a/system/src/Grav/Common/Helpers/YamlLinter.php b/system/src/Grav/Common/Helpers/YamlLinter.php
index b7e608d004..b31180f0e5 100644
--- a/system/src/Grav/Common/Helpers/YamlLinter.php
+++ b/system/src/Grav/Common/Helpers/YamlLinter.php
@@ -3,38 +3,62 @@
 /**
  * @package    Grav\Common\Helpers
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Helpers;
 
+use Exception;
 use Grav\Common\Grav;
+use Grav\Common\Utils;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use RegexIterator;
 use RocketTheme\Toolbox\File\MarkdownFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 use Symfony\Component\Yaml\Yaml;
 
+/**
+ * Class YamlLinter
+ * @package Grav\Common\Helpers
+ */
 class YamlLinter
 {
-    public static function lint()
+    /**
+     * @param string|null $folder
+     * @return array
+     */
+    public static function lint(string $folder = null)
     {
-        $errors = static::lintConfig();
-        $errors = $errors + static::lintPages();
-        $errors = $errors + static::lintBlueprints();
-        
-        return $errors;
+        if (null !== $folder) {
+            $folder = $folder ?: GRAV_ROOT;
+
+            return static::recurseFolder($folder);
+        }
+
+        return array_merge(static::lintConfig(), static::lintPages(), static::lintBlueprints());
     }
 
+    /**
+     * @return array
+     */
     public static function lintPages()
     {
         return static::recurseFolder('page://');
     }
 
+    /**
+     * @return array
+     */
     public static function lintConfig()
     {
         return static::recurseFolder('config://');
     }
 
+    /**
+     * @return array
+     */
     public static function lintBlueprints()
     {
         /** @var UniformResourceLocator $locator */
@@ -47,26 +71,31 @@ public static function lintBlueprints()
         return static::recurseFolder('blueprints://');
     }
 
-    public static function recurseFolder($path, $extensions = 'md|yaml')
+    /**
+     * @param string $path
+     * @param string $extensions
+     * @return array
+     */
+    public static function recurseFolder($path, $extensions = '(md|yaml)')
     {
         $lint_errors = [];
 
         /** @var UniformResourceLocator $locator */
         $locator = Grav::instance()['locator'];
-        $flags = \RecursiveDirectoryIterator::SKIP_DOTS;
+        $flags = RecursiveDirectoryIterator::SKIP_DOTS | RecursiveDirectoryIterator::FOLLOW_SYMLINKS;
         if ($locator->isStream($path)) {
             $directory = $locator->getRecursiveIterator($path, $flags);
         } else {
-            $directory = new \RecursiveDirectoryIterator($path, $flags);
+            $directory = new RecursiveDirectoryIterator($path, $flags);
         }
-        $recursive = new \RecursiveIteratorIterator($directory, \RecursiveIteratorIterator::SELF_FIRST);
-        $iterator = new \RegexIterator($recursive, '/^.+\.'.$extensions.'$/i');
+        $recursive = new RecursiveIteratorIterator($directory, RecursiveIteratorIterator::SELF_FIRST);
+        $iterator = new RegexIterator($recursive, '/^.+\.'.$extensions.'$/ui');
 
-        /** @var \RecursiveDirectoryIterator $file */
+        /** @var RecursiveDirectoryIterator $file */
         foreach ($iterator as $filepath => $file) {
             try {
                 Yaml::parse(static::extractYaml($filepath));
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 $lint_errors[str_replace(GRAV_ROOT, '', $filepath)] = $e->getMessage();
             }
         }
@@ -74,16 +103,20 @@ public static function recurseFolder($path, $extensions = 'md|yaml')
         return $lint_errors;
     }
 
+    /**
+     * @param string $path
+     * @return string
+     */
     protected static function extractYaml($path)
     {
-        $extension = pathinfo($path, PATHINFO_EXTENSION);
+        $extension = Utils::pathinfo($path, PATHINFO_EXTENSION);
         if ($extension === 'md') {
             $file = MarkdownFile::instance($path);
             $contents = $file->frontmatter();
+            $file->free();
         } else {
             $contents = file_get_contents($path);
         }
         return $contents;
     }
-
 }
diff --git a/system/src/Grav/Common/Inflector.php b/system/src/Grav/Common/Inflector.php
index a24bbfd848..216b73350e 100644
--- a/system/src/Grav/Common/Inflector.php
+++ b/system/src/Grav/Common/Inflector.php
@@ -3,33 +3,53 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use DateInterval;
+use DateTime;
+use Grav\Common\Language\Language;
+use function in_array;
+use function is_array;
+use function strlen;
+
 /**
 * This file was originally part of the Akelos Framework
 */
-
 class Inflector
 {
+    /** @var bool */
+    protected static $initialized = false;
+    /** @var array|null */
     protected static $plural;
+    /** @var array|null */
     protected static $singular;
+    /** @var array|null */
     protected static $uncountable;
+    /** @var array|null */
     protected static $irregular;
+    /** @var array|null */
     protected static $ordinals;
 
+    /**
+     * @return void
+     */
     public static function init()
     {
-        if (empty(static::$plural)) {
+        if (!static::$initialized) {
+            static::$initialized = true;
+            /** @var Language $language */
             $language = Grav::instance()['language'];
-            static::$plural = $language->translate('GRAV.INFLECTOR_PLURALS', null, true) ?: [];
-            static::$singular = $language->translate('GRAV.INFLECTOR_SINGULAR', null, true) ?: [];
-            static::$uncountable = $language->translate('GRAV.INFLECTOR_UNCOUNTABLE', null, true) ?: [];
-            static::$irregular = $language->translate('GRAV.INFLECTOR_IRREGULAR', null, true) ?: [];
-            static::$ordinals = $language->translate('GRAV.INFLECTOR_ORDINALS', null, true) ?: [];
+            if (!$language->isDebug()) {
+                static::$plural = $language->translate('GRAV.INFLECTOR_PLURALS', null, true);
+                static::$singular = $language->translate('GRAV.INFLECTOR_SINGULAR', null, true);
+                static::$uncountable = $language->translate('GRAV.INFLECTOR_UNCOUNTABLE', null, true);
+                static::$irregular = $language->translate('GRAV.INFLECTOR_IRREGULAR', null, true);
+                static::$ordinals = $language->translate('GRAV.INFLECTOR_ORDINALS', null, true);
+            }
         }
     }
 
@@ -38,8 +58,7 @@ public static function init()
      *
      * @param string $word  English noun to pluralize
      * @param int    $count The count
-     *
-     * @return string Plural noun
+     * @return string|false Plural noun
      */
     public static function pluralize($word, $count = 2)
     {
@@ -51,26 +70,31 @@ public static function pluralize($word, $count = 2)
 
         $lowercased_word = strtolower($word);
 
-        foreach (static::$uncountable as $_uncountable) {
-            if (substr($lowercased_word, -1 * strlen($_uncountable)) === $_uncountable) {
-                return $word;
+        if (is_array(static::$uncountable)) {
+            foreach (static::$uncountable as $_uncountable) {
+                if (substr($lowercased_word, -1 * strlen($_uncountable)) === $_uncountable) {
+                    return $word;
+                }
             }
         }
 
-        foreach (static::$irregular as $_plural => $_singular) {
-            if (preg_match('/(' . $_plural . ')$/i', $word, $arr)) {
-                return preg_replace('/(' . $_plural . ')$/i', substr($arr[0], 0, 1) . substr($_singular, 1), $word);
+        if (is_array(static::$irregular)) {
+            foreach (static::$irregular as $_plural => $_singular) {
+                if (preg_match('/(' . $_plural . ')$/i', $word, $arr)) {
+                    return preg_replace('/(' . $_plural . ')$/i', substr($arr[0], 0, 1) . substr($_singular, 1), $word);
+                }
             }
         }
 
-        foreach (static::$plural as $rule => $replacement) {
-            if (preg_match($rule, $word)) {
-                return preg_replace($rule, $replacement, $word);
+        if (is_array(static::$plural)) {
+            foreach (static::$plural as $rule => $replacement) {
+                if (preg_match($rule, $word)) {
+                    return preg_replace($rule, $replacement, $word);
+                }
             }
         }
 
         return false;
-
     }
 
     /**
@@ -90,21 +114,28 @@ public static function singularize($word, $count = 1)
         }
 
         $lowercased_word = strtolower($word);
-        foreach (static::$uncountable as $_uncountable) {
-            if (substr($lowercased_word, -1 * strlen($_uncountable)) === $_uncountable) {
-                return $word;
+
+        if (is_array(static::$uncountable)) {
+            foreach (static::$uncountable as $_uncountable) {
+                if (substr($lowercased_word, -1 * strlen($_uncountable)) === $_uncountable) {
+                    return $word;
+                }
             }
         }
 
-        foreach (static::$irregular as $_plural => $_singular) {
-            if (preg_match('/(' . $_singular . ')$/i', $word, $arr)) {
-                return preg_replace('/(' . $_singular . ')$/i', substr($arr[0], 0, 1) . substr($_plural, 1), $word);
+        if (is_array(static::$irregular)) {
+            foreach (static::$irregular as $_plural => $_singular) {
+                if (preg_match('/(' . $_singular . ')$/i', $word, $arr)) {
+                    return preg_replace('/(' . $_singular . ')$/i', substr($arr[0], 0, 1) . substr($_plural, 1), $word);
+                }
             }
         }
 
-        foreach (static::$singular as $rule => $replacement) {
-            if (preg_match($rule, $word)) {
-                return preg_replace($rule, $replacement, $word);
+        if (is_array(static::$singular)) {
+            foreach (static::$singular as $rule => $replacement) {
+                if (preg_match($rule, $word)) {
+                    return preg_replace($rule, $replacement, $word);
+                }
             }
         }
 
@@ -144,8 +175,7 @@ public static function titleize($word, $uppercase = '')
      *
      * @see variablize
      *
-     * @param    string $word Word to convert to camel case
-     *
+     * @param  string $word Word to convert to camel case
      * @return string UpperCamelCasedWord
      */
     public static function camelize($word)
@@ -161,8 +191,7 @@ public static function camelize($word)
      *
      * This can be really useful for creating friendly URLs.
      *
-     * @param    string $word Word to underscore
-     *
+     * @param  string $word Word to underscore
      * @return string Underscored word
      */
     public static function underscorize($word)
@@ -182,8 +211,7 @@ public static function underscorize($word)
      *
      * This can be really useful for creating friendly URLs.
      *
-     * @param    string $word Word to hyphenate
-     *
+     * @param  string $word Word to hyphenate
      * @return string hyphenized word
      */
     public static function hyphenize($word)
@@ -193,6 +221,8 @@ public static function hyphenize($word)
         $regex3 = preg_replace('/([0-9])([A-Z])/', '\1-\2', $regex2);
         $regex4 = preg_replace('/[^A-Z^a-z^0-9]+/', '-', $regex3);
 
+        $regex4 = trim($regex4, '-');
+
         return strtolower($regex4);
     }
 
@@ -228,8 +258,7 @@ public static function humanize($word, $uppercase = '')
      *
      * @see camelize
      *
-     * @param    string $word Word to lowerCamelCase
-     *
+     * @param  string $word Word to lowerCamelCase
      * @return string Returns a lowerCamelCasedWord
      */
     public static function variablize($word)
@@ -247,8 +276,7 @@ public static function variablize($word)
      *
      * @see classify
      *
-     * @param    string $class_name Class name for getting related table_name.
-     *
+     * @param  string $class_name Class name for getting related table_name.
      * @return string plural_table_name
      */
     public static function tableize($class_name)
@@ -264,8 +292,7 @@ public static function tableize($class_name)
      *
      * @see tableize
      *
-     * @param    string $table_name Table name for getting related ClassName.
-     *
+     * @param  string $table_name Table name for getting related ClassName.
      * @return string SingularClassName
      */
     public static function classify($table_name)
@@ -278,15 +305,18 @@ public static function classify($table_name)
      *
      * This method converts 13 to 13th, 2 to 2nd ...
      *
-     * @param    int $number Number to get its ordinal value
-     *
+     * @param  int $number Number to get its ordinal value
      * @return string Ordinal representation of given string.
      */
     public static function ordinalize($number)
     {
+        if (!is_array(static::$ordinals)) {
+            return (string)$number;
+        }
+
         static::init();
 
-        if (\in_array($number % 100, range(11, 13), true)) {
+        if (in_array($number % 100, range(11, 13), true)) {
             return $number . static::$ordinals['default'];
         }
 
@@ -306,15 +336,14 @@ public static function ordinalize($number)
      * Converts a number of days to a number of months
      *
      * @param int $days
-     *
      * @return int
      */
     public static function monthize($days)
     {
-        $now = new \DateTime();
-        $end = new \DateTime();
+        $now = new DateTime();
+        $end = new DateTime();
 
-        $duration = new \DateInterval("P{$days}D");
+        $duration = new DateInterval("P{$days}D");
 
         $diff = $end->add($duration)->diff($now);
 
diff --git a/system/src/Grav/Common/Iterator.php b/system/src/Grav/Common/Iterator.php
index 5f6dc7ea09..5db7bd0452 100644
--- a/system/src/Grav/Common/Iterator.php
+++ b/system/src/Grav/Common/Iterator.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,14 +15,20 @@
 use RocketTheme\Toolbox\ArrayTraits\Countable;
 use RocketTheme\Toolbox\ArrayTraits\Export;
 use RocketTheme\Toolbox\ArrayTraits\Serializable;
+use function array_slice;
+use function count;
+use function is_callable;
+use function is_object;
 
+/**
+ * Class Iterator
+ * @package Grav\Common
+ */
 class Iterator implements \ArrayAccess, \Iterator, \Countable, \Serializable
 {
     use Constructor, ArrayAccessWithGetters, ArrayIterator, Countable, Serializable, Export;
 
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $items = [];
 
     /**
@@ -30,9 +36,9 @@ class Iterator implements \ArrayAccess, \Iterator, \Countable, \Serializable
      *
      * @param  string $key
      * @param  mixed  $args
-     *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function __call($key, $args)
     {
         return $this->items[$key] ?? null;
@@ -41,10 +47,11 @@ public function __call($key, $args)
     /**
      * Clone the iterator.
      */
+    #[\ReturnTypeWillChange]
     public function __clone()
     {
         foreach ($this as $key => $value) {
-            if (\is_object($value)) {
+            if (is_object($value)) {
                 $this->{$key} = clone $this->{$key};
             }
         }
@@ -55,6 +62,7 @@ public function __clone()
      *
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function __toString()
     {
         return implode(',', $this->items);
@@ -64,6 +72,7 @@ public function __toString()
      * Remove item from the list.
      *
      * @param string $key
+     * @return void
      */
     public function remove($key)
     {
@@ -84,7 +93,6 @@ public function prev()
      * Return nth item.
      *
      * @param int $key
-     *
      * @return mixed|bool
      */
     public function nth($key)
@@ -133,7 +141,7 @@ public function reverse()
     /**
      * @param mixed $needle Searched value.
      *
-     * @return string|bool  Key if found, otherwise false.
+     * @return string|int|false  Key if found, otherwise false.
      */
     public function indexOf($needle)
     {
@@ -170,13 +178,12 @@ public function shuffle()
      * Slice the list.
      *
      * @param int $offset
-     * @param int $length
-     *
+     * @param int|null $length
      * @return $this
      */
     public function slice($offset, $length = null)
     {
-        $this->items = \array_slice($this->items, $offset, $length);
+        $this->items = array_slice($this->items, $offset, $length);
 
         return $this;
     }
@@ -185,12 +192,11 @@ public function slice($offset, $length = null)
      * Pick one or more random entries.
      *
      * @param int $num Specifies how many entries should be picked.
-     *
      * @return $this
      */
     public function random($num = 1)
     {
-        $count = \count($this->items);
+        $count = count($this->items);
         if ($num > $count) {
             $num = $count;
         }
@@ -204,7 +210,6 @@ public function random($num = 1)
      * Append new elements to the list.
      *
      * @param array|Iterator $items Items to be appended. Existing keys will be overridden with the new values.
-     *
      * @return $this
      */
     public function append($items)
@@ -228,10 +233,7 @@ public function append($items)
     public function filter(callable $callback = null)
     {
         foreach ($this->items as $key => $value) {
-            if (
-                (!$callback && !(bool)$value) ||
-                ($callback && !$callback($value, $key))
-            ) {
+            if ((!$callback && !(bool)$value) || ($callback && !$callback($value, $key))) {
                 unset($this->items[$key]);
             }
         }
@@ -244,16 +246,13 @@ public function filter(callable $callback = null)
      * Sorts elements from the list and returns a copy of the list in the proper order
      *
      * @param callable|null $callback
-     *
      * @param bool          $desc
-     *
      * @return $this|array
-     * @internal param bool $asc
      *
      */
     public function sort(callable $callback = null, $desc = false)
     {
-        if (!$callback || !\is_callable($callback)) {
+        if (!$callback || !is_callable($callback)) {
             return $this;
         }
 
diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php
index a625146a22..fe006ed2cb 100644
--- a/system/src/Grav/Common/Language/Language.php
+++ b/system/src/Grav/Common/Language/Language.php
@@ -3,65 +3,96 @@
 /**
  * @package    Grav\Common\Language
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Language;
 
+use Grav\Common\Debugger;
 use Grav\Common\Grav;
 use Grav\Common\Config\Config;
 use Negotiation\AcceptLanguage;
 use Negotiation\LanguageNegotiator;
+use function array_key_exists;
+use function count;
+use function in_array;
+use function is_array;
+use function is_string;
 
+/**
+ * Class Language
+ * @package Grav\Common\Language
+ */
 class Language
 {
+    /** @var Grav */
     protected $grav;
+    /** @var Config */
+    protected $config;
+    /** @var bool */
     protected $enabled = true;
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $languages = [];
-    protected $page_extensions = [];
+    /** @var array */
     protected $fallback_languages = [];
+    /** @var array */
+    protected $fallback_extensions = [];
+    /** @var array */
+    protected $page_extensions = [];
+    /** @var string|false */
     protected $default;
-    protected $active = null;
-
-    /** @var Config $config */
-    protected $config;
-
+    /** @var string|false */
+    protected $active;
+    /** @var array */
     protected $http_accept_language;
+    /** @var bool */
     protected $lang_in_url = false;
 
     /**
      * Constructor
      *
-     * @param \Grav\Common\Grav $grav
+     * @param Grav $grav
      */
     public function __construct(Grav $grav)
     {
         $this->grav = $grav;
         $this->config = $grav['config'];
-        $this->languages = $this->config->get('system.languages.supported', []);
+
+        $languages = $this->config->get('system.languages.supported', []);
+        foreach ($languages as &$language) {
+            $language = (string)$language;
+        }
+        unset($language);
+
+        $this->languages = $languages;
+
         $this->init();
     }
 
     /**
      * Initialize the default and enabled languages
+     *
+     * @return void
      */
     public function init()
     {
         $default = $this->config->get('system.languages.default_lang');
-        if (isset($default) && $this->validate($default)) {
-            $this->default = $default;
-        } else {
-            $this->default = reset($this->languages);
+        if (null !== $default) {
+            $default = (string)$default;
         }
 
-        $this->page_extensions = null;
+        // Note that reset returns false on empty languages.
+        $this->default = $default ?? reset($this->languages);
+
+        $this->resetFallbackPageExtensions();
 
         if (empty($this->languages)) {
+            // If no languages are set, turn of multi-language support.
             $this->enabled = false;
+        } elseif ($default && !in_array($default, $this->languages, true)) {
+            // If default language isn't in the language list, we need to add it.
+            array_unshift($this->languages, $default);
         }
     }
 
@@ -75,6 +106,16 @@ public function enabled()
         return $this->enabled;
     }
 
+    /**
+     * Returns true if language debugging is turned on.
+     *
+     * @return bool
+     */
+    public function isDebug(): bool
+    {
+        return !$this->config->get('system.languages.translations', true);
+    }
+
     /**
      * Gets the array of supported languages
      *
@@ -89,24 +130,27 @@ public function getLanguages()
      * Sets the current supported languages manually
      *
      * @param array $langs
+     * @return void
      */
     public function setLanguages($langs)
     {
         $this->languages = $langs;
+
         $this->init();
     }
 
     /**
      * Gets a pipe-separated string of available languages
      *
+     * @param string|null $delimiter Delimiter to be quoted.
      * @return string
      */
-    public function getAvailable()
+    public function getAvailable($delimiter = null)
     {
         $languagesArray = $this->languages; //Make local copy
 
-        $languagesArray = array_map(function($value) {
-            return preg_quote($value);
+        $languagesArray = array_map(static function ($value) use ($delimiter) {
+            return preg_quote($value, $delimiter);
         }, $languagesArray);
 
         sort($languagesArray);
@@ -117,7 +161,7 @@ public function getAvailable()
     /**
      * Gets language, active if set, else default
      *
-     * @return string
+     * @return string|false
      */
     public function getLanguage()
     {
@@ -127,7 +171,7 @@ public function getLanguage()
     /**
      * Gets current default language
      *
-     * @return mixed
+     * @return string|false
      */
     public function getDefault()
     {
@@ -138,11 +182,11 @@ public function getDefault()
      * Sets default language manually
      *
      * @param string $lang
-     *
-     * @return bool
+     * @return string|bool
      */
     public function setDefault($lang)
     {
+        $lang = (string)$lang;
         if ($this->validate($lang)) {
             $this->default = $lang;
 
@@ -155,7 +199,7 @@ public function setDefault($lang)
     /**
      * Gets current active language
      *
-     * @return string
+     * @return string|false
      */
     public function getActive()
     {
@@ -165,13 +209,17 @@ public function getActive()
     /**
      * Sets active language manually
      *
-     * @param string $lang
-     *
-     * @return string|bool
+     * @param string|false $lang
+     * @return string|false
      */
     public function setActive($lang)
     {
+        $lang = (string)$lang;
         if ($this->validate($lang)) {
+            /** @var Debugger $debugger */
+            $debugger = $this->grav['debugger'];
+            $debugger->addMessage('Active language set to ' . $lang, 'debug');
+
             $this->active = $lang;
 
             return $lang;
@@ -184,7 +232,6 @@ public function setActive($lang)
      * Sets the active language based on the first part of the URL
      *
      * @param string $uri
-     *
      * @return string
      */
     public function setActiveFromUri($uri)
@@ -196,7 +243,7 @@ public function setActiveFromUri($uri)
             // Try setting language from prefix of URL (/en/blah/blah).
             if (preg_match($regex, $uri, $matches)) {
                 $this->lang_in_url = true;
-                $this->active = $matches[2];
+                $this->setActive($matches[2]);
                 $uri = preg_replace("/\\" . $matches[1] . '/', '', $uri, 1);
 
                 // Store in session if language is different.
@@ -210,22 +257,20 @@ public function setActiveFromUri($uri)
                 // Try getting language from the session, else no active.
                 if (isset($this->grav['session']) && $this->grav['session']->isStarted() &&
                     $this->config->get('system.languages.session_store_active', true)) {
-                    $this->active = $this->grav['session']->active_language ?: null;
+                    $this->setActive($this->grav['session']->active_language ?: null);
                 }
                 // if still null, try from http_accept_language header
                 if ($this->active === null &&
                     $this->config->get('system.languages.http_accept_language') &&
                     $accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? false) {
-
                     $negotiator = new LanguageNegotiator();
                     $best_language = $negotiator->getBest($accept, $this->languages);
 
                     if ($best_language instanceof AcceptLanguage) {
-                        $this->active = $best_language->getType();
+                        $this->setActive($best_language->getType());
                     } else {
-                        $this->active = $this->getDefault();
+                        $this->setActive($this->getDefault());
                     }
-
                 }
             }
         }
@@ -241,6 +286,10 @@ public function setActiveFromUri($uri)
      */
     public function getLanguageURLPrefix($lang = null)
     {
+        if (!$this->enabled()) {
+            return '';
+        }
+
         // if active lang is not passed in, use current active
         if (!$lang) {
             $lang = $this->getLanguage();
@@ -257,6 +306,10 @@ public function getLanguageURLPrefix($lang = null)
      */
     public function isIncludeDefaultLanguage($lang = null)
     {
+        if (!$this->enabled()) {
+            return false;
+        }
+
         // if active lang is not passed in, use current active
         if (!$lang) {
             $lang = $this->getLanguage();
@@ -275,52 +328,63 @@ public function isLanguageInUrl()
         return (bool) $this->lang_in_url;
     }
 
-
     /**
-     * Gets an array of valid extensions with active first, then fallback extensions
-     *
-     * @param string|null $file_ext
+     * Get full list of used language page extensions: [''=>'.md', 'en'=>'.en.md', ...]
      *
+     * @param string|null $fileExtension
      * @return array
      */
-    public function getFallbackPageExtensions($file_ext = null)
+    public function getPageExtensions($fileExtension = null)
     {
-        if (empty($this->page_extensions)) {
-            if (!$file_ext) {
-                $file_ext = CONTENT_EXT;
+        $fileExtension = $fileExtension ?: CONTENT_EXT;
+
+        if (!isset($this->fallback_extensions[$fileExtension])) {
+            $extensions[''] = $fileExtension;
+            foreach ($this->languages as $code) {
+                $extensions[$code] = ".{$code}{$fileExtension}";
             }
 
-            if ($this->enabled()) {
-                $valid_lang_extensions = [];
-                foreach ($this->languages as $lang) {
-                    $valid_lang_extensions[] = '.' . $lang . $file_ext;
-                }
+            $this->fallback_extensions[$fileExtension] = $extensions;
+        }
 
-                if ($this->active) {
-                    $active_extension = '.' . $this->active . $file_ext;
-                    $key = \array_search($active_extension, $valid_lang_extensions, true);
+        return $this->fallback_extensions[$fileExtension];
+    }
 
-                    // Default behavior is to find any language other than active
-                    if ($this->config->get('system.languages.pages_fallback_only')) {
-                        $slice = \array_slice($valid_lang_extensions, 0, $key+1);
-                        $valid_lang_extensions = array_reverse($slice);
-                    } else {
-                        unset($valid_lang_extensions[$key]);
-                        array_unshift($valid_lang_extensions, $active_extension);
-                    }
+    /**
+     * Gets an array of valid extensions with active first, then fallback extensions
+     *
+     * @param string|null $fileExtension
+     * @param string|null $languageCode
+     * @param bool $assoc  Return values in ['en' => '.en.md', ...] format.
+     * @return array Key is the language code, value is the file extension to be used.
+     */
+    public function getFallbackPageExtensions(string $fileExtension = null, string $languageCode = null, bool $assoc = false)
+    {
+        $fileExtension = $fileExtension ?: CONTENT_EXT;
+        $key = $fileExtension . '-' . ($languageCode ?? 'default') . '-' . (int)$assoc;
+
+        if (!isset($this->fallback_extensions[$key])) {
+            $all = $this->getPageExtensions($fileExtension);
+            $list = [];
+            $fallback = $this->getFallbackLanguages($languageCode, true);
+            foreach ($fallback as $code) {
+                $ext = $all[$code] ?? null;
+                if (null !== $ext) {
+                    $list[$code] = $ext;
                 }
-                $valid_lang_extensions[] = $file_ext;
-                $this->page_extensions = $valid_lang_extensions;
-            } else {
-                $this->page_extensions = (array)$file_ext;
             }
+            if (!$assoc) {
+                $list = array_values($list);
+            }
+
+            $this->fallback_extensions[$key] = $list;
         }
 
-        return $this->page_extensions;
+        return $this->fallback_extensions[$key];
     }
 
     /**
-     * Resets the page_extensions value.
+     * Resets the fallback_languages value.
      *
      * Useful to re-initialize the pages and change site language at runtime, example:
      *
@@ -329,48 +393,90 @@ public function getFallbackPageExtensions($file_ext = null)
      * $this->grav['language']->resetFallbackPageExtensions();
      * $this->grav['pages']->init();
      * ```
+     *
+     * @return void
      */
     public function resetFallbackPageExtensions()
     {
-        $this->page_extensions = null;
+        $this->fallback_languages = [];
+        $this->fallback_extensions = [];
+        $this->page_extensions = [];
     }
 
     /**
-     * Gets an array of languages with active first, then fallback languages
+     * Gets an array of languages with active first, then fallback languages.
+     *
      *
+     * @param string|null  $languageCode
+     * @param bool $includeDefault  If true, list contains '', which can be used for default
      * @return array
      */
-    public function getFallbackLanguages()
+    public function getFallbackLanguages(string $languageCode = null, bool $includeDefault = false)
     {
-        if (empty($this->fallback_languages)) {
-            if ($this->enabled()) {
-                $fallback_languages = $this->languages;
-
-                if ($this->active) {
-                    $active_extension = $this->active;
-                    $key = \array_search($active_extension, $fallback_languages, true);
-                    unset($fallback_languages[$key]);
-                    array_unshift($fallback_languages, $active_extension);
+        // Handle default.
+        if ($languageCode === '' || !$this->enabled()) {
+            return [''];
+        }
+
+        $default = $this->getDefault() ?? 'en';
+        $active = $languageCode ?? $this->getActive() ?? $default;
+        $key = $active . '-' . (int)$includeDefault;
+
+        if (!isset($this->fallback_languages[$key])) {
+            $fallback = $this->config->get('system.languages.content_fallback.' . $active);
+            $fallback_languages = [];
+
+            if (null === $fallback && $this->config->get('system.languages.pages_fallback_only', false)) {
+                user_error('Configuration option `system.languages.pages_fallback_only` is deprecated since Grav 1.7, use `system.languages.content_fallback` instead', E_USER_DEPRECATED);
+
+                // Special fallback list returns itself and all the previous items in reverse order:
+                // active: 'v2', languages: ['v1', 'v2', 'v3', 'v4'] => ['v2', 'v1', '']
+                if ($includeDefault) {
+                    $fallback_languages[''] = '';
+                }
+                foreach ($this->languages as $code) {
+                    $fallback_languages[$code] = $code;
+                    if ($code === $active) {
+                        break;
+                    }
+                }
+                $fallback_languages = array_reverse($fallback_languages);
+            } else {
+                if (null === $fallback) {
+                    $fallback = [$default];
+                } elseif (!is_array($fallback)) {
+                    $fallback = is_string($fallback) && $fallback !== '' ? explode(',', $fallback) : [];
+                }
+                array_unshift($fallback, $active);
+                $fallback = array_unique($fallback);
+
+                foreach ($fallback as $code) {
+                    // Default fallback list has active language followed by default language and extensionless file:
+                    // active: 'fi', default: 'en', languages: ['sv', 'en', 'de', 'fi'] => ['fi', 'en', '']
+                    $fallback_languages[$code] = $code;
+                    if ($includeDefault && $code === $default) {
+                        $fallback_languages[''] = '';
+                    }
                 }
-                $this->fallback_languages = $fallback_languages;
             }
-            // always add english in case a translation doesn't exist
-            $this->fallback_languages[] = 'en';
+
+            $fallback_languages = array_values($fallback_languages);
+
+            $this->fallback_languages[$key] = $fallback_languages;
         }
 
-        return $this->fallback_languages;
+        return $this->fallback_languages[$key];
     }
 
     /**
      * Ensures the language is valid and supported
      *
      * @param string $lang
-     *
      * @return bool
      */
     public function validate($lang)
     {
-        return \in_array($lang, $this->languages, true);
+        return in_array($lang, $this->languages, true);
     }
 
     /**
@@ -378,45 +484,40 @@ public function validate($lang)
      *
      * @param string|array $args      The first argument is the lookup key value
      *                         Other arguments can be passed and replaced in the translation with sprintf syntax
-     * @param array $languages
+     * @param array|null $languages
      * @param bool  $array_support
      * @param bool  $html_out
-     *
-     * @return string
+     * @return string|string[]
      */
     public function translate($args, array $languages = null, $array_support = false, $html_out = false)
     {
-        if (\is_array($args)) {
+        if (is_array($args)) {
             $lookup = array_shift($args);
         } else {
             $lookup = $args;
             $args = [];
         }
 
-        if ($this->config->get('system.languages.translations', true)) {
-            if ($this->enabled() && $lookup) {
-                if (empty($languages)) {
-                    if ($this->config->get('system.languages.translations_fallback', true)) {
-                        $languages = $this->getFallbackLanguages();
-                    } else {
-                        $languages = (array)$this->getLanguage();
-                    }
-                }
-            } else {
-                $languages = ['en'];
+        if (!$this->isDebug()) {
+            if ($lookup && $this->enabled() && empty($languages)) {
+                $languages = $this->getTranslatedLanguages();
             }
 
+            $languages = $languages ?: ['en'];
+
             foreach ((array)$languages as $lang) {
                 $translation = $this->getTranslation($lang, $lookup, $array_support);
 
                 if ($translation) {
-                    if (\count($args) >= 1) {
+                    if (is_string($translation) && count($args) >= 1) {
                         return vsprintf($translation, $args);
                     }
 
                     return $translation;
                 }
             }
+        } elseif ($array_support) {
+            return [$lookup];
         }
 
         if ($html_out) {
@@ -433,29 +534,24 @@ public function translate($args, array $languages = null, $array_support = false
      * @param string $index
      * @param array|null $languages
      * @param bool $html_out
-     *
      * @return string
      */
     public function translateArray($key, $index, $languages = null, $html_out = false)
     {
-        if ($this->config->get('system.languages.translations', true)) {
-            if ($this->enabled() && $key) {
-                if (empty($languages)) {
-                    if ($this->config->get('system.languages.translations_fallback', true)) {
-                        $languages = $this->getFallbackLanguages();
-                    } else {
-                        $languages = (array)$this->getDefault();
-                    }
-                }
-            } else {
-                $languages = ['en'];
-            }
+        if ($this->isDebug()) {
+            return $key . '[' . $index . ']';
+        }
 
-            foreach ((array)$languages as $lang) {
-                $translation_array = (array)Grav::instance()['languages']->get($lang . '.' . $key, null);
-                if ($translation_array && array_key_exists($index, $translation_array)) {
-                    return $translation_array[$index];
-                }
+        if ($key && empty($languages) && $this->enabled()) {
+            $languages = $this->getTranslatedLanguages();
+        }
+
+        $languages = $languages ?: ['en'];
+
+        foreach ((array)$languages as $lang) {
+            $translation_array = (array)Grav::instance()['languages']->get($lang . '.' . $key, null);
+            if ($translation_array && array_key_exists($index, $translation_array)) {
+                return $translation_array[$index];
             }
         }
 
@@ -472,11 +568,14 @@ public function translateArray($key, $index, $languages = null, $html_out = fals
      * @param string $lang lang code
      * @param string $key  key to lookup with
      * @param bool $array_support
-     *
-     * @return string
+     * @return string|string[]
      */
     public function getTranslation($lang, $key, $array_support = false)
     {
+        if ($this->isDebug()) {
+            return $key;
+        }
+
         $translation = Grav::instance()['languages']->get($lang . '.' . $key, null);
         if (!$array_support && is_array($translation)) {
             return (string)array_shift($translation);
@@ -527,11 +626,38 @@ public function getBrowserLanguages($accept_langs = [])
      *
      * @param string $code
      * @param string $type
-     * @return bool
+     * @return string|false
      */
     public function getLanguageCode($code, $type = 'name')
     {
         return LanguageCodes::get($code, $type);
     }
 
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
+    public function __debugInfo()
+    {
+        $vars = get_object_vars($this);
+        unset($vars['grav'], $vars['config']);
+
+        return $vars;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getTranslatedLanguages(): array
+    {
+        if ($this->config->get('system.languages.translations_fallback', true)) {
+            $languages = $this->getFallbackLanguages();
+        } else {
+            $languages = [$this->getLanguage()];
+        }
+
+        $languages[] = 'en';
+
+        return array_values(array_unique($languages));
+    }
 }
diff --git a/system/src/Grav/Common/Language/LanguageCodes.php b/system/src/Grav/Common/Language/LanguageCodes.php
index 780df7c029..ddd37c9b88 100644
--- a/system/src/Grav/Common/Language/LanguageCodes.php
+++ b/system/src/Grav/Common/Language/LanguageCodes.php
@@ -3,14 +3,19 @@
 /**
  * @package    Grav\Common\Language
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Language;
 
+/**
+ * Class LanguageCodes
+ * @package Grav\Common\Language
+ */
 class LanguageCodes
 {
+    /** @var array */
     protected static $codes = [
         'af'         => [ 'name' => 'Afrikaans',                 'nativeName' => 'Afrikaans' ],
         'ak'         => [ 'name' => 'Akan',                      'nativeName' => 'Akan' ], // unverified native name
@@ -81,13 +86,15 @@ class LanguageCodes
         'ja-JP'      => [ 'name' => 'Japanese',                  'nativeName' => '日本語' ], // not iso-639-1
         'ka'         => [ 'name' => 'Georgian',                  'nativeName' => 'ქართული' ],
         'kk'         => [ 'name' => 'Kazakh',                    'nativeName' => 'Қазақ' ],
+        'km'         => [ 'name' => 'Khmer',                     'nativeName' => 'Khmer' ],
         'kn'         => [ 'name' => 'Kannada',                   'nativeName' => 'ಕನ್ನಡ' ],
         'ko'         => [ 'name' => 'Korean',                    'nativeName' => '한국어' ],
         'ku'         => [ 'name' => 'Kurdish',                   'nativeName' => 'Kurdî' ],
         'la'         => [ 'name' => 'Latin',                     'nativeName' => 'Latina' ],
         'lb'         => [ 'name' => 'Luxembourgish',             'nativeName' => 'Lëtzebuergesch' ],
         'lg'         => [ 'name' => 'Luganda',                   'nativeName' => 'Luganda' ],
-        'lt'         => [ 'name' => 'Lithuanian',                'nativeName' => 'Lietuvių kalba' ],
+        'lo'         => [ 'name' => 'Lao',                       'nativeName' => 'Lao' ],
+        'lt'         => [ 'name' => 'Lithuanian',                'nativeName' => 'Lietuvių' ],
         'lv'         => [ 'name' => 'Latvian',                   'nativeName' => 'Latviešu' ],
         'mai'        => [ 'name' => 'Maithili',                  'nativeName' => 'मैथिली মৈথিলী' ],
         'mg'         => [ 'name' => 'Malagasy',                  'nativeName' => 'Malagasy' ],
@@ -96,6 +103,7 @@ class LanguageCodes
         'ml'         => [ 'name' => 'Malayalam',                 'nativeName' => 'മലയാളം' ],
         'mn'         => [ 'name' => 'Mongolian',                 'nativeName' => 'Монгол' ],
         'mr'         => [ 'name' => 'Marathi',                   'nativeName' => 'मराठी' ],
+        'my'         => [ 'name' => 'Myanmar (Burmese)',         'nativeName' => 'ဗမာी' ],
         'no'         => [ 'name' => 'Norwegian',                 'nativeName' => 'Norsk' ],
         'nb'         => [ 'name' => 'Norwegian',                 'nativeName' => 'Norsk' ],
         'nb-NO'      => [ 'name' => 'Norwegian (Bokmål)',        'nativeName' => 'Norsk bokmål' ],
@@ -127,6 +135,7 @@ class LanguageCodes
         'st'         => [ 'name' => 'Southern Sotho',            'nativeName' => 'Sesotho' ],
         'sv'         => [ 'name' => 'Swedish',                   'nativeName' => 'Svenska' ],
         'sv-SE'      => [ 'name' => 'Swedish',                   'nativeName' => 'Svenska' ],
+        'sw'         => [ 'name' => 'Swahili',                   'nativeName' => 'Swahili' ],
         'ta'         => [ 'name' => 'Tamil',                     'nativeName' => 'தமிழ்' ],
         'ta-IN'      => [ 'name' => 'Tamil (India)',             'nativeName' => 'தமிழ் (இந்தியா)' ],
         'ta-LK'      => [ 'name' => 'Tamil (Sri Lanka)',         'nativeName' => 'தமிழ் (இலங்கை)' ],
@@ -144,17 +153,27 @@ class LanguageCodes
         'vi'         => [ 'name' => 'Vietnamese',                'nativeName' => 'Tiếng Việt' ],
         'wo'         => [ 'name' => 'Wolof',                     'nativeName' => 'Wolof' ],
         'xh'         => [ 'name' => 'Xhosa',                     'nativeName' => 'isiXhosa' ],
+        'yi'         => [ 'name' => 'Yiddish',                   'nativeName' => 'ייִדיש', 'orientation' => 'rtl'  ],
+        'ydd'        => [ 'name' => 'Yiddish',                   'nativeName' => 'ייִדיש', 'orientation' => 'rtl'  ],
         'zh'         => [ 'name' => 'Chinese (Simplified)',      'nativeName' => '中文 (简体)' ],
         'zh-CN'      => [ 'name' => 'Chinese (Simplified)',      'nativeName' => '中文 (简体)' ],
         'zh-TW'      => [ 'name' => 'Chinese (Traditional)',     'nativeName' => '正體中文 (繁體)' ],
         'zu'         => [ 'name' => 'Zulu',                      'nativeName' => 'isiZulu' ]
     ];
 
+    /**
+     * @param string $code
+     * @return string|false
+     */
     public static function getName($code)
     {
         return static::get($code, 'name');
     }
 
+    /**
+     * @param string $code
+     * @return string|false
+     */
     public static function getNativeName($code)
     {
         if (isset(static::$codes[$code])) {
@@ -168,21 +187,28 @@ public static function getNativeName($code)
         return $code;
     }
 
+    /**
+     * @param string $code
+     * @return string
+     */
     public static function getOrientation($code)
     {
-        if (isset(static::$codes[$code])) {
-            if (isset(static::$codes[$code]['orientation'])) {
-                return static::get($code, 'orientation');
-            }
-        }
-        return 'ltr';
+        return static::$codes[$code]['orientation'] ?? 'ltr';
     }
 
+    /**
+     * @param string $code
+     * @return bool
+     */
     public static function isRtl($code)
     {
         return static::getOrientation($code) === 'rtl';
     }
 
+    /**
+     * @param array $keys
+     * @return array
+     */
     public static function getNames(array $keys)
     {
         $results = [];
@@ -194,12 +220,27 @@ public static function getNames(array $keys)
         return $results;
     }
 
+    /**
+     * @param string $code
+     * @param string $type
+     * @return string|false
+     */
     public static function get($code, $type)
     {
-        if (isset(static::$codes[$code][$type])) {
-            return static::$codes[$code][$type];
+        return static::$codes[$code][$type] ?? false;
+    }
+
+    /**
+     * @param bool $native
+     * @return array
+     */
+    public static function getList($native = true)
+    {
+        $list = [];
+        foreach (static::$codes as $key => $names) {
+            $list[$key] = $native ? $names['nativeName'] : $names['name'];
         }
 
-        return false;
+        return $list;
     }
 }
diff --git a/system/src/Grav/Common/Markdown/Parsedown.php b/system/src/Grav/Common/Markdown/Parsedown.php
index 32033ddff0..f0d8a48ff8 100644
--- a/system/src/Grav/Common/Markdown/Parsedown.php
+++ b/system/src/Grav/Common/Markdown/Parsedown.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Markdown
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,6 +12,10 @@
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Page\Markdown\Excerpts;
 
+/**
+ * Class Parsedown
+ * @package Grav\Common\Markdown
+ */
 class Parsedown extends \Parsedown
 {
     use ParsedownGravTrait;
@@ -19,7 +23,7 @@ class Parsedown extends \Parsedown
     /**
      * Parsedown constructor.
      *
-     * @param Excerpts|null $excerpts
+     * @param Excerpts|PageInterface|null $excerpts
      * @param array|null $defaults
      */
     public function __construct($excerpts = null, $defaults = null)
@@ -35,5 +39,4 @@ public function __construct($excerpts = null, $defaults = null)
 
         $this->init($excerpts, $defaults);
     }
-
 }
diff --git a/system/src/Grav/Common/Markdown/ParsedownExtra.php b/system/src/Grav/Common/Markdown/ParsedownExtra.php
index a562d8d4a8..ef450feaf4 100644
--- a/system/src/Grav/Common/Markdown/ParsedownExtra.php
+++ b/system/src/Grav/Common/Markdown/ParsedownExtra.php
@@ -3,15 +3,20 @@
 /**
  * @package    Grav\Common\Markdown
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Markdown;
 
+use Exception;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Page\Markdown\Excerpts;
 
+/**
+ * Class ParsedownExtra
+ * @package Grav\Common\Markdown
+ */
 class ParsedownExtra extends \ParsedownExtra
 {
     use ParsedownGravTrait;
@@ -19,9 +24,9 @@ class ParsedownExtra extends \ParsedownExtra
     /**
      * ParsedownExtra constructor.
      *
-     * @param Excerpts|null $excerpts
+     * @param Excerpts|PageInterface|null $excerpts
      * @param array|null $defaults
-     * @throws \Exception
+     * @throws Exception
      */
     public function __construct($excerpts = null, $defaults = null)
     {
diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index aa76cdf0ce..a593dd749b 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Markdown
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,23 +11,34 @@
 
 use Grav\Common\Page\Markdown\Excerpts;
 use Grav\Common\Page\Interfaces\PageInterface;
+use function call_user_func_array;
+use function in_array;
+use function strlen;
 
+/**
+ * Trait ParsedownGravTrait
+ * @package Grav\Common\Markdown
+ */
 trait ParsedownGravTrait
 {
+    /** @var array */
+    public $completable_blocks = [];
+    /** @var array */
+    public $continuable_blocks = [];
+
     /** @var Excerpts */
     protected $excerpts;
-
+    /** @var array */
     protected $special_chars;
+    /** @var string */
     protected $twig_link_regex = '/\!*\[(?:.*)\]\((\{([\{%#])\s*(.*?)\s*(?:\2|\})\})\)/';
 
-    public $completable_blocks = [];
-    public $continuable_blocks = [];
-
     /**
      * Initialization function to setup key variables needed by the MarkdownGravLinkTrait
      *
      * @param PageInterface|Excerpts|null $excerpts
      * @param array|null $defaults
+     * @return void
      */
     protected function init($excerpts = null, $defaults = null)
     {
@@ -79,6 +90,7 @@ public function getExcerpts()
      * @param bool $continuable
      * @param bool $completable
      * @param int|null $index
+     * @return void
      */
     public function addBlockType($type, $tag, $continuable = false, $completable = false, $index = null)
     {
@@ -110,6 +122,7 @@ public function addBlockType($type, $tag, $continuable = false, $completable = f
      * @param string $type
      * @param string $tag
      * @param int|null $index
+     * @return void
      */
     public function addInlineType($type, $tag, $index = null)
     {
@@ -128,12 +141,11 @@ public function addInlineType($type, $tag, $index = null)
      * Overrides the default behavior to allow for plugin-provided blocks to be continuable
      *
      * @param string $Type
-     *
      * @return bool
      */
     protected function isBlockContinuable($Type)
     {
-        $continuable = \in_array($Type, $this->continuable_blocks, true)
+        $continuable = in_array($Type, $this->continuable_blocks, true)
             || method_exists($this, 'block' . $Type . 'Continue');
 
         return $continuable;
@@ -143,12 +155,11 @@ protected function isBlockContinuable($Type)
      *  Overrides the default behavior to allow for plugin-provided blocks to be completable
      *
      * @param string $Type
-     *
      * @return bool
      */
     protected function isBlockCompletable($Type)
     {
-        $completable = \in_array($Type, $this->completable_blocks, true)
+        $completable = in_array($Type, $this->completable_blocks, true)
             || method_exists($this, 'block' . $Type . 'Complete');
 
         return $completable;
@@ -159,7 +170,6 @@ protected function isBlockCompletable($Type)
      * Make the element function publicly accessible, Medium uses this to render from Twig
      *
      * @param  array $Element
-     *
      * @return string markup
      */
     public function elementToHtml(array $Element)
@@ -171,7 +181,6 @@ public function elementToHtml(array $Element)
      * Setter for special chars
      *
      * @param array $special_chars
-     *
      * @return $this
      */
     public function setSpecialChars($special_chars)
@@ -196,6 +205,10 @@ protected function blockTwigTag($line)
         return null;
     }
 
+    /**
+     * @param array $excerpt
+     * @return array|null
+     */
     protected function inlineSpecialCharacter($excerpt)
     {
         if ($excerpt['text'][0] === '&' && !preg_match('/^&#?\w+;/', $excerpt['text'])) {
@@ -215,6 +228,10 @@ protected function inlineSpecialCharacter($excerpt)
         return null;
     }
 
+    /**
+     * @param array $excerpt
+     * @return array
+     */
     protected function inlineImage($excerpt)
     {
         if (preg_match($this->twig_link_regex, $excerpt['text'], $matches)) {
@@ -237,6 +254,10 @@ protected function inlineImage($excerpt)
         return $excerpt;
     }
 
+    /**
+     * @param array $excerpt
+     * @return array
+     */
     protected function inlineLink($excerpt)
     {
         $type = $excerpt['type'] ?? 'link';
@@ -263,13 +284,18 @@ protected function inlineLink($excerpt)
 
     /**
      * For extending this class via plugins
+     *
+     * @param string $method
+     * @param array $args
+     * @return mixed|null
      */
+    #[\ReturnTypeWillChange]
     public function __call($method, $args)
     {
         if (isset($this->{$method}) === true) {
             $func = $this->{$method};
 
-            return  \call_user_func_array($func, $args);
+            return call_user_func_array($func, $args);
         }
 
         return null;
diff --git a/system/src/Grav/Common/Media/Interfaces/AudioMediaInterface.php b/system/src/Grav/Common/Media/Interfaces/AudioMediaInterface.php
new file mode 100644
index 0000000000..6465d6b9ca
--- /dev/null
+++ b/system/src/Grav/Common/Media/Interfaces/AudioMediaInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Interfaces;
+
+/**
+ * Class implements audio media interface.
+ */
+interface AudioMediaInterface extends MediaObjectInterface, MediaPlayerInterface
+{
+    /**
+     * Allows to set the controlsList behaviour
+     * Separate multiple values with a hyphen
+     *
+     * @param string $controlsList
+     * @return $this
+     */
+    public function controlsList($controlsList);
+}
diff --git a/system/src/Grav/Common/Media/Interfaces/ImageManipulateInterface.php b/system/src/Grav/Common/Media/Interfaces/ImageManipulateInterface.php
new file mode 100644
index 0000000000..eb38ea83bc
--- /dev/null
+++ b/system/src/Grav/Common/Media/Interfaces/ImageManipulateInterface.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Interfaces;
+
+/**
+ * Class implements image manipulation interface.
+ */
+interface ImageManipulateInterface
+{
+    /**
+     * Allows the ability to override the image's pretty name stored in cache
+     *
+     * @param string $name
+     */
+    public function setImagePrettyName($name);
+
+    /**
+     * @return string
+     */
+    public function getImagePrettyName();
+
+    /**
+     * Simply processes with no extra methods.  Useful for triggering events.
+     *
+     * @return $this
+     */
+    public function cache();
+
+    /**
+     * Generate alternative image widths, using either an array of integers, or
+     * a min width, a max width, and a step parameter to fill out the necessary
+     * widths. Existing image alternatives won't be overwritten.
+     *
+     * @param int|int[] $min_width
+     * @param int $max_width
+     * @param int $step
+     * @return $this
+     */
+    public function derivatives($min_width, $max_width = 2500, $step = 200);
+
+    /**
+     * Clear out the alternatives.
+     */
+    public function clearAlternatives();
+
+    /**
+     * Sets or gets the quality of the image
+     *
+     * @param int|null $quality 0-100 quality
+     * @return int|$this
+     */
+    public function quality($quality = null);
+
+    /**
+     * Sets image output format.
+     *
+     * @param string $format
+     * @return $this
+     */
+    public function format($format);
+
+    /**
+     * Set or get sizes parameter for srcset media action
+     *
+     * @param string|null $sizes
+     * @return string
+     */
+    public function sizes($sizes = null);
+
+    /**
+     * Allows to set the width attribute from Markdown or Twig
+     * Examples: ![Example](myimg.png?width=200&height=400)
+     *           ![Example](myimg.png?resize=100,200&width=100&height=200)
+     *           ![Example](myimg.png?width=auto&height=auto)
+     *           ![Example](myimg.png?width&height)
+     *           {{ page.media['myimg.png'].width().height().html }}
+     *           {{ page.media['myimg.png'].resize(100,200).width(100).height(200).html }}
+     *
+     * @param string|int $value A value or 'auto' or empty to use the width of the image
+     * @return $this
+     */
+    public function width($value = 'auto');
+
+    /**
+     * Allows to set the height attribute from Markdown or Twig
+     * Examples: ![Example](myimg.png?width=200&height=400)
+     *           ![Example](myimg.png?resize=100,200&width=100&height=200)
+     *           ![Example](myimg.png?width=auto&height=auto)
+     *           ![Example](myimg.png?width&height)
+     *           {{ page.media['myimg.png'].width().height().html }}
+     *           {{ page.media['myimg.png'].resize(100,200).width(100).height(200).html }}
+     *
+     * @param string|int $value A value or 'auto' or empty to use the height of the image
+     * @return $this
+     */
+    public function height($value = 'auto');
+
+    /* *
+     * Filter image by using user defined filter parameters.
+     *
+     * @param string $filter Filter to be used.
+     * @return $this
+     * FIXME: Conflicts against Data class
+     */
+    //public function filter($filter = 'image.filters.default');
+
+    /**
+     * Return the image higher quality version
+     *
+     * @return ImageMediaInterface the alternative version with higher quality
+     */
+    public function higherQualityAlternative();
+}
diff --git a/system/src/Grav/Common/Media/Interfaces/ImageMediaInterface.php b/system/src/Grav/Common/Media/Interfaces/ImageMediaInterface.php
new file mode 100644
index 0000000000..cbf8f1de30
--- /dev/null
+++ b/system/src/Grav/Common/Media/Interfaces/ImageMediaInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Interfaces;
+
+/**
+ * Class implements image media interface.
+ */
+interface ImageMediaInterface extends MediaObjectInterface
+{
+}
diff --git a/system/src/Grav/Common/Media/Interfaces/MediaCollectionInterface.php b/system/src/Grav/Common/Media/Interfaces/MediaCollectionInterface.php
index 9f916631c0..62c531c89f 100644
--- a/system/src/Grav/Common/Media/Interfaces/MediaCollectionInterface.php
+++ b/system/src/Grav/Common/Media/Interfaces/MediaCollectionInterface.php
@@ -3,12 +3,16 @@
 /**
  * @package    Grav\Common\Media
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Media\Interfaces;
 
+use Grav\Common\Data\Blueprint;
+use Grav\Common\Page\Medium\ImageFile;
+use Grav\Common\Page\Medium\Medium;
+
 /**
  * Class implements media collection interface.
  */
@@ -20,4 +24,92 @@ interface MediaCollectionInterface extends \Grav\Framework\Media\Interfaces\Medi
      * @return string|null
      */
     public function getPath();
+
+    /**
+     * @param string|null $path
+     * @return void
+     */
+    public function setPath(?string $path);
+
+    /**
+     * Get medium by filename.
+     *
+     * @param string $filename
+     * @return Medium|null
+     */
+    public function get($filename);
+
+    /**
+     * Get a list of all media.
+     *
+     * @return MediaObjectInterface[]
+     */
+    public function all();
+
+    /**
+     * Get a list of all image media.
+     *
+     * @return MediaObjectInterface[]
+     */
+    public function images();
+
+    /**
+     * Get a list of all video media.
+     *
+     * @return MediaObjectInterface[]
+     */
+    public function videos();
+
+    /**
+     * Get a list of all audio media.
+     *
+     * @return MediaObjectInterface[]
+     */
+    public function audios();
+
+    /**
+     * Get a list of all file media.
+     *
+     * @return MediaObjectInterface[]
+     */
+    public function files();
+
+    /**
+     * Set file modification timestamps (query params) for all the media files.
+     *
+     * @param string|int|null $timestamp
+     * @return $this
+     */
+    public function setTimestamps($timestamp = null);
+
+    /**
+     * @param string $name
+     * @param MediaObjectInterface $file
+     * @return void
+     */
+    public function add($name, $file);
+
+    /**
+     * Create Medium from a file.
+     *
+     * @param  string $file
+     * @param  array  $params
+     * @return Medium|null
+     */
+    public function createFromFile($file, array $params = []);
+
+    /**
+     * Create Medium from array of parameters
+     *
+     * @param  array          $items
+     * @param  Blueprint|null $blueprint
+     * @return Medium|null
+     */
+    public function createFromArray(array $items = [], Blueprint $blueprint = null);
+
+    /**
+     * @param MediaObjectInterface $mediaObject
+     * @return ImageFile
+     */
+    public function getImageFileObject(MediaObjectInterface $mediaObject): ImageFile;
 }
diff --git a/system/src/Grav/Common/Media/Interfaces/MediaFileInterface.php b/system/src/Grav/Common/Media/Interfaces/MediaFileInterface.php
new file mode 100644
index 0000000000..c20e4de99d
--- /dev/null
+++ b/system/src/Grav/Common/Media/Interfaces/MediaFileInterface.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Interfaces;
+
+/**
+ * Class implements media file interface.
+ */
+interface MediaFileInterface extends MediaObjectInterface
+{
+    /**
+     * Check if this medium exists or not
+     *
+     * @return bool
+     */
+    public function exists();
+
+    /**
+     * Get file modification time for the medium.
+     *
+     * @return int|null
+     */
+    public function modified();
+
+    /**
+     * Get size of the medium.
+     *
+     * @return int
+     */
+    public function size();
+
+    /**
+     * Return the path to file.
+     *
+     * @param bool $reset
+     * @return string path to file
+     */
+    public function path($reset = true);
+
+    /**
+     * Return the relative path to file
+     *
+     * @param bool $reset
+     * @return mixed
+     */
+    public function relativePath($reset = true);
+}
diff --git a/system/src/Grav/Common/Media/Interfaces/MediaInterface.php b/system/src/Grav/Common/Media/Interfaces/MediaInterface.php
index 2b85170f6f..273556a6d3 100644
--- a/system/src/Grav/Common/Media/Interfaces/MediaInterface.php
+++ b/system/src/Grav/Common/Media/Interfaces/MediaInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Media
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
diff --git a/system/src/Grav/Common/Media/Interfaces/MediaLinkInterface.php b/system/src/Grav/Common/Media/Interfaces/MediaLinkInterface.php
new file mode 100644
index 0000000000..41747be673
--- /dev/null
+++ b/system/src/Grav/Common/Media/Interfaces/MediaLinkInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Interfaces;
+
+/**
+ * Class implements media file interface.
+ */
+interface MediaLinkInterface
+{
+}
diff --git a/system/src/Grav/Common/Media/Interfaces/MediaObjectInterface.php b/system/src/Grav/Common/Media/Interfaces/MediaObjectInterface.php
index baa820a763..912a7c417c 100644
--- a/system/src/Grav/Common/Media/Interfaces/MediaObjectInterface.php
+++ b/system/src/Grav/Common/Media/Interfaces/MediaObjectInterface.php
@@ -3,15 +3,225 @@
 /**
  * @package    Grav\Common\Media
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Media\Interfaces;
 
+use ArrayAccess;
+use Grav\Common\Data\Data;
+
 /**
  * Class implements media object interface.
+ *
+ * @property string $type
+ * @property string $filename
+ * @property string $filepath
  */
-interface MediaObjectInterface extends \Grav\Framework\Media\Interfaces\MediaObjectInterface
+interface MediaObjectInterface extends \Grav\Framework\Media\Interfaces\MediaObjectInterface, ArrayAccess
 {
+    /**
+     * Create a copy of this media object
+     *
+     * @return static
+     */
+    public function copy();
+
+    /**
+     * Return just metadata from the Medium object
+     *
+     * @return Data
+     */
+    public function meta();
+
+    /**
+     * Set querystring to file modification timestamp (or value provided as a parameter).
+     *
+     * @param string|int|null $timestamp
+     * @return $this
+     */
+    public function setTimestamp($timestamp = null);
+
+    /**
+     * Returns an array containing just the metadata
+     *
+     * @return array
+     */
+    public function metadata();
+
+    /**
+     * Add meta file for the medium.
+     *
+     * @param string $filepath
+     */
+    public function addMetaFile($filepath);
+
+    /**
+     * Add alternative Medium to this Medium.
+     *
+     * @param int|float $ratio
+     * @param MediaObjectInterface $alternative
+     */
+    public function addAlternative($ratio, MediaObjectInterface $alternative);
+
+    /**
+     * Get list of image alternatives. Includes the current media image as well.
+     *
+     * @param bool $withDerived If true, include generated images as well. If false, only return existing files.
+     * @return array
+     */
+    public function getAlternatives(bool $withDerived = true): array;
+
+    /**
+     * Return string representation of the object (html).
+     *
+     * @return string
+     */
+    public function __toString();
+
+    /**
+     * Get/set querystring for the file's url
+     *
+     * @param  string|null  $querystring
+     * @param  bool $withQuestionmark
+     * @return string
+     */
+    public function querystring($querystring = null, $withQuestionmark = true);
+
+    /**
+     * Get the URL with full querystring
+     *
+     * @param string $url
+     * @return string
+     */
+    public function urlQuerystring($url);
+
+    /**
+     * Get/set hash for the file's url
+     *
+     * @param  string|null $hash
+     * @param  bool $withHash
+     * @return string
+     */
+    public function urlHash($hash = null, $withHash = true);
+
+    /**
+     * Get an element (is array) that can be rendered by the Parsedown engine
+     *
+     * @param  string|null  $title
+     * @param  string|null  $alt
+     * @param  string|null  $class
+     * @param  string|null  $id
+     * @param  bool $reset
+     * @return array
+     */
+    public function parsedownElement($title = null, $alt = null, $class = null, $id = null, $reset = true);
+
+    /**
+     * Reset medium.
+     *
+     * @return $this
+     */
+    public function reset();
+
+    /**
+     * Add custom attribute to medium.
+     *
+     * @param string $attribute
+     * @param string $value
+     * @return $this
+     */
+    public function attribute($attribute = null, $value = '');
+
+    /**
+     * Switch display mode.
+     *
+     * @param string $mode
+     * @return MediaObjectInterface|null
+     */
+    public function display($mode = 'source');
+
+    /**
+     * Helper method to determine if this media item has a thumbnail or not
+     *
+     * @param string $type;
+     * @return bool
+     */
+    public function thumbnailExists($type = 'page');
+
+    /**
+     * Switch thumbnail.
+     *
+     * @param string $type
+     * @return $this
+     */
+    public function thumbnail($type = 'auto');
+
+    /**
+     * Turn the current Medium into a Link
+     *
+     * @param  bool $reset
+     * @param  array  $attributes
+     * @return MediaLinkInterface
+     */
+    public function link($reset = true, array $attributes = []);
+
+    /**
+     * Turn the current Medium into a Link with lightbox enabled
+     *
+     * @param  int  $width
+     * @param  int  $height
+     * @param  bool $reset
+     * @return MediaLinkInterface
+     */
+    public function lightbox($width = null, $height = null, $reset = true);
+
+    /**
+     * Add a class to the element from Markdown or Twig
+     * Example: ![Example](myimg.png?classes=float-left) or ![Example](myimg.png?classes=myclass1,myclass2)
+     *
+     * @return $this
+     */
+    public function classes();
+
+    /**
+     * Add an id to the element from Markdown or Twig
+     * Example: ![Example](myimg.png?id=primary-img)
+     *
+     * @param string $id
+     * @return $this
+     */
+    public function id($id);
+
+    /**
+     * Allows to add an inline style attribute from Markdown or Twig
+     * Example: ![Example](myimg.png?style=float:left)
+     *
+     * @param string $style
+     * @return $this
+     */
+    public function style($style);
+
+    /**
+     * Allow any action to be called on this medium from twig or markdown
+     *
+     * @param string $method
+     * @param mixed $args
+     * @return $this
+     */
+    #[\ReturnTypeWillChange]
+    public function __call($method, $args);
+
+    /**
+     * Set value by using dot notation for nested arrays/objects.
+     *
+     * @example $data->set('this.is.my.nested.variable', $value);
+     *
+     * @param string $name Dot separated path to the requested value.
+     * @param mixed $value New value.
+     * @param string|null $separator Separator, defaults to '.'
+     * @return $this
+     */
+    public function set($name, $value, $separator = null);
 }
diff --git a/system/src/Grav/Common/Media/Interfaces/MediaPlayerInterface.php b/system/src/Grav/Common/Media/Interfaces/MediaPlayerInterface.php
new file mode 100644
index 0000000000..fbe6f656fa
--- /dev/null
+++ b/system/src/Grav/Common/Media/Interfaces/MediaPlayerInterface.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Interfaces;
+
+/**
+ * Class implements media player interface.
+ */
+interface MediaPlayerInterface extends MediaObjectInterface
+{
+    /**
+     * Allows to set or remove the HTML5 default controls
+     *
+     * @param bool $status
+     * @return $this
+     */
+    public function controls($status = true);
+
+    /**
+     * Allows to set the loop attribute
+     *
+     * @param bool $status
+     * @return $this
+     */
+    public function loop($status = false);
+
+    /**
+     * Allows to set the autoplay attribute
+     *
+     * @param bool $status
+     * @return $this
+     */
+    public function autoplay($status = false);
+
+    /**
+     * Allows to set the muted attribute
+     *
+     * @param bool $status
+     * @return $this
+     */
+    public function muted($status = false);
+
+    /**
+     * Allows to set the preload behaviour
+     *
+     * @param string|null $preload
+     * @return $this
+     */
+    public function preload($preload = null);
+}
diff --git a/system/src/Grav/Common/Media/Interfaces/MediaUploadInterface.php b/system/src/Grav/Common/Media/Interfaces/MediaUploadInterface.php
new file mode 100644
index 0000000000..73625999a7
--- /dev/null
+++ b/system/src/Grav/Common/Media/Interfaces/MediaUploadInterface.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Interfaces;
+
+use Psr\Http\Message\UploadedFileInterface;
+use RuntimeException;
+
+/**
+ * Implements media upload and delete functionality.
+ */
+interface MediaUploadInterface
+{
+    /**
+     * Checks that uploaded file meets the requirements. Returns new filename.
+     *
+     * @example
+     *   $filename = null;  // Override filename if needed (ignored if randomizing filenames).
+     *   $settings = ['destination' => 'user://pages/media']; // Settings from the form field.
+     *   $filename = $media->checkUploadedFile($uploadedFile, $filename, $settings);
+     *   $media->copyUploadedFile($uploadedFile, $filename);
+
+     * @param UploadedFileInterface $uploadedFile
+     * @param string|null $filename
+     * @param array|null $settings
+     * @return string
+     * @throws RuntimeException
+     */
+    public function checkUploadedFile(UploadedFileInterface $uploadedFile, string $filename = null, array $settings = null): string;
+
+    /**
+     * Copy uploaded file to the media collection.
+     *
+     * WARNING: Always check uploaded file before copying it!
+     *
+     * @example
+     *   $filename = null;  // Override filename if needed (ignored if randomizing filenames).
+     *   $settings = ['destination' => 'user://pages/media']; // Settings from the form field.
+     *   $filename = $media->checkUploadedFile($uploadedFile, $filename, $settings);
+     *   $media->copyUploadedFile($uploadedFile, $filename);
+     *
+     * @param UploadedFileInterface $uploadedFile
+     * @param string $filename
+     * @param array|null $settings
+     * @return void
+     * @throws RuntimeException
+     */
+    public function copyUploadedFile(UploadedFileInterface $uploadedFile, string $filename, array $settings = null): void;
+
+    /**
+     * Delete real file from the media collection.
+     *
+     * @param string $filename
+     * @param array|null $settings
+     * @return void
+     */
+    public function deleteFile(string $filename, array $settings = null): void;
+
+    /**
+     * Rename file inside the media collection.
+     *
+     * @param string $from
+     * @param string $to
+     * @param array|null $settings
+     */
+    public function renameFile(string $from, string $to, array $settings = null): void;
+}
diff --git a/system/src/Grav/Common/Media/Interfaces/VideoMediaInterface.php b/system/src/Grav/Common/Media/Interfaces/VideoMediaInterface.php
new file mode 100644
index 0000000000..6d42feff26
--- /dev/null
+++ b/system/src/Grav/Common/Media/Interfaces/VideoMediaInterface.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Interfaces;
+
+/**
+ * Class implements video media interface.
+ */
+interface VideoMediaInterface extends MediaObjectInterface, MediaPlayerInterface
+{
+    /**
+     * Allows to set the video's poster image
+     *
+     * @param string $urlImage
+     * @return $this
+     */
+    public function poster($urlImage);
+
+    /**
+     * Allows to set the playsinline attribute
+     *
+     * @param bool $status
+     * @return $this
+     */
+    public function playsinline($status = false);
+}
diff --git a/system/src/Grav/Common/Media/Traits/AudioMediaTrait.php b/system/src/Grav/Common/Media/Traits/AudioMediaTrait.php
new file mode 100644
index 0000000000..a0834721db
--- /dev/null
+++ b/system/src/Grav/Common/Media/Traits/AudioMediaTrait.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Traits;
+
+/**
+ * Trait AudioMediaTrait
+ * @package Grav\Common\Media\Traits
+ */
+trait AudioMediaTrait
+{
+    use StaticResizeTrait;
+    use MediaPlayerTrait;
+
+    /**
+     * Allows to set the controlsList behaviour
+     * Separate multiple values with a hyphen
+     *
+     * @param string $controlsList
+     * @return $this
+     */
+    public function controlsList($controlsList)
+    {
+        $controlsList = str_replace('-', ' ', $controlsList);
+        $this->attributes['controlsList'] = $controlsList;
+
+        return $this;
+    }
+
+    /**
+     * Parsedown element for source display mode
+     *
+     * @param  array $attributes
+     * @param  bool $reset
+     * @return array
+     */
+    protected function sourceParsedownElement(array $attributes, $reset = true)
+    {
+        $location = $this->url($reset);
+
+        return [
+            'name' => 'audio',
+            'rawHtml' => '<source src="' . $location . '">Your browser does not support the audio tag.',
+            'attributes' => $attributes
+        ];
+    }
+}
diff --git a/system/src/Grav/Common/Media/Traits/ImageLoadingTrait.php b/system/src/Grav/Common/Media/Traits/ImageLoadingTrait.php
new file mode 100644
index 0000000000..75e23cab8d
--- /dev/null
+++ b/system/src/Grav/Common/Media/Traits/ImageLoadingTrait.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Traits;
+
+use Grav\Common\Grav;
+
+/**
+ * Trait ImageLoadingTrait
+ * @package Grav\Common\Media\Traits
+ */
+trait ImageLoadingTrait
+{
+    /**
+     * Allows to set the loading attribute from Markdown or Twig
+     *
+     * @param string|null $value
+     * @return $this
+     */
+    public function loading($value = null)
+    {
+        if (null === $value) {
+            $value = Grav::instance()['config']->get('system.images.defaults.loading', 'auto');
+        }
+        if ($value && $value !== 'auto') {
+            $this->attributes['loading'] = $value;
+        }
+
+        return $this;
+    }
+}
diff --git a/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php b/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php
new file mode 100644
index 0000000000..c1c46dc94a
--- /dev/null
+++ b/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php
@@ -0,0 +1,428 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Traits;
+
+use Grav\Common\Grav;
+use Grav\Common\Media\Interfaces\ImageMediaInterface;
+use Grav\Common\Media\Interfaces\MediaCollectionInterface;
+use Grav\Common\Page\Medium\ImageFile;
+use Grav\Common\Page\Medium\ImageMedium;
+use Grav\Common\Page\Medium\MediumFactory;
+use function array_key_exists;
+use function extension_loaded;
+use function func_num_args;
+use function function_exists;
+
+/**
+ * Trait ImageMediaTrait
+ * @package Grav\Common\Media\Traits
+ */
+trait ImageMediaTrait
+{
+    /** @var ImageFile|null */
+    protected $image;
+
+    /** @var string */
+    protected $format = 'guess';
+
+    /** @var int */
+    protected $quality;
+
+    /** @var int */
+    protected $default_quality;
+
+    /** @var bool */
+    protected $debug_watermarked = false;
+
+    /** @var bool  */
+    protected $auto_sizes;
+
+    /** @var bool */
+    protected $aspect_ratio;
+
+    /** @var integer */
+    protected $retina_scale;
+
+    /** @var bool */
+    protected $watermark;
+
+    /** @var array */
+    public static $magic_actions = [
+        'resize', 'forceResize', 'cropResize', 'crop', 'zoomCrop',
+        'negate', 'brightness', 'contrast', 'grayscale', 'emboss',
+        'smooth', 'sharp', 'edge', 'colorize', 'sepia', 'enableProgressive',
+        'rotate', 'flip', 'fixOrientation', 'gaussianBlur', 'format', 'create', 'fill', 'merge'
+    ];
+
+    /** @var array */
+    public static $magic_resize_actions = [
+        'resize' => [0, 1],
+        'forceResize' => [0, 1],
+        'cropResize' => [0, 1],
+        'crop' => [0, 1, 2, 3],
+        'zoomCrop' => [0, 1]
+    ];
+
+    /** @var string */
+    protected $sizes = '100vw';
+
+
+    /**
+     * Allows the ability to override the image's pretty name stored in cache
+     *
+     * @param string $name
+     */
+    public function setImagePrettyName($name)
+    {
+        $this->set('prettyname', $name);
+        if ($this->image) {
+            $this->image->setPrettyName($name);
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getImagePrettyName()
+    {
+        if ($this->get('prettyname')) {
+            return $this->get('prettyname');
+        }
+
+        $basename = $this->get('basename');
+        if (preg_match('/[a-z0-9]{40}-(.*)/', $basename, $matches)) {
+            $basename = $matches[1];
+        }
+        return $basename;
+    }
+
+    /**
+     * Simply processes with no extra methods.  Useful for triggering events.
+     *
+     * @return $this
+     */
+    public function cache()
+    {
+        if (!$this->image) {
+            $this->image();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Generate alternative image widths, using either an array of integers, or
+     * a min width, a max width, and a step parameter to fill out the necessary
+     * widths. Existing image alternatives won't be overwritten.
+     *
+     * @param  int|int[] $min_width
+     * @param  int       $max_width
+     * @param  int       $step
+     * @return $this
+     */
+    public function derivatives($min_width, $max_width = 2500, $step = 200)
+    {
+        if (!empty($this->alternatives)) {
+            $max = max(array_keys($this->alternatives));
+            $base = $this->alternatives[$max];
+        } else {
+            $base = $this;
+        }
+
+        $widths = [];
+
+        if (func_num_args() === 1) {
+            foreach ((array) func_get_arg(0) as $width) {
+                if ($width < $base->get('width')) {
+                    $widths[] = $width;
+                }
+            }
+        } else {
+            $max_width = min($max_width, $base->get('width'));
+
+            for ($width = $min_width; $width < $max_width; $width += $step) {
+                $widths[] = $width;
+            }
+        }
+
+        foreach ($widths as $width) {
+            // Only generate image alternatives that don't already exist
+            if (array_key_exists((int) $width, $this->alternatives)) {
+                continue;
+            }
+
+            $derivative = MediumFactory::fromFile($base->get('filepath'));
+
+            // It's possible that MediumFactory::fromFile returns null if the
+            // original image file no longer exists and this class instance was
+            // retrieved from the page cache
+            if (null !== $derivative) {
+                $index = 2;
+                $alt_widths = array_keys($this->alternatives);
+                sort($alt_widths);
+
+                foreach ($alt_widths as $i => $key) {
+                    if ($width > $key) {
+                        $index += max($i, 1);
+                    }
+                }
+
+                $basename = preg_replace('/(@\d+x)?$/', "@{$width}w", $base->get('basename'), 1);
+                $derivative->setImagePrettyName($basename);
+
+                $ratio = $base->get('width') / $width;
+                $height = $derivative->get('height') / $ratio;
+
+                $derivative->resize($width, $height);
+                $derivative->set('width', $width);
+                $derivative->set('height', $height);
+
+                $this->addAlternative($ratio, $derivative);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Clear out the alternatives.
+     */
+    public function clearAlternatives()
+    {
+        $this->alternatives = [];
+    }
+
+    /**
+     * Sets or gets the quality of the image
+     *
+     * @param  int|null $quality 0-100 quality
+     * @return int|$this
+     */
+    public function quality($quality = null)
+    {
+        if ($quality) {
+            if (!$this->image) {
+                $this->image();
+            }
+
+            $this->quality = $quality;
+
+            return $this;
+        }
+
+        return $this->quality;
+    }
+
+    /**
+     * Sets image output format.
+     *
+     * @param string $format
+     * @return $this
+     */
+    public function format($format)
+    {
+        if (!$this->image) {
+            $this->image();
+        }
+
+        $this->format = $format;
+
+        return $this;
+    }
+
+    /**
+     * Set or get sizes parameter for srcset media action
+     *
+     * @param  string|null $sizes
+     * @return string
+     */
+    public function sizes($sizes = null)
+    {
+        if ($sizes) {
+            $this->sizes = $sizes;
+
+            return $this;
+        }
+
+        return empty($this->sizes) ? '100vw' : $this->sizes;
+    }
+
+    /**
+     * Allows to set the width attribute from Markdown or Twig
+     * Examples: ![Example](myimg.png?width=200&height=400)
+     *           ![Example](myimg.png?resize=100,200&width=100&height=200)
+     *           ![Example](myimg.png?width=auto&height=auto)
+     *           ![Example](myimg.png?width&height)
+     *           {{ page.media['myimg.png'].width().height().html }}
+     *           {{ page.media['myimg.png'].resize(100,200).width(100).height(200).html }}
+     *
+     * @param string|int $value A value or 'auto' or empty to use the width of the image
+     * @return $this
+     */
+    public function width($value = 'auto')
+    {
+        if (!$value || $value === 'auto') {
+            $this->attributes['width'] = $this->get('width');
+        } else {
+            $this->attributes['width'] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Allows to set the height attribute from Markdown or Twig
+     * Examples: ![Example](myimg.png?width=200&height=400)
+     *           ![Example](myimg.png?resize=100,200&width=100&height=200)
+     *           ![Example](myimg.png?width=auto&height=auto)
+     *           ![Example](myimg.png?width&height)
+     *           {{ page.media['myimg.png'].width().height().html }}
+     *           {{ page.media['myimg.png'].resize(100,200).width(100).height(200).html }}
+     *
+     * @param string|int $value A value or 'auto' or empty to use the height of the image
+     * @return $this
+     */
+    public function height($value = 'auto')
+    {
+        if (!$value || $value === 'auto') {
+            $this->attributes['height'] = $this->get('height');
+        } else {
+            $this->attributes['height'] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Filter image by using user defined filter parameters.
+     *
+     * @param string $filter Filter to be used.
+     * @return $this
+     */
+    public function filter($filter = 'image.filters.default')
+    {
+        $filters = (array) $this->get($filter, []);
+        foreach ($filters as $params) {
+            $params = (array) $params;
+            $method = array_shift($params);
+            $this->__call($method, $params);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Return the image higher quality version
+     *
+     * @return ImageMediaInterface|$this the alternative version with higher quality
+     */
+    public function higherQualityAlternative()
+    {
+        if ($this->alternatives) {
+            /** @var ImageMedium $max */
+            $max = reset($this->alternatives);
+            /** @var ImageMedium $alternative */
+            foreach ($this->alternatives as $alternative) {
+                if ($alternative->quality() > $max->quality()) {
+                    $max = $alternative;
+                }
+            }
+
+            return $max;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Gets medium image, resets image manipulation operations.
+     *
+     * @return $this
+     */
+    protected function image()
+    {
+        $locator = Grav::instance()['locator'];
+
+        // Use existing cache folder or if it doesn't exist, create it.
+        $cacheDir = $locator->findResource('cache://images', true) ?: $locator->findResource('cache://images', true, true);
+
+        // Make sure we free previous image.
+        unset($this->image);
+
+        /** @var MediaCollectionInterface $media */
+        $media = $this->get('media');
+        if ($media && method_exists($media, 'getImageFileObject')) {
+            $this->image = $media->getImageFileObject($this);
+        } else {
+            $this->image = ImageFile::open($this->get('filepath'));
+        }
+
+        $this->image
+            ->setCacheDir($cacheDir)
+            ->setActualCacheDir($cacheDir)
+            ->setPrettyName($this->getImagePrettyName());
+
+        // Fix orientation if enabled
+        $config = Grav::instance()['config'];
+        if ($config->get('system.images.auto_fix_orientation', false) &&
+            extension_loaded('exif') && function_exists('exif_read_data')) {
+            $this->image->fixOrientation();
+        }
+
+        // Set CLS configuration
+        $this->auto_sizes = $config->get('system.images.cls.auto_sizes', false);
+        $this->aspect_ratio = $config->get('system.images.cls.aspect_ratio', false);
+        $this->retina_scale = $config->get('system.images.cls.retina_scale', 1);
+
+        $this->watermark = $config->get('system.images.watermark.watermark_all', false);
+
+        return $this;
+    }
+
+    /**
+     * Save the image with cache.
+     *
+     * @return string
+     */
+    protected function saveImage()
+    {
+        if (!$this->image) {
+            return parent::path(false);
+        }
+
+        $this->filter();
+
+        if (isset($this->result)) {
+            return $this->result;
+        }
+
+        if ($this->format === 'guess') {
+            $extension = strtolower($this->get('extension'));
+            $this->format($extension);
+        }
+
+        if (!$this->debug_watermarked && $this->get('debug')) {
+            $ratio = $this->get('ratio');
+            if (!$ratio) {
+                $ratio = 1;
+            }
+
+            $locator = Grav::instance()['locator'];
+            $overlay = $locator->findResource("system://assets/responsive-overlays/{$ratio}x.png") ?: $locator->findResource('system://assets/responsive-overlays/unknown.png');
+            $this->image->merge(ImageFile::open($overlay));
+        }
+
+        if ($this->watermark) {
+            $this->watermark();
+        }
+
+        return $this->image->cacheFile($this->format, $this->quality, false, [$this->get('width'), $this->get('height'), $this->get('modified')]);
+    }
+}
diff --git a/system/src/Grav/Common/Media/Traits/MediaFileTrait.php b/system/src/Grav/Common/Media/Traits/MediaFileTrait.php
new file mode 100644
index 0000000000..63906fc4a3
--- /dev/null
+++ b/system/src/Grav/Common/Media/Traits/MediaFileTrait.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Traits;
+
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+
+/**
+ * Trait MediaFileTrait
+ * @package Grav\Common\Media\Traits
+ */
+trait MediaFileTrait
+{
+    /**
+     * Check if this medium exists or not
+     *
+     * @return bool
+     */
+    public function exists()
+    {
+        $path = $this->path(false);
+
+        return file_exists($path);
+    }
+
+    /**
+     * Get file modification time for the medium.
+     *
+     * @return int|null
+     */
+    public function modified()
+    {
+        $path = $this->path(false);
+        if (!file_exists($path)) {
+            return null;
+        }
+
+        return filemtime($path) ?: null;
+    }
+
+    /**
+     * Get size of the medium.
+     *
+     * @return int
+     */
+    public function size()
+    {
+        $path = $this->path(false);
+        if (!file_exists($path)) {
+            return 0;
+        }
+
+        return filesize($path) ?: 0;
+    }
+
+    /**
+     * Return PATH to file.
+     *
+     * @param bool $reset
+     * @return string path to file
+     */
+    public function path($reset = true)
+    {
+        if ($reset) {
+            $this->reset();
+        }
+
+        return $this->get('url') ?? $this->get('filepath');
+    }
+
+    /**
+     * Return the relative path to file
+     *
+     * @param bool $reset
+     * @return string
+     */
+    public function relativePath($reset = true)
+    {
+        if ($reset) {
+            $this->reset();
+        }
+
+        $path = $this->path(false);
+        $output = preg_replace('|^' . preg_quote(GRAV_ROOT, '|') . '|', '', $path) ?: $path;
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+        if ($locator->isStream($output)) {
+            $output = (string)($locator->findResource($output, false) ?: $locator->findResource($output, false, true));
+        }
+
+        return $output;
+    }
+
+    /**
+     * Return URL to file.
+     *
+     * @param bool $reset
+     * @return string
+     */
+    public function url($reset = true)
+    {
+        $url = $this->get('url');
+        if ($url) {
+            return $url;
+        }
+
+        $path = $this->relativePath($reset);
+
+        return trim($this->getGrav()['base_url'] . '/' . $this->urlQuerystring($path), '\\');
+    }
+
+    /**
+     * Get the URL with full querystring
+     *
+     * @param string $url
+     * @return string
+     */
+    abstract public function urlQuerystring($url);
+
+    /**
+     * Reset medium.
+     *
+     * @return $this
+     */
+    abstract public function reset();
+
+    /**
+     * @return Grav
+     */
+    abstract protected function getGrav(): Grav;
+}
diff --git a/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php b/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php
new file mode 100644
index 0000000000..85ed6d224f
--- /dev/null
+++ b/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php
@@ -0,0 +1,630 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Traits;
+
+use Grav\Common\Data\Data;
+use Grav\Common\Media\Interfaces\MediaFileInterface;
+use Grav\Common\Media\Interfaces\MediaLinkInterface;
+use Grav\Common\Media\Interfaces\MediaObjectInterface;
+use Grav\Common\Page\Medium\ThumbnailImageMedium;
+use Grav\Common\Utils;
+use function count;
+use function func_get_args;
+use function in_array;
+use function is_array;
+use function is_string;
+
+/**
+ * Class Medium
+ * @package Grav\Common\Page\Medium
+ *
+ * @property string $mime
+ */
+trait MediaObjectTrait
+{
+    /** @var string */
+    protected $mode = 'source';
+
+    /** @var MediaObjectInterface|null */
+    protected $_thumbnail;
+
+    /** @var array */
+    protected $thumbnailTypes = ['page', 'default'];
+
+    /** @var string|null */
+    protected $thumbnailType;
+
+    /** @var MediaObjectInterface[] */
+    protected $alternatives = [];
+
+    /** @var array */
+    protected $attributes = [];
+
+    /** @var array */
+    protected $styleAttributes = [];
+
+    /** @var array */
+    protected $metadata = [];
+
+    /** @var array */
+    protected $medium_querystring = [];
+
+    /** @var string */
+    protected $timestamp;
+
+    /**
+     * Create a copy of this media object
+     *
+     * @return static
+     */
+    public function copy()
+    {
+        return clone $this;
+    }
+
+    /**
+     * Return just metadata from the Medium object
+     *
+     * @return Data
+     */
+    public function meta()
+    {
+        return new Data($this->getItems());
+    }
+
+    /**
+     * Set querystring to file modification timestamp (or value provided as a parameter).
+     *
+     * @param string|int|null $timestamp
+     * @return $this
+     */
+    public function setTimestamp($timestamp = null)
+    {
+        if (null !== $timestamp) {
+            $this->timestamp = (string)($timestamp);
+        } elseif ($this instanceof MediaFileInterface) {
+            $this->timestamp = (string)$this->modified();
+        } else {
+            $this->timestamp = '';
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns an array containing just the metadata
+     *
+     * @return array
+     */
+    public function metadata()
+    {
+        return $this->metadata;
+    }
+
+    /**
+     * Add meta file for the medium.
+     *
+     * @param string $filepath
+     */
+    abstract public function addMetaFile($filepath);
+
+    /**
+     * Add alternative Medium to this Medium.
+     *
+     * @param int|float $ratio
+     * @param MediaObjectInterface $alternative
+     */
+    public function addAlternative($ratio, MediaObjectInterface $alternative)
+    {
+        if (!is_numeric($ratio) || $ratio === 0) {
+            return;
+        }
+
+        $alternative->set('ratio', $ratio);
+        $width = $alternative->get('width', 0);
+
+        $this->alternatives[$width] = $alternative;
+    }
+
+    /**
+     * @param bool $withDerived
+     * @return array
+     */
+    public function getAlternatives(bool $withDerived = true): array
+    {
+        $alternatives = [];
+        foreach ($this->alternatives + [$this->get('width', 0) => $this] as $size => $alternative) {
+            if ($withDerived || $alternative->filename === Utils::basename($alternative->filepath)) {
+                $alternatives[$size] = $alternative;
+            }
+        }
+
+        ksort($alternatives, SORT_NUMERIC);
+
+        return $alternatives;
+    }
+
+    /**
+     * Return string representation of the object (html).
+     *
+     * @return string
+     */
+    #[\ReturnTypeWillChange]
+    abstract public function __toString();
+
+    /**
+     * Get/set querystring for the file's url
+     *
+     * @param  string|null  $querystring
+     * @param  bool $withQuestionmark
+     * @return string
+     */
+    public function querystring($querystring = null, $withQuestionmark = true)
+    {
+        if (null !== $querystring) {
+            $this->medium_querystring[] = ltrim($querystring, '?&');
+            foreach ($this->alternatives as $alt) {
+                $alt->querystring($querystring, $withQuestionmark);
+            }
+        }
+
+        if (empty($this->medium_querystring)) {
+            return '';
+        }
+
+        // join the strings
+        $querystring = implode('&', $this->medium_querystring);
+        // explode all strings
+        $query_parts = explode('&', $querystring);
+        // Join them again now ensure the elements are unique
+        $querystring = implode('&', array_unique($query_parts));
+
+        return $withQuestionmark ? ('?' . $querystring) : $querystring;
+    }
+
+    /**
+     * Get the URL with full querystring
+     *
+     * @param string $url
+     * @return string
+     */
+    public function urlQuerystring($url)
+    {
+        $querystring = $this->querystring();
+        if (isset($this->timestamp) && !Utils::contains($querystring, $this->timestamp)) {
+            $querystring = empty($querystring) ? ('?' . $this->timestamp) : ($querystring . '&' . $this->timestamp);
+        }
+
+        return ltrim($url . $querystring . $this->urlHash(), '/');
+    }
+
+    /**
+     * Get/set hash for the file's url
+     *
+     * @param  string|null  $hash
+     * @param  bool $withHash
+     * @return string
+     */
+    public function urlHash($hash = null, $withHash = true)
+    {
+        if ($hash) {
+            $this->set('urlHash', ltrim($hash, '#'));
+        }
+
+        $hash = $this->get('urlHash', '');
+
+        return $withHash && !empty($hash) ? '#' . $hash : $hash;
+    }
+
+    /**
+     * Get an element (is array) that can be rendered by the Parsedown engine
+     *
+     * @param  string|null  $title
+     * @param  string|null  $alt
+     * @param  string|null  $class
+     * @param  string|null  $id
+     * @param  bool $reset
+     * @return array
+     */
+    public function parsedownElement($title = null, $alt = null, $class = null, $id = null, $reset = true)
+    {
+        $attributes = $this->attributes;
+        $items = $this->getItems();
+
+        $style = '';
+        foreach ($this->styleAttributes as $key => $value) {
+            if (is_numeric($key)) { // Special case for inline style attributes, refer to style() method
+                $style .= $value;
+            } else {
+                $style .= $key . ': ' . $value . ';';
+            }
+        }
+        if ($style) {
+            $attributes['style'] = $style;
+        }
+
+        if (empty($attributes['title'])) {
+            if (!empty($title)) {
+                $attributes['title'] = $title;
+            } elseif (!empty($items['title'])) {
+                $attributes['title'] = $items['title'];
+            }
+        }
+
+        if (empty($attributes['alt'])) {
+            if (!empty($alt)) {
+                $attributes['alt'] = $alt;
+            } elseif (!empty($items['alt'])) {
+                $attributes['alt'] = $items['alt'];
+            } elseif (!empty($items['alt_text'])) {
+                $attributes['alt'] = $items['alt_text'];
+            } else {
+                $attributes['alt'] = '';
+            }
+        }
+
+        if (empty($attributes['class'])) {
+            if (!empty($class)) {
+                $attributes['class'] = $class;
+            } elseif (!empty($items['class'])) {
+                $attributes['class'] = $items['class'];
+            }
+        }
+
+        if (empty($attributes['id'])) {
+            if (!empty($id)) {
+                $attributes['id'] = $id;
+            } elseif (!empty($items['id'])) {
+                $attributes['id'] = $items['id'];
+            }
+        }
+
+        switch ($this->mode) {
+            case 'text':
+                $element = $this->textParsedownElement($attributes, false);
+                break;
+            case 'thumbnail':
+                $thumbnail = $this->getThumbnail();
+                $element = $thumbnail ? $thumbnail->sourceParsedownElement($attributes, false) : [];
+                break;
+            case 'source':
+                $element = $this->sourceParsedownElement($attributes, false);
+                break;
+            default:
+                $element = [];
+        }
+
+        if ($reset) {
+            $this->reset();
+        }
+
+        $this->display('source');
+
+        return $element;
+    }
+
+    /**
+     * Reset medium.
+     *
+     * @return $this
+     */
+    public function reset()
+    {
+        $this->attributes = [];
+
+        return $this;
+    }
+
+    /**
+     * Add custom attribute to medium.
+     *
+     * @param string $attribute
+     * @param string $value
+     * @return $this
+     */
+    public function attribute($attribute = null, $value = '')
+    {
+        if (!empty($attribute)) {
+            $this->attributes[$attribute] = $value;
+        }
+        return $this;
+    }
+
+    /**
+     * Switch display mode.
+     *
+     * @param string $mode
+     *
+     * @return MediaObjectInterface|null
+     */
+    public function display($mode = 'source')
+    {
+        if ($this->mode === $mode) {
+            return $this;
+        }
+
+        $this->mode = $mode;
+        if ($mode === 'thumbnail') {
+            $thumbnail = $this->getThumbnail();
+
+            return $thumbnail ? $thumbnail->reset() : null;
+        }
+
+        return $this->reset();
+    }
+
+    /**
+     * Helper method to determine if this media item has a thumbnail or not
+     *
+     * @param string $type;
+     * @return bool
+     */
+    public function thumbnailExists($type = 'page')
+    {
+        $thumbs = $this->get('thumbnails');
+
+        return isset($thumbs[$type]);
+    }
+
+    /**
+     * Switch thumbnail.
+     *
+     * @param string $type
+     * @return $this
+     */
+    public function thumbnail($type = 'auto')
+    {
+        if ($type !== 'auto' && !in_array($type, $this->thumbnailTypes, true)) {
+            return $this;
+        }
+
+        if ($this->thumbnailType !== $type) {
+            $this->_thumbnail = null;
+        }
+
+        $this->thumbnailType = $type;
+
+        return $this;
+    }
+
+    /**
+     * Return URL to file.
+     *
+     * @param bool $reset
+     * @return string
+     */
+    abstract public function url($reset = true);
+
+    /**
+     * Turn the current Medium into a Link
+     *
+     * @param  bool $reset
+     * @param  array  $attributes
+     * @return MediaLinkInterface
+     */
+    public function link($reset = true, array $attributes = [])
+    {
+        if ($this->mode !== 'source') {
+            $this->display('source');
+        }
+
+        foreach ($this->attributes as $key => $value) {
+            empty($attributes['data-' . $key]) && $attributes['data-' . $key] = $value;
+        }
+
+        empty($attributes['href']) && $attributes['href'] = $this->url();
+
+        return $this->createLink($attributes);
+    }
+
+    /**
+     * Turn the current Medium into a Link with lightbox enabled
+     *
+     * @param  int|null  $width
+     * @param  int|null  $height
+     * @param  bool $reset
+     * @return MediaLinkInterface
+     */
+    public function lightbox($width = null, $height = null, $reset = true)
+    {
+        $attributes = ['rel' => 'lightbox'];
+
+        if ($width && $height) {
+            $attributes['data-width'] = $width;
+            $attributes['data-height'] = $height;
+        }
+
+        return $this->link($reset, $attributes);
+    }
+
+    /**
+     * Add a class to the element from Markdown or Twig
+     * Example: ![Example](myimg.png?classes=float-left) or ![Example](myimg.png?classes=myclass1,myclass2)
+     *
+     * @return $this
+     */
+    public function classes()
+    {
+        $classes = func_get_args();
+        if (!empty($classes)) {
+            $this->attributes['class'] = implode(',', $classes);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add an id to the element from Markdown or Twig
+     * Example: ![Example](myimg.png?id=primary-img)
+     *
+     * @param string $id
+     * @return $this
+     */
+    public function id($id)
+    {
+        if (is_string($id)) {
+            $this->attributes['id'] = trim($id);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Allows to add an inline style attribute from Markdown or Twig
+     * Example: ![Example](myimg.png?style=float:left)
+     *
+     * @param string $style
+     * @return $this
+     */
+    public function style($style)
+    {
+        $this->styleAttributes[] = rtrim($style, ';') . ';';
+
+        return $this;
+    }
+
+    /**
+     * Allow any action to be called on this medium from twig or markdown
+     *
+     * @param string $method
+     * @param array $args
+     * @return $this
+     */
+    #[\ReturnTypeWillChange]
+    public function __call($method, $args)
+    {
+        $count = count($args);
+        if ($count > 1 || ($count === 1 && !empty($args[0]))) {
+            $method .= '=' . implode(',', array_map(static function ($a) {
+                if (is_array($a)) {
+                    $a = '[' . implode(',', $a) . ']';
+                }
+
+                return rawurlencode($a);
+            }, $args));
+        }
+
+        if (!empty($method)) {
+            $this->querystring($this->querystring(null, false) . '&' . $method);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Parsedown element for source display mode
+     *
+     * @param  array $attributes
+     * @param  bool $reset
+     * @return array
+     */
+    protected function sourceParsedownElement(array $attributes, $reset = true)
+    {
+        return $this->textParsedownElement($attributes, $reset);
+    }
+
+    /**
+     * Parsedown element for text display mode
+     *
+     * @param  array $attributes
+     * @param  bool $reset
+     * @return array
+     */
+    protected function textParsedownElement(array $attributes, $reset = true)
+    {
+        if ($reset) {
+            $this->reset();
+        }
+
+        $text = $attributes['title'] ?? '';
+        if ($text === '') {
+            $text = $attributes['alt'] ?? '';
+            if ($text === '') {
+                $text = $this->get('filename');
+            }
+        }
+
+        return [
+            'name' => 'p',
+            'attributes' => $attributes,
+            'text' => $text
+        ];
+    }
+
+    /**
+     * Get the thumbnail Medium object
+     *
+     * @return ThumbnailImageMedium|null
+     */
+    protected function getThumbnail()
+    {
+        if (null === $this->_thumbnail) {
+            $types = $this->thumbnailTypes;
+
+            if ($this->thumbnailType !== 'auto') {
+                array_unshift($types, $this->thumbnailType);
+            }
+
+            foreach ($types as $type) {
+                $thumb = $this->get("thumbnails.{$type}", false);
+                if ($thumb) {
+                    $image = $thumb instanceof ThumbnailImageMedium ? $thumb : $this->createThumbnail($thumb);
+                    if($image) {
+                        $image->parent = $this;
+                        $this->_thumbnail = $image;
+                    }
+                    break;
+                }
+            }
+        }
+
+        return $this->_thumbnail;
+    }
+
+    /**
+     * Get value by using dot notation for nested arrays/objects.
+     *
+     * @example $value = $this->get('this.is.my.nested.variable');
+     *
+     * @param string $name Dot separated path to the requested value.
+     * @param mixed $default Default value (or null).
+     * @param string|null $separator Separator, defaults to '.'
+     * @return mixed Value.
+     */
+    abstract public function get($name, $default = null, $separator = null);
+
+        /**
+     * Set value by using dot notation for nested arrays/objects.
+     *
+     * @example $data->set('this.is.my.nested.variable', $value);
+     *
+     * @param string $name Dot separated path to the requested value.
+     * @param mixed $value New value.
+     * @param string|null $separator Separator, defaults to '.'
+     * @return $this
+     */
+    abstract public function set($name, $value, $separator = null);
+
+    /**
+     * @param string $thumb
+     */
+    abstract protected function createThumbnail($thumb);
+
+    /**
+     * @param array $attributes
+     * @return MediaLinkInterface
+     */
+    abstract protected function createLink(array $attributes);
+
+    /**
+     * @return array
+     */
+    abstract protected function getItems(): array;
+}
diff --git a/system/src/Grav/Common/Media/Traits/MediaPlayerTrait.php b/system/src/Grav/Common/Media/Traits/MediaPlayerTrait.php
new file mode 100644
index 0000000000..7e59d64b06
--- /dev/null
+++ b/system/src/Grav/Common/Media/Traits/MediaPlayerTrait.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Traits;
+
+use function in_array;
+
+/**
+ * Class implements audio object interface.
+ */
+trait MediaPlayerTrait
+{
+    /**
+     * Allows to set or remove the HTML5 default controls
+     *
+     * @param bool $status
+     * @return $this
+     */
+    public function controls($status = true)
+    {
+        if ($status) {
+            $this->attributes['controls'] = 'controls';
+        } else {
+            unset($this->attributes['controls']);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Allows to set the loop attribute
+     *
+     * @param bool $status
+     * @return $this
+     */
+    public function loop($status = false)
+    {
+        if ($status) {
+            $this->attributes['loop'] = 'loop';
+        } else {
+            unset($this->attributes['loop']);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Allows to set the autoplay attribute
+     *
+     * @param bool $status
+     * @return $this
+     */
+    public function autoplay($status = false)
+    {
+        if ($status) {
+            $this->attributes['autoplay'] = 'autoplay';
+        } else {
+            unset($this->attributes['autoplay']);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Allows to set the muted attribute
+     *
+     * @param bool $status
+     * @return $this
+     */
+    public function muted($status = false)
+    {
+        if ($status) {
+            $this->attributes['muted'] = 'muted';
+        } else {
+            unset($this->attributes['muted']);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Allows to set the preload behaviour
+     *
+     * @param string|null $preload
+     * @return $this
+     */
+    public function preload($preload = null)
+    {
+        $validPreloadAttrs = ['auto', 'metadata', 'none'];
+
+        if (null === $preload) {
+            unset($this->attributes['preload']);
+        } elseif (in_array($preload, $validPreloadAttrs, true)) {
+            $this->attributes['preload'] = $preload;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Reset player.
+     */
+    public function resetPlayer()
+    {
+        $this->attributes['controls'] = 'controls';
+    }
+}
diff --git a/system/src/Grav/Common/Media/Traits/MediaTrait.php b/system/src/Grav/Common/Media/Traits/MediaTrait.php
index c65f87da60..14bfa90725 100644
--- a/system/src/Grav/Common/Media/Traits/MediaTrait.php
+++ b/system/src/Grav/Common/Media/Traits/MediaTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Media
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,10 +15,18 @@
 use Grav\Common\Page\Media;
 use Psr\SimpleCache\CacheInterface;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function strlen;
 
+/**
+ * Trait MediaTrait
+ * @package Grav\Common\Media\Traits
+ */
 trait MediaTrait
 {
+    /** @var MediaCollectionInterface|null */
     protected $media;
+    /** @var bool */
+    protected $_loadMedia = true;
 
     /**
      * Get filesystem path to the associated media.
@@ -40,52 +48,58 @@ public function getMediaOrder()
     /**
      * Get URI ot the associated media. Method will return null if path isn't URI.
      *
-     * @return null|string
+     * @return string|null
      */
     public function getMediaUri()
     {
-       $folder = $this->getMediaFolder();
+        $folder = $this->getMediaFolder();
+        if (!$folder) {
+            return null;
+        }
 
-       if (strpos($folder, '://')) {
-           return $folder;
-       }
+        if (strpos($folder, '://')) {
+            return $folder;
+        }
 
        /** @var UniformResourceLocator $locator */
-       $locator = Grav::instance()['locator'];
-       $user = $locator->findResource('user://');
-       if (strpos($folder, $user) === 0) {
-           return 'user://' . substr($folder, \strlen($user)+1);
-       }
+        $locator = Grav::instance()['locator'];
+        $user = $locator->findResource('user://');
+        if (strpos($folder, $user) === 0) {
+            return 'user://' . substr($folder, strlen($user)+1);
+        }
 
-       return null;
+        return null;
     }
 
     /**
      * Gets the associated media collection.
      *
-     * @return MediaCollectionInterface  Representation of associated media.
+     * @return MediaCollectionInterface|Media  Representation of associated media.
      */
     public function getMedia()
     {
-        if ($this->media === null) {
+        $media = $this->media;
+        if (null === $media) {
             $cache = $this->getMediaCache();
+            $cacheKey = md5('media' . $this->getCacheKey());
 
             // Use cached media if possible.
-            $cacheKey = md5('media' . $this->getCacheKey());
-            if (!$media = $cache->get($cacheKey)) {
-                $media = new Media($this->getMediaFolder(), $this->getMediaOrder());
+            $media = $cache->get($cacheKey);
+            if (!$media instanceof MediaCollectionInterface) {
+                $media = new Media($this->getMediaFolder(), $this->getMediaOrder(), $this->_loadMedia);
                 $cache->set($cacheKey, $media);
             }
+
             $this->media = $media;
         }
 
-        return $this->media;
+        return $media;
     }
 
     /**
      * Sets the associated media collection.
      *
-     * @param  MediaCollectionInterface  $media Representation of associated media.
+     * @param  MediaCollectionInterface|Media  $media Representation of associated media.
      * @return $this
      */
     protected function setMedia(MediaCollectionInterface $media)
@@ -99,8 +113,18 @@ protected function setMedia(MediaCollectionInterface $media)
         return $this;
     }
 
+    /**
+     * @return void
+     */
+    protected function freeMedia()
+    {
+        $this->media = null;
+    }
+
     /**
      * Clear media cache.
+     *
+     * @return void
      */
     protected function clearMediaCache()
     {
@@ -108,7 +132,7 @@ protected function clearMediaCache()
         $cacheKey = md5('media' . $this->getCacheKey());
         $cache->delete($cacheKey);
 
-        $this->media = null;
+        $this->freeMedia();
     }
 
     /**
@@ -125,5 +149,5 @@ protected function getMediaCache()
     /**
      * @return string
      */
-    abstract protected function getCacheKey();
+    abstract protected function getCacheKey(): string;
 }
diff --git a/system/src/Grav/Common/Media/Traits/MediaUploadTrait.php b/system/src/Grav/Common/Media/Traits/MediaUploadTrait.php
new file mode 100644
index 0000000000..88591f6aeb
--- /dev/null
+++ b/system/src/Grav/Common/Media/Traits/MediaUploadTrait.php
@@ -0,0 +1,680 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Traits;
+
+use Exception;
+use Grav\Common\Config\Config;
+use Grav\Common\Filesystem\Folder;
+use Grav\Common\Grav;
+use Grav\Common\Language\Language;
+use Grav\Common\Page\Medium\Medium;
+use Grav\Common\Page\Medium\MediumFactory;
+use Grav\Common\Security;
+use Grav\Common\Utils;
+use Grav\Framework\Filesystem\Filesystem;
+use Grav\Framework\Form\FormFlashFile;
+use Grav\Framework\Mime\MimeTypes;
+use Psr\Http\Message\UploadedFileInterface;
+use RocketTheme\Toolbox\File\YamlFile;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use function dirname;
+use function in_array;
+
+/**
+ * Implements media upload and delete functionality.
+ */
+trait MediaUploadTrait
+{
+    /** @var array */
+    private $_upload_defaults = [
+        'self'              => true,        // Whether path is in the media collection path itself.
+        'avoid_overwriting' => false,       // Do not override existing files (adds datetime postfix if conflict).
+        'random_name'       => false,       // True if name needs to be randomized.
+        'accept'            => ['image/*'], // Accepted mime types or file extensions.
+        'limit'             => 10,          // Maximum number of files.
+        'filesize'          => null,        // Maximum filesize in MB.
+        'destination'       => null         // Destination path, if empty, exception is thrown.
+    ];
+
+    /**
+     * Create Medium from an uploaded file.
+     *
+     * @param  UploadedFileInterface $uploadedFile
+     * @param  array  $params
+     * @return Medium|null
+     */
+    public function createFromUploadedFile(UploadedFileInterface $uploadedFile, array $params = [])
+    {
+        return MediumFactory::fromUploadedFile($uploadedFile, $params);
+    }
+
+    /**
+     * Checks that uploaded file meets the requirements. Returns new filename.
+     *
+     * @example
+     *   $filename = null;  // Override filename if needed (ignored if randomizing filenames).
+     *   $settings = ['destination' => 'user://pages/media']; // Settings from the form field.
+     *   $filename = $media->checkUploadedFile($uploadedFile, $filename, $settings);
+     *   $media->copyUploadedFile($uploadedFile, $filename);
+     *
+     * @param UploadedFileInterface $uploadedFile
+     * @param string|null $filename
+     * @param array|null $settings
+     * @return string
+     * @throws RuntimeException
+     */
+    public function checkUploadedFile(UploadedFileInterface $uploadedFile, string $filename = null, array $settings = null): string
+    {
+        // Check if there is an upload error.
+        switch ($uploadedFile->getError()) {
+            case UPLOAD_ERR_OK:
+                break;
+            case UPLOAD_ERR_INI_SIZE:
+            case UPLOAD_ERR_FORM_SIZE:
+                throw new RuntimeException($this->translate('PLUGIN_ADMIN.EXCEEDED_FILESIZE_LIMIT'), 400);
+            case UPLOAD_ERR_PARTIAL:
+            case UPLOAD_ERR_NO_FILE:
+                if (!$uploadedFile instanceof FormFlashFile) {
+                    throw new RuntimeException($this->translate('PLUGIN_ADMIN.NO_FILES_SENT'), 400);
+                }
+                break;
+            case UPLOAD_ERR_NO_TMP_DIR:
+                throw new RuntimeException($this->translate('PLUGIN_ADMIN.UPLOAD_ERR_NO_TMP_DIR'), 400);
+            case UPLOAD_ERR_CANT_WRITE:
+            case UPLOAD_ERR_EXTENSION:
+            default:
+                throw new RuntimeException($this->translate('PLUGIN_ADMIN.UNKNOWN_ERRORS'), 400);
+        }
+
+        $metadata = [
+            'filename' => $uploadedFile->getClientFilename(),
+            'mime' => $uploadedFile->getClientMediaType(),
+            'size' => $uploadedFile->getSize(),
+        ];
+
+        if ($uploadedFile instanceof FormFlashFile) {
+            $uploadedFile->checkXss();
+        }
+
+        return $this->checkFileMetadata($metadata, $filename, $settings);
+    }
+
+    /**
+     * Checks that file metadata meets the requirements. Returns new filename.
+     *
+     * @param array $metadata
+     * @param array|null $settings
+     * @return string
+     * @throws RuntimeException
+     */
+    public function checkFileMetadata(array $metadata, string $filename = null, array $settings = null): string
+    {
+        // Add the defaults to the settings.
+        $settings = $this->getUploadSettings($settings);
+
+        // Destination is always needed (but it can be set in defaults).
+        $self = $settings['self'] ?? false;
+        if (!isset($settings['destination']) && $self === false) {
+            throw new RuntimeException($this->translate('PLUGIN_ADMIN.DESTINATION_NOT_SPECIFIED'), 400);
+        }
+
+        if (null === $filename) {
+            // If no filename is given, use the filename from the uploaded file (path is not allowed).
+            $folder = '';
+            $filename = $metadata['filename'] ?? '';
+        } else {
+            // If caller sets the filename, we will accept any custom path.
+            $folder = dirname($filename);
+            if ($folder === '.') {
+                $folder = '';
+            }
+            $filename = Utils::basename($filename);
+        }
+        $extension = Utils::pathinfo($filename, PATHINFO_EXTENSION);
+
+        // Decide which filename to use.
+        if ($settings['random_name']) {
+            // Generate random filename if asked for.
+            $filename = mb_strtolower(Utils::generateRandomString(15) . '.' . $extension);
+        }
+
+        // Handle conflicting filename if needed.
+        if ($settings['avoid_overwriting']) {
+            $destination = $settings['destination'];
+            if ($destination && $this->fileExists($filename, $destination)) {
+                $filename = date('YmdHis') . '-' . $filename;
+            }
+        }
+        $filepath = $folder . $filename;
+
+        // Check if the filename is allowed.
+        if (!Utils::checkFilename($filename)) {
+            throw new RuntimeException(
+                sprintf($this->translate('PLUGIN_ADMIN.FILEUPLOAD_UNABLE_TO_UPLOAD'), $filepath, $this->translate('PLUGIN_ADMIN.BAD_FILENAME'))
+            );
+        }
+
+        // Check if the file extension is allowed.
+        $extension = mb_strtolower($extension);
+        if (!$extension || !$this->getConfig()->get("media.types.{$extension}")) {
+            // Not a supported type.
+            throw new RuntimeException($this->translate('PLUGIN_ADMIN.UNSUPPORTED_FILE_TYPE') . ': ' . $extension, 400);
+        }
+
+        // Calculate maximum file size (from MB).
+        $filesize = $settings['filesize'];
+        if ($filesize) {
+            $max_filesize = $filesize * 1048576;
+            if ($metadata['size'] > $max_filesize) {
+                // TODO: use own language string
+                throw new RuntimeException($this->translate('PLUGIN_ADMIN.EXCEEDED_GRAV_FILESIZE_LIMIT'), 400);
+            }
+        } elseif (null === $filesize) {
+            // Check size against the Grav upload limit.
+            $grav_limit = Utils::getUploadLimit();
+            if ($grav_limit > 0 && $metadata['size'] > $grav_limit) {
+                throw new RuntimeException($this->translate('PLUGIN_ADMIN.EXCEEDED_GRAV_FILESIZE_LIMIT'), 400);
+            }
+        }
+
+        $grav = Grav::instance();
+        /** @var MimeTypes $mimeChecker */
+        $mimeChecker = $grav['mime'];
+
+        // Handle Accepted file types. Accept can only be mime types (image/png | image/*) or file extensions (.pdf | .jpg)
+        // Do not trust mime type sent by the browser.
+        $mime = $metadata['mime'] ?? $mimeChecker->getMimeType($extension);
+        $validExtensions = $mimeChecker->getExtensions($mime);
+        if (!in_array($extension, $validExtensions, true)) {
+            throw new RuntimeException('The mime type does not match to file extension', 400);
+        }
+
+        $accepted = false;
+        $errors = [];
+        foreach ((array)$settings['accept'] as $type) {
+            // Force acceptance of any file when star notation
+            if ($type === '*') {
+                $accepted = true;
+                break;
+            }
+
+            $isMime = strstr($type, '/');
+            $find = str_replace(['.', '*', '+'], ['\.', '.*', '\+'], $type);
+
+            if ($isMime) {
+                $match = preg_match('#' . $find . '$#', $mime);
+                if (!$match) {
+                    // TODO: translate
+                    $errors[] = 'The MIME type "' . $mime . '" for the file "' . $filepath . '" is not an accepted.';
+                } else {
+                    $accepted = true;
+                    break;
+                }
+            } else {
+                $match = preg_match('#' . $find . '$#', $filename);
+                if (!$match) {
+                    // TODO: translate
+                    $errors[] = 'The File Extension for the file "' . $filepath . '" is not an accepted.';
+                } else {
+                    $accepted = true;
+                    break;
+                }
+            }
+        }
+        if (!$accepted) {
+            throw new RuntimeException(implode('<br />', $errors), 400);
+        }
+
+        return $filepath;
+    }
+
+    /**
+     * Copy uploaded file to the media collection.
+     *
+     * WARNING: Always check uploaded file before copying it!
+     *
+     * @example
+     *   $settings = ['destination' => 'user://pages/media']; // Settings from the form field.
+     *   $filename = $media->checkUploadedFile($uploadedFile, $filename, $settings);
+     *   $media->copyUploadedFile($uploadedFile, $filename, $settings);
+     *
+     * @param UploadedFileInterface $uploadedFile
+     * @param string $filename
+     * @param array|null $settings
+     * @return void
+     * @throws RuntimeException
+     */
+    public function copyUploadedFile(UploadedFileInterface $uploadedFile, string $filename, array $settings = null): void
+    {
+        // Add the defaults to the settings.
+        $settings = $this->getUploadSettings($settings);
+
+        $path = $settings['destination'] ?? $this->getPath();
+        if (!$path || !$filename) {
+            throw new RuntimeException($this->translate('PLUGIN_ADMIN.FAILED_TO_MOVE_UPLOADED_FILE'), 400);
+        }
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+
+        try {
+            // Clear locator cache to make sure we have up to date information from the filesystem.
+            $locator->clearCache();
+            $this->clearCache();
+
+            $filesystem = Filesystem::getInstance(false);
+
+            // Calculate path without the retina scaling factor.
+            $basename = $filesystem->basename($filename);
+            $pathname = $filesystem->pathname($filename);
+
+            // Get name for the uploaded file.
+            [$base, $ext,,] = $this->getFileParts($basename);
+            $name = "{$pathname}{$base}.{$ext}";
+
+            // Upload file.
+            if ($uploadedFile instanceof FormFlashFile) {
+                // FormFlashFile needs some additional logic.
+                if ($uploadedFile->getError() === \UPLOAD_ERR_OK) {
+                    // Move uploaded file.
+                    $this->doMoveUploadedFile($uploadedFile, $filename, $path);
+                } elseif (strpos($filename, 'original/') === 0 && !$this->fileExists($filename, $path) && $this->fileExists($basename, $path)) {
+                    // Original image support: override original image if it's the same as the uploaded image.
+                    $this->doCopy($basename, $filename, $path);
+                }
+
+                // FormFlashFile may also contain metadata.
+                $metadata = $uploadedFile->getMetaData();
+                if ($metadata) {
+                    // TODO: This overrides metadata if used with multiple retina image sizes.
+                    $this->doSaveMetadata(['upload' => $metadata], $name, $path);
+                }
+            } else {
+                // Not a FormFlashFile.
+                $this->doMoveUploadedFile($uploadedFile, $filename, $path);
+            }
+
+            // Post-processing: Special content sanitization for SVG.
+            $mime = Utils::getMimeByFilename($filename);
+            if (Utils::contains($mime, 'svg', false)) {
+                $this->doSanitizeSvg($filename, $path);
+            }
+
+            // Add the new file into the media.
+            // TODO: This overrides existing media sizes if used with multiple retina image sizes.
+            $this->doAddUploadedMedium($name, $filename, $path);
+
+        } catch (Exception $e) {
+            throw new RuntimeException($this->translate('PLUGIN_ADMIN.FAILED_TO_MOVE_UPLOADED_FILE') . $e->getMessage(), 400);
+        } finally {
+            // Finally clear media cache.
+            $locator->clearCache();
+            $this->clearCache();
+        }
+    }
+
+    /**
+     * Delete real file from the media collection.
+     *
+     * @param string $filename
+     * @param array|null $settings
+     * @return void
+     * @throws RuntimeException
+     */
+    public function deleteFile(string $filename, array $settings = null): void
+    {
+        // Add the defaults to the settings.
+        $settings = $this->getUploadSettings($settings);
+        $filesystem = Filesystem::getInstance(false);
+
+        // First check for allowed filename.
+        $basename = $filesystem->basename($filename);
+        if (!Utils::checkFilename($basename)) {
+            throw new RuntimeException($this->translate('PLUGIN_ADMIN.FILE_COULD_NOT_BE_DELETED') . ": {$this->translate('PLUGIN_ADMIN.BAD_FILENAME')}: " . $filename, 400);
+        }
+
+        $path = $settings['destination'] ?? $this->getPath();
+        if (!$path) {
+            return;
+        }
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+        $locator->clearCache();
+
+        $pathname = $filesystem->pathname($filename);
+
+        // Get base name of the file.
+        [$base, $ext,,] = $this->getFileParts($basename);
+        $name = "{$pathname}{$base}.{$ext}";
+
+        // Remove file and all all the associated metadata.
+        $this->doRemove($name, $path);
+
+        // Finally clear media cache.
+        $locator->clearCache();
+        $this->clearCache();
+    }
+
+    /**
+     * Rename file inside the media collection.
+     *
+     * @param string $from
+     * @param string $to
+     * @param array|null $settings
+     */
+    public function renameFile(string $from, string $to, array $settings = null): void
+    {
+        // Add the defaults to the settings.
+        $settings = $this->getUploadSettings($settings);
+        $filesystem = Filesystem::getInstance(false);
+
+        $path = $settings['destination'] ?? $this->getPath();
+        if (!$path) {
+            // TODO: translate error message
+            throw new RuntimeException('Failed to rename file: Bad destination', 400);
+        }
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+        $locator->clearCache();
+
+        // Get base name of the file.
+        $pathname = $filesystem->pathname($from);
+
+        // Remove @2x, @3x and .meta.yaml
+        [$base, $ext,,] = $this->getFileParts($filesystem->basename($from));
+        $from = "{$pathname}{$base}.{$ext}";
+
+        [$base, $ext,,] = $this->getFileParts($filesystem->basename($to));
+        $to = "{$pathname}{$base}.{$ext}";
+
+        $this->doRename($from, $to, $path);
+
+        // Finally clear media cache.
+        $locator->clearCache();
+        $this->clearCache();
+    }
+
+    /**
+     * Internal logic to move uploaded file.
+     *
+     * @param UploadedFileInterface $uploadedFile
+     * @param string $filename
+     * @param string $path
+     */
+    protected function doMoveUploadedFile(UploadedFileInterface $uploadedFile, string $filename, string $path): void
+    {
+        $filepath = sprintf('%s/%s', $path, $filename);
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+
+        // Do not use streams internally.
+        if ($locator->isStream($filepath)) {
+            $filepath = (string)$locator->findResource($filepath, true, true);
+        }
+
+        Folder::create(dirname($filepath));
+
+        $uploadedFile->moveTo($filepath);
+    }
+
+    /**
+     * Get upload settings.
+     *
+     * @param array|null $settings Form field specific settings (override).
+     * @return array
+     */
+    public function getUploadSettings(?array $settings = null): array
+    {
+        return null !== $settings ? $settings + $this->_upload_defaults : $this->_upload_defaults;
+    }
+
+    /**
+     * Internal logic to copy file.
+     *
+     * @param string $src
+     * @param string $dst
+     * @param string $path
+     */
+    protected function doCopy(string $src, string $dst, string $path): void
+    {
+        $src = sprintf('%s/%s', $path, $src);
+        $dst = sprintf('%s/%s', $path, $dst);
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+
+        // Do not use streams internally.
+        if ($locator->isStream($dst)) {
+            $dst = (string)$locator->findResource($dst, true, true);
+        }
+
+        Folder::create(dirname($dst));
+
+        copy($src, $dst);
+    }
+
+    /**
+     * Internal logic to rename file.
+     *
+     * @param string $from
+     * @param string $to
+     * @param string $path
+     */
+    protected function doRename(string $from, string $to, string $path): void
+    {
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+
+        $fromPath = $path . '/' . $from;
+        if ($locator->isStream($fromPath)) {
+            $fromPath = $locator->findResource($fromPath, true, true);
+        }
+
+        if (!is_file($fromPath)) {
+            return;
+        }
+
+        $mediaPath = dirname($fromPath);
+        $toPath = $mediaPath . '/' . $to;
+        if ($locator->isStream($toPath)) {
+            $toPath = $locator->findResource($toPath, true, true);
+        }
+
+        if (is_file($toPath)) {
+            // TODO: translate error message
+            throw new RuntimeException(sprintf('File could not be renamed: %s already exists (%s)', $to, $mediaPath), 500);
+        }
+
+        $result = rename($fromPath, $toPath);
+        if (!$result) {
+            // TODO: translate error message
+            throw new RuntimeException(sprintf('File could not be renamed: %s -> %s (%s)', $from, $to, $mediaPath), 500);
+        }
+
+        // TODO: Add missing logic to handle retina files.
+        if (is_file($fromPath . '.meta.yaml')) {
+            $result = rename($fromPath . '.meta.yaml', $toPath . '.meta.yaml');
+            if (!$result) {
+                // TODO: translate error message
+                throw new RuntimeException(sprintf('Meta could not be renamed: %s -> %s (%s)', $from, $to, $mediaPath), 500);
+            }
+        }
+    }
+
+    /**
+     * Internal logic to remove file.
+     *
+     * @param string $filename
+     * @param string $path
+     */
+    protected function doRemove(string $filename, string $path): void
+    {
+        $filesystem = Filesystem::getInstance(false);
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+
+        // If path doesn't exist, there's nothing to do.
+        $pathname = $filesystem->pathname($filename);
+        if (!$this->fileExists($pathname, $path)) {
+            return;
+        }
+
+        $folder = $locator->isStream($path) ? (string)$locator->findResource($path, true, true) : $path;
+
+        // Remove requested media file.
+        if ($this->fileExists($filename, $path)) {
+            $result = unlink("{$folder}/{$filename}");
+            if (!$result) {
+                throw new RuntimeException($this->translate('PLUGIN_ADMIN.FILE_COULD_NOT_BE_DELETED') . ': ' . $filename, 500);
+            }
+        }
+
+        // Remove associated metadata.
+        $this->doRemoveMetadata($filename, $path);
+
+        // Remove associated 2x, 3x and their .meta.yaml files.
+        $targetPath = rtrim(sprintf('%s/%s', $folder, $pathname), '/');
+        $dir = scandir($targetPath, SCANDIR_SORT_NONE);
+        if (false === $dir) {
+            throw new RuntimeException($this->translate('PLUGIN_ADMIN.FILE_COULD_NOT_BE_DELETED') . ': ' . $filename, 500);
+        }
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+
+        $basename = $filesystem->basename($filename);
+        $fileParts = (array)$filesystem->pathinfo($filename);
+
+        foreach ($dir as $file) {
+            $preg_name = preg_quote($fileParts['filename'], '`');
+            $preg_ext = preg_quote($fileParts['extension'] ?? '.', '`');
+            $preg_filename = preg_quote($basename, '`');
+
+            if (preg_match("`({$preg_name}@\d+x\.{$preg_ext}(?:\.meta\.yaml)?$|{$preg_filename}\.meta\.yaml)$`", $file)) {
+                $testPath = $targetPath . '/' . $file;
+                if ($locator->isStream($testPath)) {
+                    $testPath = (string)$locator->findResource($testPath, true, true);
+                    $locator->clearCache($testPath);
+                }
+
+                if (is_file($testPath)) {
+                    $result = unlink($testPath);
+                    if (!$result) {
+                        throw new RuntimeException($this->translate('PLUGIN_ADMIN.FILE_COULD_NOT_BE_DELETED') . ': ' . $filename, 500);
+                    }
+                }
+            }
+        }
+
+        $this->hide($filename);
+    }
+
+    /**
+     * @param array $metadata
+     * @param string $filename
+     * @param string $path
+     */
+    protected function doSaveMetadata(array $metadata, string $filename, string $path): void
+    {
+        $filepath = sprintf('%s/%s', $path, $filename);
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+
+        // Do not use streams internally.
+        if ($locator->isStream($filepath)) {
+            $filepath = (string)$locator->findResource($filepath, true, true);
+        }
+
+        $file = YamlFile::instance($filepath . '.meta.yaml');
+        $file->save($metadata);
+    }
+
+    /**
+     * @param string $filename
+     * @param string $path
+     */
+    protected function doRemoveMetadata(string $filename, string $path): void
+    {
+        $filepath = sprintf('%s/%s', $path, $filename);
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+
+        // Do not use streams internally.
+        if ($locator->isStream($filepath)) {
+            $filepath = (string)$locator->findResource($filepath, true);
+            if (!$filepath) {
+                return;
+            }
+        }
+
+        $file = YamlFile::instance($filepath . '.meta.yaml');
+        if ($file->exists()) {
+            $file->delete();
+        }
+    }
+
+    /**
+     * @param string $filename
+     * @param string $path
+     */
+    protected function doSanitizeSvg(string $filename, string $path): void
+    {
+        $filepath = sprintf('%s/%s', $path, $filename);
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+
+        // Do not use streams internally.
+        if ($locator->isStream($filepath)) {
+            $filepath = (string)$locator->findResource($filepath, true, true);
+        }
+
+        Security::sanitizeSVG($filepath);
+    }
+
+    /**
+     * @param string $name
+     * @param string $filename
+     * @param string $path
+     */
+    protected function doAddUploadedMedium(string $name, string $filename, string $path): void
+    {
+        $filepath = sprintf('%s/%s', $path, $filename);
+        $medium = $this->createFromFile($filepath);
+        $realpath = $path . '/' . $name;
+        $this->add($realpath, $medium);
+    }
+
+    /**
+     * @param string $string
+     * @return string
+     */
+    protected function translate(string $string): string
+    {
+        return $this->getLanguage()->translate($string);
+    }
+
+    abstract protected function getPath(): ?string;
+
+    abstract protected function getGrav(): Grav;
+
+    abstract protected function getConfig(): Config;
+
+    abstract protected function getLanguage(): Language;
+
+    abstract protected function clearCache(): void;
+}
diff --git a/system/src/Grav/Common/Media/Traits/StaticResizeTrait.php b/system/src/Grav/Common/Media/Traits/StaticResizeTrait.php
new file mode 100644
index 0000000000..d8a4b08315
--- /dev/null
+++ b/system/src/Grav/Common/Media/Traits/StaticResizeTrait.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Traits;
+
+/**
+ * Trait StaticResizeTrait
+ * @package Grav\Common\Media\Traits
+ */
+trait StaticResizeTrait
+{
+    /**
+     * Resize media by setting attributes
+     *
+     * @param  int|null $width
+     * @param  int|null $height
+     * @return $this
+     */
+    public function resize($width = null, $height = null)
+    {
+        if ($width) {
+            $this->styleAttributes['width'] = $width . 'px';
+        } else {
+            unset($this->styleAttributes['width']);
+        }
+        if ($height) {
+            $this->styleAttributes['height'] = $height . 'px';
+        } else {
+            unset($this->styleAttributes['height']);
+        }
+
+        return $this;
+    }
+}
diff --git a/system/src/Grav/Common/Media/Traits/ThumbnailMediaTrait.php b/system/src/Grav/Common/Media/Traits/ThumbnailMediaTrait.php
new file mode 100644
index 0000000000..100b5321cc
--- /dev/null
+++ b/system/src/Grav/Common/Media/Traits/ThumbnailMediaTrait.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Traits;
+
+use BadMethodCallException;
+use Grav\Common\Media\Interfaces\MediaLinkInterface;
+use Grav\Common\Media\Interfaces\MediaObjectInterface;
+use function get_class;
+use function is_callable;
+
+/**
+ * Trait ThumbnailMediaTrait
+ * @package Grav\Common\Media\Traits
+ */
+trait ThumbnailMediaTrait
+{
+    /** @var MediaObjectInterface|null */
+    public $parent;
+
+    /** @var bool */
+    public $linked = false;
+
+    /**
+     * Return srcset string for this Medium and its alternatives.
+     *
+     * @param bool $reset
+     * @return string
+     */
+    public function srcset($reset = true)
+    {
+        return '';
+    }
+
+    /**
+     * Get an element (is array) that can be rendered by the Parsedown engine
+     *
+     * @param string|null $title
+     * @param string|null $alt
+     * @param string|null $class
+     * @param string|null $id
+     * @param bool $reset
+     * @return array
+     */
+    public function parsedownElement($title = null, $alt = null, $class = null, $id = null, $reset = true)
+    {
+        return $this->bubble('parsedownElement', [$title, $alt, $class, $id, $reset]);
+    }
+
+    /**
+     * Return HTML markup from the medium.
+     *
+     * @param string|null $title
+     * @param string|null $alt
+     * @param string|null $class
+     * @param string|null $id
+     * @param bool $reset
+     * @return string
+     */
+    public function html($title = null, $alt = null, $class = null, $id = null, $reset = true)
+    {
+        return $this->bubble('html', [$title, $alt, $class, $id, $reset]);
+    }
+
+    /**
+     * Switch display mode.
+     *
+     * @param string $mode
+     *
+     * @return MediaLinkInterface|MediaObjectInterface|null
+     */
+    public function display($mode = 'source')
+    {
+        return $this->bubble('display', [$mode], false);
+    }
+
+    /**
+     * Switch thumbnail.
+     *
+     * @param string $type
+     *
+     * @return MediaLinkInterface|MediaObjectInterface
+     */
+    public function thumbnail($type = 'auto')
+    {
+        $this->bubble('thumbnail', [$type], false);
+
+        return $this->bubble('getThumbnail', [], false);
+    }
+
+    /**
+     * Turn the current Medium into a Link
+     *
+     * @param  bool $reset
+     * @param  array  $attributes
+     * @return MediaLinkInterface
+     */
+    public function link($reset = true, array $attributes = [])
+    {
+        return $this->bubble('link', [$reset, $attributes], false);
+    }
+
+    /**
+     * Turn the current Medium into a Link with lightbox enabled
+     *
+     * @param  int|null  $width
+     * @param  int|null  $height
+     * @param  bool $reset
+     * @return MediaLinkInterface
+     */
+    public function lightbox($width = null, $height = null, $reset = true)
+    {
+        return $this->bubble('lightbox', [$width, $height, $reset], false);
+    }
+
+    /**
+     * Bubble a function call up to either the superclass function or the parent Medium instance
+     *
+     * @param  string  $method
+     * @param  array  $arguments
+     * @param  bool $testLinked
+     * @return mixed
+     */
+    protected function bubble($method, array $arguments = [], $testLinked = true)
+    {
+        if (!$testLinked || $this->linked) {
+            $parent = $this->parent;
+            if (null === $parent) {
+                return $this;
+            }
+
+            $closure = [$parent, $method];
+
+            if (!is_callable($closure)) {
+                throw new BadMethodCallException(get_class($parent) . '::' . $method . '() not found.');
+            }
+
+            return $closure(...$arguments);
+        }
+
+        return parent::{$method}(...$arguments);
+    }
+}
diff --git a/system/src/Grav/Common/Media/Traits/VideoMediaTrait.php b/system/src/Grav/Common/Media/Traits/VideoMediaTrait.php
new file mode 100644
index 0000000000..07f0c3f12a
--- /dev/null
+++ b/system/src/Grav/Common/Media/Traits/VideoMediaTrait.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * @package    Grav\Common\Media
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Media\Traits;
+
+/**
+ * Trait VideoMediaTrait
+ * @package Grav\Common\Media\Traits
+ */
+trait VideoMediaTrait
+{
+    use StaticResizeTrait;
+    use MediaPlayerTrait;
+
+    /**
+     * Allows to set the video's poster image
+     *
+     * @param string $urlImage
+     * @return $this
+     */
+    public function poster($urlImage)
+    {
+        $this->attributes['poster'] = $urlImage;
+
+        return $this;
+    }
+
+    /**
+     * Allows to set the playsinline attribute
+     *
+     * @param bool $status
+     * @return $this
+     */
+    public function playsinline($status = false)
+    {
+        if ($status) {
+            $this->attributes['playsinline'] = 'playsinline';
+        } else {
+            unset($this->attributes['playsinline']);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Parsedown element for source display mode
+     *
+     * @param  array $attributes
+     * @param  bool $reset
+     * @return array
+     */
+    protected function sourceParsedownElement(array $attributes, $reset = true)
+    {
+        $location = $this->url($reset);
+
+        return [
+            'name' => 'video',
+            'rawHtml' => '<source src="' . $location . '">Your browser does not support the video tag.',
+            'attributes' => $attributes
+        ];
+    }
+}
diff --git a/system/src/Grav/Common/Page/Collection.php b/system/src/Grav/Common/Page/Collection.php
index 51de16b021..987b8d9317 100644
--- a/system/src/Grav/Common/Page/Collection.php
+++ b/system/src/Grav/Common/Page/Collection.php
@@ -3,27 +3,37 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page;
 
+use Exception;
 use Grav\Common\Grav;
 use Grav\Common\Iterator;
+use Grav\Common\Page\Interfaces\PageCollectionInterface;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Utils;
+use InvalidArgumentException;
+use function array_key_exists;
+use function array_keys;
+use function array_search;
+use function count;
+use function in_array;
+use function is_array;
+use function is_string;
 
-class Collection extends Iterator
+/**
+ * Class Collection
+ * @package Grav\Common\Page
+ * @implements PageCollectionInterface<string,Page>
+ */
+class Collection extends Iterator implements PageCollectionInterface
 {
-    /**
-     * @var Pages
-     */
+    /** @var Pages */
     protected $pages;
-
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $params;
 
     /**
@@ -38,7 +48,7 @@ public function __construct($items = [], array $params = [], Pages $pages = null
         parent::__construct($items);
 
         $this->params = $params;
-        $this->pages = $pages ? $pages : Grav::instance()->offsetGet('pages');
+        $this->pages = $pages ?: Grav::instance()->offsetGet('pages');
     }
 
     /**
@@ -51,11 +61,23 @@ public function params()
         return $this->params;
     }
 
+    /**
+     * Set parameters to the Collection
+     *
+     * @param array $params
+     * @return $this
+     */
+    public function setParams(array $params)
+    {
+        $this->params = array_merge($this->params, $params);
+
+        return $this;
+    }
+
     /**
      * Add a single page to a collection
      *
      * @param PageInterface $page
-     *
      * @return $this
      */
     public function addPage(PageInterface $page)
@@ -94,12 +116,12 @@ public function copy()
      *
      * Merge another collection with the current collection
      *
-     * @param Collection $collection
+     * @param PageCollectionInterface $collection
      * @return $this
      */
-    public function merge(Collection $collection)
+    public function merge(PageCollectionInterface $collection)
     {
-        foreach($collection as $page) {
+        foreach ($collection as $page) {
             $this->addPage($page);
         }
 
@@ -109,15 +131,15 @@ public function merge(Collection $collection)
     /**
      * Intersect another collection with the current collection
      *
-     * @param Collection $collection
+     * @param PageCollectionInterface $collection
      * @return $this
      */
-    public function intersect(Collection $collection)
+    public function intersect(PageCollectionInterface $collection)
     {
         $array1 = $this->items;
         $array2 = $collection->toArray();
 
-        $this->items = array_uintersect($array1, $array2, function($val1, $val2) {
+        $this->items = array_uintersect($array1, $array2, function ($val1, $val2) {
             return strcmp($val1['slug'], $val2['slug']);
         });
 
@@ -125,17 +147,15 @@ public function intersect(Collection $collection)
     }
 
     /**
-     * Set parameters to the Collection
-     *
-     * @param array $params
-     *
-     * @return $this
+     * Set current page.
      */
-    public function setParams(array $params)
+    public function setCurrent(string $path): void
     {
-        $this->params = array_merge($this->params, $params);
+        reset($this->items);
 
-        return $this;
+        while (($key = key($this->items)) !== null && $key !== $path) {
+            next($this->items);
+        }
     }
 
     /**
@@ -143,6 +163,7 @@ public function setParams(array $params)
      *
      * @return PageInterface
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $current = parent::key();
@@ -155,6 +176,7 @@ public function current()
      *
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         $current = parent::current();
@@ -165,10 +187,10 @@ public function key()
     /**
      * Returns the value at specified offset.
      *
-     * @param mixed $offset The offset to retrieve.
-     *
-     * @return mixed         Can return all value types.
+     * @param string $offset
+     * @return PageInterface|null
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->pages->get($offset) ?: null;
@@ -178,7 +200,7 @@ public function offsetGet($offset)
      * Split collection into array of smaller collections.
      *
      * @param int $size
-     * @return array|Collection[]
+     * @return Collection[]
      */
     public function batch($size)
     {
@@ -196,9 +218,8 @@ public function batch($size)
      * Remove item from the list.
      *
      * @param PageInterface|string|null $key
-     *
      * @return $this
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function remove($key = null)
     {
@@ -207,8 +228,8 @@ public function remove($key = null)
         } elseif (null === $key) {
             $key = (string)key($this->items);
         }
-        if (!\is_string($key)) {
-            throw new \InvalidArgumentException('Invalid argument $key.');
+        if (!is_string($key)) {
+            throw new InvalidArgumentException('Invalid argument $key.');
         }
 
         parent::remove($key);
@@ -221,9 +242,8 @@ public function remove($key = null)
      *
      * @param string $by
      * @param string $dir
-     * @param array  $manual
-     * @param string $sort_flags
-     *
+     * @param array|null  $manual
+     * @param string|null $sort_flags
      * @return $this
      */
     public function order($by, $dir = 'asc', $manual = null, $sort_flags = null)
@@ -237,10 +257,9 @@ public function order($by, $dir = 'asc', $manual = null, $sort_flags = null)
      * Check to see if this item is the first in the collection.
      *
      * @param  string $path
-     *
      * @return bool True if item is first.
      */
-    public function isFirst($path)
+    public function isFirst($path): bool
     {
         return $this->items && $path === array_keys($this->items)[0];
     }
@@ -249,12 +268,11 @@ public function isFirst($path)
      * Check to see if this item is the last in the collection.
      *
      * @param  string $path
-     *
      * @return bool True if item is last.
      */
-    public function isLast($path)
+    public function isLast($path): bool
     {
-        return $this->items && $path === array_keys($this->items)[\count($this->items) - 1];
+        return $this->items && $path === array_keys($this->items)[count($this->items) - 1];
     }
 
     /**
@@ -286,7 +304,6 @@ public function nextSibling($path)
      *
      * @param  string  $path
      * @param  int $direction either -1 or +1
-     *
      * @return PageInterface|Collection    The sibling item.
      */
     public function adjacentSibling($path, $direction = 1)
@@ -301,48 +318,49 @@ public function adjacentSibling($path, $direction = 1)
         }
 
         return $this;
-
     }
 
     /**
      * Returns the item in the current position.
      *
      * @param  string $path the path the item
-     *
-     * @return int   the index of the current page.
+     * @return int|null The index of the current page, null if not found.
      */
-    public function currentPosition($path)
+    public function currentPosition($path): ?int
     {
-        return \array_search($path, \array_keys($this->items), true);
+        $pos = array_search($path, array_keys($this->items), true);
+
+        return $pos !== false ? $pos : null;
     }
 
     /**
      * Returns the items between a set of date ranges of either the page date field (default) or
-     * an arbitrary datetime page field where end date is optional
-     * Dates can be passed in as text that strtotime() can process
+     * an arbitrary datetime page field where start date and end date are optional
+     * Dates must be passed in as text that strtotime() can process
      * http://php.net/manual/en/function.strtotime.php
      *
-     * @param string $startDate
-     * @param bool $endDate
+     * @param string|null $startDate
+     * @param string|null $endDate
      * @param string|null $field
-     *
      * @return $this
-     * @throws \Exception
+     * @throws Exception
      */
-    public function dateRange($startDate, $endDate = false, $field = null)
+    public function dateRange($startDate = null, $endDate = null, $field = null)
     {
-        $start = Utils::date2timestamp($startDate);
-        $end = $endDate ? Utils::date2timestamp($endDate) : false;
+        $start = $startDate ? Utils::date2timestamp($startDate) : null;
+        $end = $endDate ? Utils::date2timestamp($endDate) : null;
 
         $date_range = [];
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if ($page !== null) {
-                $date = $field ? strtotime($page->value($field)) : $page->date();
+            if (!$page) {
+                continue;
+            }
 
-                if ($date >= $start && (!$end || $date <= $end)) {
-                    $date_range[$path] = $slug;
-                }
+            $date = $field ? strtotime($page->value($field)) : $page->date();
+
+            if ((!$start || $date >= $start) && (!$end || $date <= $end)) {
+                $date_range[$path] = $slug;
             }
         }
 
@@ -392,17 +410,17 @@ public function nonVisible()
     }
 
     /**
-     * Creates new collection with only modular pages
+     * Creates new collection with only pages
      *
-     * @return Collection The collection with only modular pages
+     * @return Collection The collection with only pages
      */
-    public function modular()
+    public function pages()
     {
         $modular = [];
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if ($page !== null && $page->modular()) {
+            if ($page !== null && !$page->isModule()) {
                 $modular[$path] = $slug;
             }
         }
@@ -412,17 +430,17 @@ public function modular()
     }
 
     /**
-     * Creates new collection with only non-modular pages
+     * Creates new collection with only modules
      *
-     * @return Collection The collection with only non-modular pages
+     * @return Collection The collection with only modules
      */
-    public function nonModular()
+    public function modules()
     {
         $modular = [];
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if ($page !== null && !$page->modular()) {
+            if ($page !== null && $page->isModule()) {
                 $modular[$path] = $slug;
             }
         }
@@ -431,6 +449,72 @@ public function nonModular()
         return $this;
     }
 
+    /**
+     * Alias of pages()
+     *
+     * @return Collection The collection with only non-module pages
+     */
+    public function nonModular()
+    {
+        $this->pages();
+
+        return $this;
+    }
+
+    /**
+     * Alias of modules()
+     *
+     * @return Collection The collection with only modules
+     */
+    public function modular()
+    {
+        $this->modules();
+
+        return $this;
+    }
+
+    /**
+     * Creates new collection with only translated pages
+     *
+     * @return Collection The collection with only published pages
+     * @internal
+     */
+    public function translated()
+    {
+        $published = [];
+
+        foreach ($this->items as $path => $slug) {
+            $page = $this->pages->get($path);
+            if ($page !== null && $page->translated()) {
+                $published[$path] = $slug;
+            }
+        }
+        $this->items = $published;
+
+        return $this;
+    }
+
+    /**
+     * Creates new collection with only untranslated pages
+     *
+     * @return Collection The collection with only non-published pages
+     * @internal
+     */
+    public function nonTranslated()
+    {
+        $published = [];
+
+        foreach ($this->items as $path => $slug) {
+            $page = $this->pages->get($path);
+            if ($page !== null && !$page->translated()) {
+                $published[$path] = $slug;
+            }
+        }
+        $this->items = $published;
+
+        return $this;
+    }
+
     /**
      * Creates new collection with only published pages
      *
@@ -517,7 +601,6 @@ public function nonRoutable()
      * Creates new collection with only pages of the specified type
      *
      * @param string $type
-     *
      * @return Collection The collection
      */
     public function ofType($type)
@@ -540,7 +623,6 @@ public function ofType($type)
      * Creates new collection with only pages of one of the specified types
      *
      * @param string[] $types
-     *
      * @return Collection The collection
      */
     public function ofOneOfTheseTypes($types)
@@ -549,7 +631,7 @@ public function ofOneOfTheseTypes($types)
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if ($page !== null && \in_array($page->template(), $types, true)) {
+            if ($page !== null && in_array($page->template(), $types, true)) {
                 $items[$path] = $slug;
             }
         }
@@ -563,7 +645,6 @@ public function ofOneOfTheseTypes($types)
      * Creates new collection with only pages of one of the specified access levels
      *
      * @param array $accessLevels
-     *
      * @return Collection The collection
      */
     public function ofOneOfTheseAccessLevels($accessLevels)
@@ -574,19 +655,19 @@ public function ofOneOfTheseAccessLevels($accessLevels)
             $page = $this->pages->get($path);
 
             if ($page !== null && isset($page->header()->access)) {
-                if (\is_array($page->header()->access)) {
+                if (is_array($page->header()->access)) {
                     //Multiple values for access
                     $valid = false;
 
                     foreach ($page->header()->access as $index => $accessLevel) {
-                        if (\is_array($accessLevel)) {
+                        if (is_array($accessLevel)) {
                             foreach ($accessLevel as $innerIndex => $innerAccessLevel) {
-                                if (\in_array($innerAccessLevel, $accessLevels)) {
+                                if (in_array($innerAccessLevel, $accessLevels, false)) {
                                     $valid = true;
                                 }
                             }
                         } else {
-                            if (\in_array($index, $accessLevels)) {
+                            if (in_array($index, $accessLevels, false)) {
                                 $valid = true;
                             }
                         }
@@ -596,11 +677,10 @@ public function ofOneOfTheseAccessLevels($accessLevels)
                     }
                 } else {
                     //Single value for access
-                    if (\in_array($page->header()->access, $accessLevels)) {
+                    if (in_array($page->header()->access, $accessLevels, false)) {
                         $items[$path] = $slug;
                     }
                 }
-
             }
         }
 
@@ -613,7 +693,7 @@ public function ofOneOfTheseAccessLevels($accessLevels)
      * Get the extended version of this Collection with each page keyed by route
      *
      * @return array
-     * @throws \Exception
+     * @throws Exception
      */
     public function toExtendedArray()
     {
diff --git a/system/src/Grav/Common/Page/Header.php b/system/src/Grav/Common/Page/Header.php
index e3854aecfe..c18b58d378 100644
--- a/system/src/Grav/Common/Page/Header.php
+++ b/system/src/Grav/Common/Page/Header.php
@@ -3,16 +3,36 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page;
 
+use ArrayAccess;
+use JsonSerializable;
 use RocketTheme\Toolbox\ArrayTraits\Constructor;
-use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccess;
+use RocketTheme\Toolbox\ArrayTraits\Export;
+use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
+use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccessWithGetters;
 
-class Header implements \ArrayAccess
+/**
+ * Class Header
+ * @package Grav\Common\Page
+ */
+class Header implements ArrayAccess, ExportInterface, JsonSerializable
 {
-    use NestedArrayAccess, Constructor;
+    use NestedArrayAccessWithGetters, Constructor, Export;
+
+    /** @var array */
+    protected $items;
+
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
+    {
+        return $this->toArray();
+    }
 }
diff --git a/system/src/Grav/Common/Page/Interfaces/PageCollectionInterface.php b/system/src/Grav/Common/Page/Interfaces/PageCollectionInterface.php
new file mode 100644
index 0000000000..493ab43985
--- /dev/null
+++ b/system/src/Grav/Common/Page/Interfaces/PageCollectionInterface.php
@@ -0,0 +1,310 @@
+<?php
+
+/**
+ * @package    Grav\Common\Page
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Page\Interfaces;
+
+use ArrayAccess;
+use Countable;
+use Exception;
+use InvalidArgumentException;
+use Serializable;
+use Traversable;
+
+/**
+ * Interface PageCollectionInterface
+ * @package Grav\Common\Page\Interfaces
+ *
+ * @template TKey of array-key
+ * @template T
+ * @extends Traversable<TKey,T>
+ * @extends ArrayAccess<TKey|null,T>
+ */
+interface PageCollectionInterface extends Traversable, ArrayAccess, Countable, Serializable
+{
+    /**
+     * Get the collection params
+     *
+     * @return array
+     */
+    public function params();
+
+    /**
+     * Set parameters to the Collection
+     *
+     * @param array $params
+     * @return $this
+     */
+    public function setParams(array $params);
+
+    /**
+     * Add a single page to a collection
+     *
+     * @param PageInterface $page
+     * @return $this
+     */
+    public function addPage(PageInterface $page);
+
+    /**
+     * Add a page with path and slug
+     *
+     * @param string $path
+     * @param string $slug
+     * @return $this
+     */
+    //public function add($path, $slug);
+
+    /**
+     *
+     * Create a copy of this collection
+     *
+     * @return static
+     */
+    public function copy();
+
+    /**
+     *
+     * Merge another collection with the current collection
+     *
+     * @param PageCollectionInterface $collection
+     * @return PageCollectionInterface
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function merge(PageCollectionInterface $collection);
+
+    /**
+     * Intersect another collection with the current collection
+     *
+     * @param PageCollectionInterface $collection
+     * @return PageCollectionInterface
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function intersect(PageCollectionInterface $collection);
+
+    /**
+     * Split collection into array of smaller collections.
+     *
+     * @param int $size
+     * @return PageCollectionInterface[]
+     * @phpstan-return array<PageCollectionInterface<TKey,T>>
+     */
+    public function batch($size);
+
+    /**
+     * Remove item from the list.
+     *
+     * @param PageInterface|string|null $key
+     * @return PageCollectionInterface
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     * @throws InvalidArgumentException
+     */
+    //public function remove($key = null);
+
+    /**
+     * Reorder collection.
+     *
+     * @param string $by
+     * @param string $dir
+     * @param array|null  $manual
+     * @param string|null $sort_flags
+     * @return PageCollectionInterface
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function order($by, $dir = 'asc', $manual = null, $sort_flags = null);
+
+    /**
+     * Check to see if this item is the first in the collection.
+     *
+     * @param  string $path
+     * @return bool True if item is first.
+     */
+    public function isFirst($path): bool;
+
+    /**
+     * Check to see if this item is the last in the collection.
+     *
+     * @param  string $path
+     * @return bool True if item is last.
+     */
+    public function isLast($path): bool;
+
+    /**
+     * Gets the previous sibling based on current position.
+     *
+     * @param  string $path
+     * @return PageInterface  The previous item.
+     * @phpstan-return T
+     */
+    public function prevSibling($path);
+
+    /**
+     * Gets the next sibling based on current position.
+     *
+     * @param  string $path
+     * @return PageInterface The next item.
+     * @phpstan-return T
+     */
+    public function nextSibling($path);
+
+    /**
+     * Returns the adjacent sibling based on a direction.
+     *
+     * @param  string  $path
+     * @param  int $direction either -1 or +1
+     * @return PageInterface|PageCollectionInterface|false    The sibling item.
+     * @phpstan-return T|false
+     */
+    public function adjacentSibling($path, $direction = 1);
+
+    /**
+     * Returns the item in the current position.
+     *
+     * @param  string $path the path the item
+     * @return int|null The index of the current page, null if not found.
+     */
+    public function currentPosition($path): ?int;
+
+    /**
+     * Returns the items between a set of date ranges of either the page date field (default) or
+     * an arbitrary datetime page field where start date and end date are optional
+     * Dates must be passed in as text that strtotime() can process
+     * http://php.net/manual/en/function.strtotime.php
+     *
+     * @param string|null $startDate
+     * @param string|null $endDate
+     * @param string|null $field
+     * @return PageCollectionInterface
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     * @throws Exception
+     */
+    public function dateRange($startDate = null, $endDate = null, $field = null);
+
+    /**
+     * Creates new collection with only visible pages
+     *
+     * @return PageCollectionInterface The collection with only visible pages
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function visible();
+
+    /**
+     * Creates new collection with only non-visible pages
+     *
+     * @return PageCollectionInterface The collection with only non-visible pages
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function nonVisible();
+
+    /**
+     * Creates new collection with only pages
+     *
+     * @return PageCollectionInterface The collection with only pages
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function pages();
+
+    /**
+     * Creates new collection with only modules
+     *
+     * @return PageCollectionInterface The collection with only modules
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function modules();
+
+    /**
+     * Creates new collection with only modules
+     *
+     * @return PageCollectionInterface The collection with only modules
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     * @deprecated 1.7 Use $this->modules() instead
+     */
+    public function modular();
+
+    /**
+     * Creates new collection with only non-module pages
+     *
+     * @return PageCollectionInterface The collection with only non-module pages
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     * @deprecated 1.7 Use $this->pages() instead
+     */
+    public function nonModular();
+
+    /**
+     * Creates new collection with only published pages
+     *
+     * @return PageCollectionInterface The collection with only published pages
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function published();
+
+    /**
+     * Creates new collection with only non-published pages
+     *
+     * @return PageCollectionInterface The collection with only non-published pages
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function nonPublished();
+
+    /**
+     * Creates new collection with only routable pages
+     *
+     * @return PageCollectionInterface The collection with only routable pages
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function routable();
+
+    /**
+     * Creates new collection with only non-routable pages
+     *
+     * @return PageCollectionInterface The collection with only non-routable pages
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function nonRoutable();
+
+    /**
+     * Creates new collection with only pages of the specified type
+     *
+     * @param string $type
+     * @return PageCollectionInterface The collection
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function ofType($type);
+
+    /**
+     * Creates new collection with only pages of one of the specified types
+     *
+     * @param string[] $types
+     * @return PageCollectionInterface The collection
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function ofOneOfTheseTypes($types);
+
+    /**
+     * Creates new collection with only pages of one of the specified access levels
+     *
+     * @param array $accessLevels
+     * @return PageCollectionInterface The collection
+     * @phpstan-return PageCollectionInterface<TKey,T>
+     */
+    public function ofOneOfTheseAccessLevels($accessLevels);
+
+    /**
+     * Converts collection into an array.
+     *
+     * @return array
+     */
+    public function toArray();
+
+    /**
+     * Get the extended version of this Collection with each page keyed by route
+     *
+     * @return array
+     * @throws Exception
+     */
+    public function toExtendedArray();
+}
diff --git a/system/src/Grav/Common/Page/Interfaces/PageContentInterface.php b/system/src/Grav/Common/Page/Interfaces/PageContentInterface.php
index 8a3ee83be3..a80972b6bc 100644
--- a/system/src/Grav/Common/Page/Interfaces/PageContentInterface.php
+++ b/system/src/Grav/Common/Page/Interfaces/PageContentInterface.php
@@ -3,13 +3,15 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Interfaces;
 
-use Grav\Common\Page\Media;
+use Grav\Common\Data\Blueprint;
+use Grav\Common\Media\Interfaces\MediaCollectionInterface;
+use Grav\Common\Page\Header;
 
 /**
  * Methods currently implemented in Flex Page emulation layer.
@@ -19,28 +21,31 @@ interface PageContentInterface
     /**
      * Gets and Sets the header based on the YAML configuration at the top of the .md file
      *
-     * @param  object|array $var a YAML object representing the configuration for the file
-     *
-     * @return object      the current YAML configuration
+     * @param  object|array|null $var a YAML object representing the configuration for the file
+     * @return \stdClass|Header      The current YAML configuration
      */
     public function header($var = null);
 
     /**
      * Get the summary.
      *
-     * @param  int $size Max summary size.
-     *
+     * @param int|null $size Max summary size.
      * @param bool $textOnly Only count text size.
-     *
      * @return string
      */
     public function summary($size = null, $textOnly = false);
 
     /**
-     * Gets and Sets the content based on content portion of the .md file
+     * Sets the summary of the page
      *
-     * @param  string $var Content
+     * @param string $summary Summary
+     */
+    public function setSummary($summary);
+
+    /**
+     * Gets and Sets the content based on content portion of the .md file
      *
+     * @param  string|null $var Content
      * @return string      Content
      */
     public function content($var = null);
@@ -55,7 +60,7 @@ public function getRawContent();
     /**
      * Needed by the onPageContentProcessed event to set the raw page content
      *
-     * @param string $content
+     * @param string|null $content
      */
     public function setRawContent($content);
 
@@ -63,8 +68,7 @@ public function setRawContent($content);
      * Gets and Sets the Page raw content
      *
      * @param string|null $var
-     *
-     * @return null
+     * @return string
      */
     public function rawMarkdown($var = null);
 
@@ -72,8 +76,7 @@ public function rawMarkdown($var = null);
      * Get value from a page variable (used mostly for creating edit forms).
      *
      * @param string $name Variable name.
-     * @param mixed $default
-     *
+     * @param mixed|null $default
      * @return mixed
      */
     public function value($name, $default = null);
@@ -81,18 +84,16 @@ public function value($name, $default = null);
     /**
      * Gets and sets the associated media as found in the page folder.
      *
-     * @param  Media $var Representation of associated media.
-     *
-     * @return Media      Representation of associated media.
+     * @param  MediaCollectionInterface|null $var New media object.
+     * @return MediaCollectionInterface           Representation of associated media.
      */
     public function media($var = null);
 
     /**
      * Gets and sets the title for this Page.  If no title is set, it will use the slug() to get a name
      *
-     * @param  string $var the title of the Page
-     *
-     * @return string      the title of the Page
+     * @param  string|null $var New title of the Page
+     * @return string           The title of the Page
      */
     public function title($var = null);
 
@@ -100,45 +101,40 @@ public function title($var = null);
      * Gets and sets the menu name for this Page.  This is the text that can be used specifically for navigation.
      * If no menu field is set, it will use the title()
      *
-     * @param  string $var the menu field for the page
-     *
-     * @return string      the menu field for the page
+     * @param  string|null $var New menu field for the page
+     * @return string           The menu field for the page
      */
     public function menu($var = null);
 
     /**
      * Gets and Sets whether or not this Page is visible for navigation
      *
-     * @param  bool $var true if the page is visible
-     *
-     * @return bool      true if the page is visible
+     * @param  bool|null $var   New value
+     * @return bool             True if the page is visible
      */
     public function visible($var = null);
 
     /**
      * Gets and Sets whether or not this Page is considered published
      *
-     * @param  bool $var true if the page is published
-     *
-     * @return bool      true if the page is published
+     * @param  bool|null $var   New value
+     * @return bool             True if the page is published
      */
     public function published($var = null);
 
     /**
      * Gets and Sets the Page publish date
      *
-     * @param  string $var string representation of a date
-     *
-     * @return int         unix timestamp representation of the date
+     * @param  string|null $var String representation of the new date
+     * @return int              Unix timestamp representation of the date
      */
     public function publishDate($var = null);
 
     /**
      * Gets and Sets the Page unpublish date
      *
-     * @param  string $var string representation of a date
-     *
-     * @return int|null         unix timestamp representation of the date
+     * @param  string|null $var String representation of the new date
+     * @return int|null         Unix timestamp representation of the date
      */
     public function unpublishDate($var = null);
 
@@ -146,9 +142,8 @@ public function unpublishDate($var = null);
      * Gets and Sets the process setup for this Page. This is multi-dimensional array that consists of
      * a simple array of arrays with the form array("markdown"=>true) for example
      *
-     * @param  array $var an Array of name value pairs where the name is the process and value is true or false
-     *
-     * @return array      an Array of name value pairs where the name is the process and value is true or false
+     * @param  array|null $var New array of name value pairs where the name is the process and value is true or false
+     * @return array            Array of name value pairs where the name is the process and value is true or false
      */
     public function process($var = null);
 
@@ -156,63 +151,56 @@ public function process($var = null);
      * Gets and Sets the slug for the Page. The slug is used in the URL routing. If not set it uses
      * the parent folder from the path
      *
-     * @param  string $var the slug, e.g. 'my-blog'
-     *
-     * @return string      the slug
+     * @param  string|null $var New slug, e.g. 'my-blog'
+     * @return string           The slug
      */
     public function slug($var = null);
 
     /**
      * Get/set order number of this page.
      *
-     * @param int $var
-     *
-     * @return int|bool
+     * @param int|null $var      New order as a number
+     * @return string|bool       Order in a form of '02.' or false if not set
      */
     public function order($var = null);
 
     /**
      * Gets and sets the identifier for this Page object.
      *
-     * @param  string $var the identifier
-     *
-     * @return string      the identifier
+     * @param  string|null $var New identifier
+     * @return string           The identifier
      */
     public function id($var = null);
 
     /**
      * Gets and sets the modified timestamp.
      *
-     * @param  int $var modified unix timestamp
-     *
-     * @return int      modified unix timestamp
+     * @param  int|null $var New modified unix timestamp
+     * @return int           Modified unix timestamp
      */
     public function modified($var = null);
 
     /**
      * Gets and sets the option to show the last_modified header for the page.
      *
-     * @param  boolean $var show last_modified header
-     *
-     * @return boolean      show last_modified header
+     * @param  bool|null $var New last_modified header value
+     * @return bool           Show last_modified header
      */
     public function lastModified($var = null);
 
     /**
      * Get/set the folder.
      *
-     * @param string $var Optional path
-     *
-     * @return string|null
+     * @param string|null $var New folder
+     * @return string|null     The folder
      */
     public function folder($var = null);
 
     /**
      * Gets and sets the date for this Page object. This is typically passed in via the page headers
      *
-     * @param  string $var string representation of a date
-     *
-     * @return int         unix timestamp representation of the date
+     * @param  string|null $var New string representation of a date
+     * @return int              Unix timestamp representation of the date
      */
     public function date($var = null);
 
@@ -220,30 +208,34 @@ public function date($var = null);
      * Gets and sets the date format for this Page object. This is typically passed in via the page headers
      * using typical PHP date string structure - http://php.net/manual/en/function.date.php
      *
-     * @param  string $var string representation of a date format
-     *
-     * @return string      string representation of a date format
+     * @param  string|null $var New string representation of a date format
+     * @return string           String representation of a date format
      */
     public function dateformat($var = null);
 
     /**
      * Gets and sets the taxonomy array which defines which taxonomies this page identifies itself with.
      *
-     * @param  array $var an array of taxonomies
-     *
-     * @return array      an array of taxonomies
+     * @param  array|null $var  New array of taxonomies
+     * @return array            An array of taxonomies
      */
     public function taxonomy($var = null);
 
     /**
      * Gets the configured state of the processing method.
      *
-     * @param  string $process the process, eg "twig" or "markdown"
-     *
-     * @return bool            whether or not the processing method is enabled for this Page
+     * @param  string $process The process name, eg "twig" or "markdown"
+     * @return bool            Whether or not the processing method is enabled for this Page
      */
     public function shouldProcess($process);
 
+    /**
+     * Returns true if page is a module.
+     *
+     * @return bool
+     */
+    public function isModule(): bool;
+
     /**
      * Returns whether or not this Page object has a .md file associated with it or if its just a directory.
      *
@@ -264,4 +256,12 @@ public function isDir();
      * @return bool
      */
     public function exists();
+
+    /**
+     * Returns the blueprint from the page.
+     *
+     * @param string $name Name of the Blueprint form. Used by flex only.
+     * @return Blueprint Returns a Blueprint.
+     */
+    public function getBlueprint(string $name = '');
 }
diff --git a/system/src/Grav/Common/Page/Interfaces/PageFormInterface.php b/system/src/Grav/Common/Page/Interfaces/PageFormInterface.php
new file mode 100644
index 0000000000..3c88ebf6a9
--- /dev/null
+++ b/system/src/Grav/Common/Page/Interfaces/PageFormInterface.php
@@ -0,0 +1,33 @@
+<?php
+namespace Grav\Common\Page\Interfaces;
+
+/**
+ * Interface PageFormInterface
+ * @package Grav\Common\Page\Interfaces
+ */
+interface PageFormInterface
+{
+    /**
+     * Return all the forms which are associated to this page.
+     *
+     * Forms are returned as [name => blueprint, ...], where blueprint follows the regular form blueprint format.
+     *
+     * @return array
+     */
+    //public function getForms(): array;
+
+    /**
+     * Add forms to this page.
+     *
+     * @param array $new
+     * @return $this
+     */
+    public function addForms(array $new/*, $override = true*/);
+
+    /**
+     * Alias of $this->getForms();
+     *
+     * @return array
+     */
+    public function forms();//: array;
+}
diff --git a/system/src/Grav/Common/Page/Interfaces/PageInterface.php b/system/src/Grav/Common/Page/Interfaces/PageInterface.php
index 24bf50ce33..56fc891b98 100644
--- a/system/src/Grav/Common/Page/Interfaces/PageInterface.php
+++ b/system/src/Grav/Common/Page/Interfaces/PageInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,6 +14,12 @@
 /**
  * Class implements page interface.
  */
-interface PageInterface extends PageContentInterface, PageRoutableInterface, PageTranslateInterface, MediaInterface, PageLegacyInterface
+interface PageInterface extends
+    PageContentInterface,
+    PageFormInterface,
+    PageRoutableInterface,
+    PageTranslateInterface,
+    MediaInterface,
+    PageLegacyInterface
 {
 }
diff --git a/system/src/Grav/Common/Page/Interfaces/PageLegacyInterface.php b/system/src/Grav/Common/Page/Interfaces/PageLegacyInterface.php
index 470d80d711..0d38c7d3ae 100644
--- a/system/src/Grav/Common/Page/Interfaces/PageLegacyInterface.php
+++ b/system/src/Grav/Common/Page/Interfaces/PageLegacyInterface.php
@@ -4,25 +4,29 @@
 use Exception;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Page\Collection;
+use InvalidArgumentException;
 use RocketTheme\Toolbox\File\MarkdownFile;
+use SplFileInfo;
 
+/**
+ * Interface PageLegacyInterface
+ * @package Grav\Common\Page\Interfaces
+ */
 interface PageLegacyInterface
 {
     /**
      * Initializes the page instance variables based on a file
      *
-     * @param  \SplFileInfo $file The file information for the .md file that the page represents
-     * @param  string $extension
-     *
+     * @param  SplFileInfo $file The file information for the .md file that the page represents
+     * @param  string|null $extension
      * @return $this
      */
-    public function init(\SplFileInfo $file, $extension = null);
+    public function init(SplFileInfo $file, $extension = null);
 
     /**
      * Gets and Sets the raw data
      *
-     * @param  string $var Raw content string
-     *
+     * @param  string|null $var Raw content string
      * @return string      Raw content string
      */
     public function raw($var = null);
@@ -31,7 +35,6 @@ public function raw($var = null);
      * Gets and Sets the page frontmatter
      *
      * @param string|null $var
-     *
      * @return string
      */
     public function frontmatter($var = null);
@@ -49,14 +52,10 @@ public function modifyHeader($key, $value);
      */
     public function httpResponseCode();
 
-    public function httpHeaders();
-
     /**
-     * Sets the summary of the page
-     *
-     * @param string $summary Summary
+     * @return array
      */
-    public function setSummary($summary);
+    public function httpHeaders();
 
     /**
      * Get the contentMeta array and initialize content first if it's not already
@@ -69,7 +68,7 @@ public function contentMeta();
      * Add an entry to the page's contentMeta array
      *
      * @param string $name
-     * @param string $value
+     * @param mixed $value
      */
     public function addContentMeta($name, $value);
 
@@ -77,7 +76,6 @@ public function addContentMeta($name, $value);
      * Return the whole contentMeta array as it currently stands
      *
      * @param string|null $name
-     *
      * @return mixed
      */
     public function getContentMeta($name = null);
@@ -86,7 +84,6 @@ public function getContentMeta($name = null);
      * Sets the whole content meta array in one shot
      *
      * @param array $content_meta
-     *
      * @return array
      */
     public function setContentMeta($content_meta);
@@ -116,7 +113,6 @@ public function save($reorder = true);
      * You need to call $this->save() in order to perform the move.
      *
      * @param PageInterface $parent New parent page.
-     *
      * @return $this
      */
     public function move(PageInterface $parent);
@@ -128,7 +124,6 @@ public function move(PageInterface $parent);
      * You need to call $this->save() in order to perform the move.
      *
      * @param PageInterface $parent New parent page.
-     *
      * @return $this
      */
     public function copy(PageInterface $parent);
@@ -202,8 +197,7 @@ public function addForms(array $new);
     /**
      * Gets and sets the name field.  If no name field is set, it will return 'default.md'.
      *
-     * @param  string $var The name of this page.
-     *
+     * @param  string|null $var The name of this page.
      * @return string      The name of this page.
      */
     public function name($var = null);
@@ -219,8 +213,7 @@ public function childType();
      * Gets and sets the template field. This is used to find the correct Twig template file to render.
      * If no field is set, it will return the name without the .md extension
      *
-     * @param  string $var the template name
-     *
+     * @param  string|null $var the template name
      * @return string      the template name
      */
     public function template($var = null);
@@ -229,26 +222,23 @@ public function template($var = null);
      * Allows a page to override the output render format, usually the extension provided
      * in the URL. (e.g. `html`, `json`, `xml`, etc).
      *
-     * @param null $var
-     *
-     * @return null
+     * @param string|null $var
+     * @return string
      */
     public function templateFormat($var = null);
 
     /**
      * Gets and sets the extension field.
      *
-     * @param null $var
-     *
-     * @return null|string
+     * @param string|null $var
+     * @return string|null
      */
     public function extension($var = null);
 
     /**
      * Gets and sets the expires field. If not set will return the default
      *
-     * @param  int $var The new expires value.
-     *
+     * @param  int|null $var The new expires value.
      * @return int      The expires value
      */
     public function expires($var = null);
@@ -257,17 +247,21 @@ public function expires($var = null);
      * Gets and sets the cache-control property.  If not set it will return the default value (null)
      * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control for more details on valid options
      *
-     * @param null $var
-     * @return null
+     * @param string|null $var
+     * @return string|null
      */
     public function cacheControl($var = null);
 
+    /**
+     * @param bool|null $var
+     * @return bool
+     */
     public function ssl($var = null);
 
     /**
      * Returns the state of the debugger override etting for this page
      *
-     * @return mixed
+     * @return bool
      */
     public function debugger();
 
@@ -275,8 +269,7 @@ public function debugger();
      * Function to merge page metadata tags and build an array of Metadata objects
      * that can then be rendered in the page.
      *
-     * @param  array $var an Array of metadata values to set
-     *
+     * @param  array|null $var an Array of metadata values to set
      * @return array      an Array of metadata values for the page
      */
     public function metadata($var = null);
@@ -284,17 +277,15 @@ public function metadata($var = null);
     /**
      * Gets and sets the option to show the etag header for the page.
      *
-     * @param  bool $var show etag header
-     *
+     * @param  bool|null $var show etag header
      * @return bool      show etag header
      */
-    public function eTag($var = null);
+    public function eTag($var = null): bool;
 
     /**
      * Gets and sets the path to the .md file for this Page object.
      *
-     * @param  string $var the file path
-     *
+     * @param  string|null $var the file path
      * @return string|null      the file path
      */
     public function filePath($var = null);
@@ -309,8 +300,7 @@ public function filePathClean();
     /**
      * Gets and sets the order by which any sub-pages should be sorted.
      *
-     * @param  string $var the order, either "asc" or "desc"
-     *
+     * @param  string|null $var the order, either "asc" or "desc"
      * @return string      the order, either "asc" or "desc"
      * @deprecated 1.6
      */
@@ -324,8 +314,7 @@ public function orderDir($var = null);
      * date - is the order based on the date set in the pages
      * folder - is the order based on the name of the folder with any numerics omitted
      *
-     * @param  string $var supported options include "default", "title", "date", and "folder"
-     *
+     * @param  string|null $var supported options include "default", "title", "date", and "folder"
      * @return string      supported options include "default", "title", "date", and "folder"
      * @deprecated 1.6
      */
@@ -334,8 +323,7 @@ public function orderBy($var = null);
     /**
      * Gets the manual order set in the header.
      *
-     * @param  string $var supported options include "default", "title", "date", and "folder"
-     *
+     * @param  string|null $var supported options include "default", "title", "date", and "folder"
      * @return array
      * @deprecated 1.6
      */
@@ -345,8 +333,7 @@ public function orderManual($var = null);
      * Gets and sets the maxCount field which describes how many sub-pages should be displayed if the
      * sub_pages header property is set for this page object.
      *
-     * @param  int $var the maximum number of sub-pages
-     *
+     * @param  int|null $var the maximum number of sub-pages
      * @return int      the maximum number of sub-pages
      * @deprecated 1.6
      */
@@ -355,9 +342,9 @@ public function maxCount($var = null);
     /**
      * Gets and sets the modular var that helps identify this page is a modular child
      *
-     * @param  bool $var true if modular_twig
-     *
+     * @param  bool|null $var true if modular_twig
      * @return bool      true if modular_twig
+     * @deprecated 1.7 Use ->isModule() or ->modularTwig() method instead.
      */
     public function modular($var = null);
 
@@ -365,8 +352,7 @@ public function modular($var = null);
      * Gets and sets the modular_twig var that helps identify this page as a modular child page that will need
      * twig processing handled differently from a regular page.
      *
-     * @param  bool $var true if modular_twig
-     *
+     * @param  bool|null $var true if modular_twig
      * @return bool      true if modular_twig
      */
     public function modularTwig($var = null);
@@ -374,7 +360,7 @@ public function modularTwig($var = null);
     /**
      * Returns children of this page.
      *
-     * @return \Grav\Common\Page\Collection
+     * @return PageCollectionInterface|Collection
      */
     public function children();
 
@@ -410,16 +396,14 @@ public function nextSibling();
      * Returns the adjacent sibling based on a direction.
      *
      * @param  int $direction either -1 or +1
-     *
-     * @return PageInterface|bool             the sibling page
+     * @return PageInterface|false             the sibling page
      */
     public function adjacentSibling($direction = 1);
 
     /**
      * Helper method to return an ancestor page.
      *
-     * @param bool $lookup Name of the parent folder
-     *
+     * @param bool|null $lookup Name of the parent folder
      * @return PageInterface page you were looking for if it exists
      */
     public function ancestor($lookup = null);
@@ -429,7 +413,6 @@ public function ancestor($lookup = null);
      * page object is returned.
      *
      * @param string $field Name of the parent folder
-     *
      * @return PageInterface
      */
     public function inherited($field);
@@ -439,7 +422,6 @@ public function inherited($field);
      * first occurrence of an ancestor field will be returned if at all.
      *
      * @param string $field Name of the parent folder
-     *
      * @return array
      */
     public function inheritedField($field);
@@ -449,7 +431,6 @@ public function inheritedField($field);
      *
      * @param string $url the url of the page
      * @param bool $all
-     *
      * @return PageInterface page you were looking for if it exists
      */
     public function find($url, $all = false);
@@ -459,17 +440,15 @@ public function find($url, $all = false);
      *
      * @param string|array $params
      * @param bool $pagination
-     *
      * @return Collection
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function collection($params = 'content', $pagination = true);
 
     /**
      * @param string|array $value
      * @param bool $only_published
-     * @return mixed
-     * @internal
+     * @return PageCollectionInterface|Collection
      */
     public function evaluate($value, $only_published = true);
 
diff --git a/system/src/Grav/Common/Page/Interfaces/PageRoutableInterface.php b/system/src/Grav/Common/Page/Interfaces/PageRoutableInterface.php
index c3afeab168..29002660c1 100644
--- a/system/src/Grav/Common/Page/Interfaces/PageRoutableInterface.php
+++ b/system/src/Grav/Common/Page/Interfaces/PageRoutableInterface.php
@@ -1,6 +1,10 @@
 <?php
 namespace Grav\Common\Page\Interfaces;
 
+/**
+ * Interface PageRoutableInterface
+ * @package Grav\Common\Page\Interfaces
+ */
 interface PageRoutableInterface
 {
     /**
@@ -16,8 +20,7 @@ public function urlExtension();
      * via a URL.
      * The page must be *routable* and *published*
      *
-     * @param  bool $var true if the page is routable
-     *
+     * @param  bool|null $var true if the page is routable
      * @return bool      true if the page is routable
      */
     public function routable($var = null);
@@ -25,8 +28,7 @@ public function routable($var = null);
     /**
      * Gets the URL for a page - alias of url().
      *
-     * @param bool $include_host
-     *
+     * @param bool|null $include_host
      * @return string the permalink
      */
     public function link($include_host = false);
@@ -41,7 +43,6 @@ public function permalink();
      * Returns the canonical URL for a page
      *
      * @param bool $include_lang
-     *
      * @return string
      */
     public function canonical($include_lang = true);
@@ -53,7 +54,6 @@ public function canonical($include_lang = true);
      * @param bool $canonical true to return the canonical URL
      * @param bool $include_lang
      * @param bool $raw_route
-     *
      * @return string The url.
      */
     public function url($include_host = false, $canonical = false, $include_lang = true, $raw_route = false);
@@ -62,9 +62,8 @@ public function url($include_host = false, $canonical = false, $include_lang = t
      * Gets the route for the page based on the route headers if available, else from
      * the parents route and the current Page's slug.
      *
-     * @param  string $var Set new default route.
-     *
-     * @return string  The route for the Page.
+     * @param  string|null $var Set new default route.
+     * @return string|null  The route for the Page.
      */
     public function route($var = null);
 
@@ -77,7 +76,6 @@ public function unsetRouteSlug();
      * Gets and Sets the page raw route
      *
      * @param string|null $var
-     *
      * @return string
      */
     public function rawRoute($var = null);
@@ -85,8 +83,7 @@ public function rawRoute($var = null);
     /**
      * Gets the route aliases for the page based on page headers.
      *
-     * @param  array $var list of route aliases
-     *
+     * @param  array|null $var list of route aliases
      * @return array  The route aliases for the Page.
      */
     public function routeAliases($var = null);
@@ -96,7 +93,6 @@ public function routeAliases($var = null);
      * that value, else if it's `true` it will use the default route.
      *
      * @param string|null $var
-     *
      * @return bool|string
      */
     public function routeCanonical($var = null);
@@ -104,8 +100,7 @@ public function routeCanonical($var = null);
     /**
      * Gets the redirect set in the header.
      *
-     * @param  string $var redirect url
-     *
+     * @param  string|null $var redirect url
      * @return string
      */
     public function redirect($var = null);
@@ -119,8 +114,7 @@ public function relativePagePath();
      * Gets and sets the path to the folder where the .md for this Page object resides.
      * This is equivalent to the filePath but without the filename.
      *
-     * @param  string $var the path
-     *
+     * @param  string|null $var the path
      * @return string|null      the path
      */
     public function path($var = null);
@@ -128,8 +122,7 @@ public function path($var = null);
     /**
      * Get/set the folder.
      *
-     * @param string $var Optional path
-     *
+     * @param string|null $var Optional path
      * @return string|null
      */
     public function folder($var = null);
@@ -137,23 +130,22 @@ public function folder($var = null);
     /**
      * Gets and Sets the parent object for this page
      *
-     * @param  PageInterface $var the parent page object
-     *
+     * @param  PageInterface|null $var the parent page object
      * @return PageInterface|null the parent page object if it exists.
      */
     public function parent(PageInterface $var = null);
 
     /**
-     * Gets the top parent object for this page
+     * Gets the top parent object for this page. Can return page itself.
      *
-     * @return PageInterface|null the top parent page object if it exists.
+     * @return PageInterface The top parent page object.
      */
     public function topParent();
 
     /**
      * Returns the item in the current position.
      *
-     * @return int   the index of the current page.
+     * @return int|null The index of the current page.
      */
     public function currentPosition();
 
diff --git a/system/src/Grav/Common/Page/Interfaces/PageTranslateInterface.php b/system/src/Grav/Common/Page/Interfaces/PageTranslateInterface.php
index ea3bbf4647..5fba7512cd 100644
--- a/system/src/Grav/Common/Page/Interfaces/PageTranslateInterface.php
+++ b/system/src/Grav/Common/Page/Interfaces/PageTranslateInterface.php
@@ -1,13 +1,21 @@
 <?php
 namespace Grav\Common\Page\Interfaces;
 
+/**
+ * Interface PageTranslateInterface
+ * @package Grav\Common\Page\Interfaces
+ */
 interface PageTranslateInterface
 {
+    /**
+     * @return bool
+     */
+    public function translated(): bool;
+
     /**
      * Return an array with the routes of other translated languages
      *
      * @param bool $onlyPublished only return published translations
-     *
      * @return array the page translated languages
      */
     public function translatedLanguages($onlyPublished = false);
@@ -16,7 +24,6 @@ public function translatedLanguages($onlyPublished = false);
      * Return an array listing untranslated languages available
      *
      * @param bool $includeUnpublished also list unpublished translations
-     *
      * @return array the page untranslated languages
      */
     public function untranslatedLanguages($includeUnpublished = false);
@@ -24,8 +31,7 @@ public function untranslatedLanguages($includeUnpublished = false);
     /**
      * Get page language
      *
-     * @param string $var
-     *
+     * @param string|null $var
      * @return mixed
      */
     public function language($var = null);
diff --git a/system/src/Grav/Common/Page/Interfaces/PagesSourceInterface.php b/system/src/Grav/Common/Page/Interfaces/PagesSourceInterface.php
new file mode 100644
index 0000000000..ff4ebdae31
--- /dev/null
+++ b/system/src/Grav/Common/Page/Interfaces/PagesSourceInterface.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @package    Grav\Common\Page
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Page\Interfaces;
+
+/**
+ * Interface PagesSourceInterface
+ * @package Grav\Common\Page\Interfaces
+ */
+interface PagesSourceInterface // extends \Iterator
+{
+    /**
+     * Get timestamp for the page source.
+     *
+     * @return int
+     */
+    public function getTimestamp(): int;
+
+    /**
+     * Get checksum for the page source.
+     *
+     * @return string
+     */
+    public function getChecksum(): string;
+
+    /**
+     * Returns true if the source contains a page for the given route.
+     *
+     * @param string $route
+     * @return bool
+     */
+    public function has(string $route): bool;
+
+    /**
+     * Get the page for the given route.
+     *
+     * @param string $route
+     * @return PageInterface|null
+     */
+    public function get(string $route): ?PageInterface;
+
+    /**
+     * Get the children for the given route.
+     *
+     * @param string $route
+     * @param array|null $options
+     * @return array
+     */
+    public function getChildren(string $route, array $options = null): array;
+}
diff --git a/system/src/Grav/Common/Page/Markdown/Excerpts.php b/system/src/Grav/Common/Page/Markdown/Excerpts.php
index eaa13cbe8d..17f9cbff5a 100644
--- a/system/src/Grav/Common/Page/Markdown/Excerpts.php
+++ b/system/src/Grav/Common/Page/Markdown/Excerpts.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,19 +12,36 @@
 use Grav\Common\Grav;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Page\Medium\Link;
+use Grav\Common\Page\Pages;
 use Grav\Common\Uri;
 use Grav\Common\Page\Medium\Medium;
 use Grav\Common\Utils;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function array_key_exists;
+use function call_user_func_array;
+use function count;
+use function dirname;
+use function in_array;
+use function is_bool;
+use function is_string;
 
+/**
+ * Class Excerpts
+ * @package Grav\Common\Page\Markdown
+ */
 class Excerpts
 {
-    /** @var PageInterface */
+    /** @var PageInterface|null */
     protected $page;
     /** @var array */
     protected $config;
 
+    /**
+     * Excerpts constructor.
+     * @param PageInterface|null $page
+     * @param array|null $config
+     */
     public function __construct(PageInterface $page = null, array $config = null)
     {
         $this->page = $page ?? Grav::instance()['page'] ?? null;
@@ -42,16 +59,26 @@ public function __construct(PageInterface $page = null, array $config = null)
         $this->config = $config;
     }
 
-    public function getPage(): PageInterface
+    /**
+     * @return PageInterface|null
+     */
+    public function getPage(): ?PageInterface
     {
         return $this->page;
     }
 
+    /**
+     * @return array
+     */
     public function getConfig(): array
     {
         return $this->config;
     }
 
+    /**
+     * @param object $markdown
+     * @return void
+     */
     public function fireInitializedEvent($markdown): void
     {
         $grav = Grav::instance();
@@ -68,8 +95,8 @@ public function fireInitializedEvent($markdown): void
      */
     public function processLinkExcerpt(array $excerpt, string $type = 'link'): array
     {
+        $grav = Grav::instance();
         $url = htmlspecialchars_decode(rawurldecode($excerpt['element']['attributes']['href']));
-
         $url_parts = $this->parseUrl($url);
 
         // If there is a query, then parse it and build action calls.
@@ -87,14 +114,18 @@ static function ($carry, $item) {
             );
 
             // Valid attributes supported.
-            $valid_attributes = ['rel', 'target', 'id', 'class', 'classes'];
+            $valid_attributes = $grav['config']->get('system.pages.markdown.valid_link_attributes') ?? [];
 
+            $skip = [];
             // Unless told to not process, go through actions.
             if (array_key_exists('noprocess', $actions)) {
+                $skip = is_bool($actions['noprocess']) ? $actions : explode(',', $actions['noprocess']);
                 unset($actions['noprocess']);
-            } else {
-                // Loop through actions for the image and call them.
-                foreach ($actions as $attrib => $value) {
+            }
+
+            // Loop through actions for the image and call them.
+            foreach ($actions as $attrib => $value) {
+                if (!in_array($attrib, $skip)) {
                     $key = $attrib;
 
                     if (in_array($attrib, $valid_attributes, true)) {
@@ -108,12 +139,12 @@ static function ($carry, $item) {
                 }
             }
 
-            $url_parts['query'] = http_build_query($actions, null, '&', PHP_QUERY_RFC3986);
+            $url_parts['query'] = http_build_query($actions, '', '&', PHP_QUERY_RFC3986);
         }
 
         // If no query elements left, unset query.
         if (empty($url_parts['query'])) {
-            unset ($url_parts['query']);
+            unset($url_parts['query']);
         }
 
         // Set path to / if not set.
@@ -124,9 +155,11 @@ static function ($carry, $item) {
         // If scheme isn't http(s)..
         if (!empty($url_parts['scheme']) && !in_array($url_parts['scheme'], ['http', 'https'])) {
             // Handle custom streams.
-            if ($type !== 'image' && !empty($url_parts['stream']) && !empty($url_parts['path'])) {
-                $grav = Grav::instance();
-                $url_parts['path'] = $grav['base_url_relative'] . '/' . $this->resolveStream("{$url_parts['scheme']}://{$url_parts['path']}");
+            /** @var UniformResourceLocator $locator */
+            $locator = $grav['locator'];
+            if ($type === 'link' && $locator->isStream($url)) {
+                $path = $locator->findResource($url, false) ?: $locator->findResource($url, false, true);
+                $url_parts['path'] = $grav['base_url_relative'] . '/' . $path;
                 unset($url_parts['stream'], $url_parts['scheme']);
             }
 
@@ -162,9 +195,10 @@ public function processImageExcerpt(array $excerpt): array
             $filename = $url_parts['scheme'] . '://' . ($url_parts['path'] ?? '');
 
             $media = $this->page->getMedia();
-
         } else {
             $grav = Grav::instance();
+            /** @var Pages $pages */
+            $pages = $grav['pages'];
 
             // File is also local if scheme is http(s) and host matches.
             $local_file = isset($url_parts['path'])
@@ -172,7 +206,7 @@ public function processImageExcerpt(array $excerpt): array
                 && (empty($url_parts['host']) || $url_parts['host'] === $grav['uri']->host());
 
             if ($local_file) {
-                $filename = basename($url_parts['path']);
+                $filename = Utils::basename($url_parts['path']);
                 $folder = dirname($url_parts['path']);
 
                 // Get the local path to page media if possible.
@@ -181,11 +215,10 @@ public function processImageExcerpt(array $excerpt): array
                     $media = $this->page->getMedia();
                 } else {
                     // see if this is an external page to this one
-                    $base_url = rtrim($grav['base_url_relative'] . $grav['pages']->base(), '/');
+                    $base_url = rtrim($grav['base_url_relative'] . $pages->base(), '/');
                     $page_route = '/' . ltrim(str_replace($base_url, '', $folder), '/');
 
-                    /** @var PageInterface $ext_page */
-                    $ext_page = $grav['pages']->dispatch($page_route, true);
+                    $ext_page = $pages->find($page_route, true);
                     if ($ext_page) {
                         $media = $ext_page->getMedia();
                     } else {
@@ -211,7 +244,6 @@ public function processImageExcerpt(array $excerpt): array
             $id = $element_excerpt['id'] ?? '';
 
             $excerpt['element'] = $medium->parsedownElement($title, $alt, $class, $id, true);
-
         } else {
             // Not a current page media file, see if it needs converting to relative.
             $excerpt['element']['attributes']['src'] = Uri::buildUrl($url_parts);
@@ -232,6 +264,7 @@ public function processMediaActions($medium, $url)
         $url_parts = is_string($url) ? $this->parseUrl($url) : $url;
         $actions = [];
 
+
         // if there is a query, then parse it and build action calls
         if (isset($url_parts['query'])) {
             $actions = array_reduce(
@@ -247,18 +280,15 @@ static function ($carry, $item) {
             );
         }
 
-        $config = $this->getConfig();
-        if (!empty($config['images']['auto_fix_orientation'])) {
-            $actions[] = ['method' => 'fixOrientation', 'params' => ''];
-        }
-
-        $defaults = $config['images']['defaults'] ?? [];
+        $defaults = $this->config['images']['defaults'] ?? [];
         if (count($defaults)) {
             foreach ($defaults as $method => $params) {
-                $actions[] = [
-                    'method' => $method,
-                    'params' => $params,
-                ];
+                if (array_search($method, array_column($actions, 'method')) === false) {
+                    $actions[] = [
+                        'method' => $method,
+                        'params' => $params,
+                    ];
+                }
             }
         }
 
@@ -286,7 +316,7 @@ static function ($carry, $item) {
      * Variation of parse_url() which works also with local streams.
      *
      * @param string $url
-     * @return array|bool
+     * @return array
      */
     protected function parseUrl(string $url)
     {
@@ -310,20 +340,4 @@ protected function parseUrl(string $url)
 
         return $url_parts;
     }
-
-    /**
-     * @param string $url
-     * @return bool|string
-     */
-    protected function resolveStream(string $url)
-    {
-        /** @var UniformResourceLocator $locator */
-        $locator = Grav::instance()['locator'];
-
-        if ($locator->isStream($url)) {
-            return $locator->findResource($url, false) ?: $locator->findResource($url, false, true);
-        }
-
-        return $url;
-    }
 }
diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
index 88b2cede23..b80fd96861 100644
--- a/system/src/Grav/Common/Page/Media.php
+++ b/system/src/Grav/Common/Page/Media.php
@@ -3,29 +3,39 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page;
 
+use FilesystemIterator;
+use Grav\Common\Config\Config;
 use Grav\Common\Grav;
+use Grav\Common\Media\Interfaces\MediaObjectInterface;
 use Grav\Common\Yaml;
 use Grav\Common\Page\Medium\AbstractMedia;
 use Grav\Common\Page\Medium\GlobalMedia;
 use Grav\Common\Page\Medium\MediumFactory;
 use RocketTheme\Toolbox\File\File;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function in_array;
 
+/**
+ * Class Media
+ * @package Grav\Common\Page
+ */
 class Media extends AbstractMedia
 {
+    /** @var GlobalMedia */
     protected static $global;
 
+    /** @var array */
     protected $standard_exif = ['FileSize', 'MimeType', 'height', 'width'];
 
     /**
      * @param string $path
-     * @param array  $media_order
+     * @param array|null $media_order
      * @param bool   $load
      */
     public function __construct($path, array $media_order = null, $load = true)
@@ -44,27 +54,67 @@ public function __construct($path, array $media_order = null, $load = true)
      */
     public function __wakeup()
     {
-        if (!isset(static::$global)) {
+        if (null === static::$global) {
             // Add fallback to global media.
-            static::$global = new GlobalMedia();
+            static::$global = GlobalMedia::getInstance();
         }
     }
 
     /**
-     * @param mixed $offset
+     * Return raw route to the page.
      *
+     * @return string|null Route to the page or null if media isn't for a page.
+     */
+    public function getRawRoute(): ?string
+    {
+        $path = $this->getPath();
+        if ($path) {
+            /** @var Pages $pages */
+            $pages = $this->getGrav()['pages'];
+            $page = $pages->get($path);
+            if ($page) {
+                return $page->rawRoute();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Return page route.
+     *
+     * @return string|null Route to the page or null if media isn't for a page.
+     */
+    public function getRoute(): ?string
+    {
+        $path = $this->getPath();
+        if ($path) {
+            /** @var Pages $pages */
+            $pages = $this->getGrav()['pages'];
+            $page = $pages->get($path);
+            if ($page) {
+                return $page->route();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @param string $offset
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return parent::offsetExists($offset) ?: isset(static::$global[$offset]);
     }
 
     /**
-     * @param mixed $offset
-     *
-     * @return mixed
+     * @param string $offset
+     * @return MediaObjectInterface|null
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return parent::offsetGet($offset) ?: static::$global[$offset];
@@ -72,58 +122,71 @@ public function offsetGet($offset)
 
     /**
      * Initialize class.
+     *
+     * @return void
      */
     protected function init()
     {
-        /** @var UniformResourceLocator $locator */
-        $locator = Grav::instance()['locator'];
-        $config = Grav::instance()['config'];
-        $locator = Grav::instance()['locator'];
-        $exif_reader = isset(Grav::instance()['exif']) ? Grav::instance()['exif']->getReader() : false;
-        $media_types = array_keys(Grav::instance()['config']->get('media.types'));
+        $path = $this->getPath();
 
         // Handle special cases where page doesn't exist in filesystem.
-        if (!is_dir($this->getPath())) {
+        if (!$path || !is_dir($path)) {
             return;
         }
 
-        $iterator = new \FilesystemIterator($this->getPath(), \FilesystemIterator::UNIX_PATHS | \FilesystemIterator::SKIP_DOTS);
+        $grav = Grav::instance();
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $grav['locator'];
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
+        $exif_reader = isset($grav['exif']) ? $grav['exif']->getReader() : null;
+        $media_types = array_keys($config->get('media.types', []));
+
+        $iterator = new FilesystemIterator($path, FilesystemIterator::UNIX_PATHS | FilesystemIterator::SKIP_DOTS);
 
         $media = [];
 
-        /** @var \DirectoryIterator $info */
-        foreach ($iterator as $path => $info) {
+        foreach ($iterator as $file => $info) {
             // Ignore folders and Markdown files.
-            if (!$info->isFile() || $info->getExtension() === 'md' || strpos($info->getFilename(), '.') === 0) {
+            $filename = $info->getFilename();
+            if (!$info->isFile() || $info->getExtension() === 'md' || $filename === 'frontmatter.yaml' || $filename === 'media.json' || strpos($filename, '.') === 0) {
                 continue;
             }
 
             // Find out what type we're dealing with
-            list($basename, $ext, $type, $extra) = $this->getFileParts($info->getFilename());
+            [$basename, $ext, $type, $extra] = $this->getFileParts($filename);
 
-            if (!\in_array(strtolower($ext), $media_types, true)) {
+            if (!in_array(strtolower($ext), $media_types, true)) {
                 continue;
             }
 
             if ($type === 'alternative') {
-                $media["{$basename}.{$ext}"][$type][$extra] = ['file' => $path, 'size' => $info->getSize()];
+                $media["{$basename}.{$ext}"][$type][$extra] = ['file' => $file, 'size' => $info->getSize()];
             } else {
-                $media["{$basename}.{$ext}"][$type] = ['file' => $path, 'size' => $info->getSize()];
+                $media["{$basename}.{$ext}"][$type] = ['file' => $file, 'size' => $info->getSize()];
             }
         }
 
         foreach ($media as $name => $types) {
             // First prepare the alternatives in case there is no base medium
             if (!empty($types['alternative'])) {
+                /**
+                 * @var string|int $ratio
+                 * @var array $alt
+                 */
                 foreach ($types['alternative'] as $ratio => &$alt) {
-                    $alt['file'] = MediumFactory::fromFile($alt['file']);
+                    $alt['file'] = $this->createFromFile($alt['file']);
 
-                    if (!$alt['file']) {
+                    if (empty($alt['file'])) {
                         unset($types['alternative'][$ratio]);
                     } else {
                         $alt['file']->set('size', $alt['size']);
                     }
                 }
+                unset($alt);
             }
 
             $file_path = null;
@@ -139,9 +202,11 @@ protected function init()
                 $file_path = $medium->path();
                 $medium = MediumFactory::scaledFromMedium($medium, $max, 1)['file'];
             } else {
-                $medium = MediumFactory::fromFile($types['base']['file']);
-                $medium && $medium->set('size', $types['base']['size']);
-                $file_path = $medium->path();
+                $medium = $this->createFromFile($types['base']['file']);
+                if ($medium) {
+                    $medium->set('size', $types['base']['size']);
+                    $file_path = $medium->path();
+                }
             }
 
             if (empty($medium)) {
@@ -154,7 +219,6 @@ protected function init()
             if (file_exists($meta_path)) {
                 $types['meta']['file'] = $meta_path;
             } elseif ($file_path && $exif_reader && $medium->get('mime') === 'image/jpeg' && empty($types['meta']) && $config->get('system.media.auto_metadata_exif')) {
-
                 $meta = $exif_reader->read($file_path);
 
                 if ($meta) {
@@ -212,10 +276,10 @@ protected function init()
     }
 
     /**
-     * @return string
+     * @return string|null
      * @deprecated 1.6 Use $this->getPath() instead.
      */
-    public function path()
+    public function path(): ?string
     {
         return $this->getPath();
     }
diff --git a/system/src/Grav/Common/Page/Medium/AbstractMedia.php b/system/src/Grav/Common/Page/Medium/AbstractMedia.php
index f67cd650e8..9b3650b8dc 100644
--- a/system/src/Grav/Common/Page/Medium/AbstractMedia.php
+++ b/system/src/Grav/Common/Page/Medium/AbstractMedia.php
@@ -3,49 +3,72 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Medium;
 
+use Grav\Common\Config\Config;
+use Grav\Common\Data\Blueprint;
 use Grav\Common\Grav;
+use Grav\Common\Language\Language;
 use Grav\Common\Media\Interfaces\MediaCollectionInterface;
 use Grav\Common\Media\Interfaces\MediaObjectInterface;
-use Grav\Common\Page\Page;
+use Grav\Common\Media\Interfaces\MediaUploadInterface;
+use Grav\Common\Media\Traits\MediaUploadTrait;
+use Grav\Common\Page\Pages;
 use Grav\Common\Utils;
 use RocketTheme\Toolbox\ArrayTraits\ArrayAccess;
 use RocketTheme\Toolbox\ArrayTraits\Countable;
 use RocketTheme\Toolbox\ArrayTraits\Export;
 use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
 use RocketTheme\Toolbox\ArrayTraits\Iterator;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function is_array;
 
-abstract class AbstractMedia implements ExportInterface, MediaCollectionInterface
+/**
+ * Class AbstractMedia
+ * @package Grav\Common\Page\Medium
+ */
+abstract class AbstractMedia implements ExportInterface, MediaCollectionInterface, MediaUploadInterface
 {
     use ArrayAccess;
     use Countable;
     use Iterator;
     use Export;
+    use MediaUploadTrait;
 
+    /** @var array */
     protected $items = [];
+    /** @var string|null */
     protected $path;
+    /** @var array */
     protected $images = [];
+    /** @var array */
     protected $videos = [];
+    /** @var array */
     protected $audios = [];
+    /** @var array */
     protected $files = [];
+    /** @var array|null */
     protected $media_order;
 
     /**
      * Return media path.
      *
-     * @return string
+     * @return string|null
      */
-    public function getPath()
+    public function getPath(): ?string
     {
         return $this->path;
     }
 
-    public function setPath(?string $path)
+    /**
+     * @param string|null $path
+     * @return void
+     */
+    public function setPath(?string $path): void
     {
         $this->path = $path;
     }
@@ -54,7 +77,7 @@ public function setPath(?string $path)
      * Get medium by filename.
      *
      * @param string $filename
-     * @return Medium|null
+     * @return MediaObjectInterface|null
      */
     public function get($filename)
     {
@@ -67,6 +90,7 @@ public function get($filename)
      * @param string $filename
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function __invoke($filename)
     {
         return $this->offsetGet($filename);
@@ -80,7 +104,6 @@ public function __invoke($filename)
      */
     public function setTimestamps($timestamp = null)
     {
-        /** @var Medium $instance */
         foreach ($this->items as $instance) {
             $instance->setTimestamp($timestamp);
         }
@@ -150,14 +173,17 @@ public function files()
 
     /**
      * @param string $name
-     * @param MediaObjectInterface $file
+     * @param MediaObjectInterface|null $file
+     * @return void
      */
     public function add($name, $file)
     {
-        if (!$file) {
+        if (null === $file) {
             return;
         }
+
         $this->offsetSet($name, $file);
+
         switch ($file->type) {
             case 'image':
                 $this->images[$name] = $file;
@@ -173,6 +199,50 @@ public function add($name, $file)
         }
     }
 
+    /**
+     * @param string $name
+     * @return void
+     */
+    public function hide($name)
+    {
+        $this->offsetUnset($name);
+
+        unset($this->images[$name], $this->videos[$name], $this->audios[$name], $this->files[$name]);
+    }
+
+    /**
+     * Create Medium from a file.
+     *
+     * @param  string $file
+     * @param  array  $params
+     * @return Medium|null
+     */
+    public function createFromFile($file, array $params = [])
+    {
+        return MediumFactory::fromFile($file, $params);
+    }
+
+        /**
+     * Create Medium from array of parameters
+     *
+     * @param  array          $items
+     * @param  Blueprint|null $blueprint
+     * @return Medium|null
+     */
+    public function createFromArray(array $items = [], Blueprint $blueprint = null)
+    {
+        return MediumFactory::fromArray($items, $blueprint);
+    }
+
+    /**
+     * @param MediaObjectInterface $mediaObject
+     * @return ImageFile
+     */
+    public function getImageFileObject(MediaObjectInterface $mediaObject): ImageFile
+    {
+        return ImageFile::open($mediaObject->get('filepath'));
+    }
+
     /**
      * Order the media based on the page's media_order
      *
@@ -182,11 +252,14 @@ public function add($name, $file)
     protected function orderMedia($media)
     {
         if (null === $this->media_order) {
-            /** @var Page $page */
-            $page = Grav::instance()['pages']->get($this->getPath());
-
-            if ($page && isset($page->header()->media_order)) {
-                $this->media_order = array_map('trim', explode(',', $page->header()->media_order));
+            $path = $this->getPath();
+            if (null !== $path) {
+                /** @var Pages $pages */
+                $pages = Grav::instance()['pages'];
+                $page = $pages->get($path);
+                if ($page && isset($page->header()->media_order)) {
+                    $this->media_order = array_map('trim', explode(',', $page->header()->media_order));
+                }
             }
         }
 
@@ -199,6 +272,11 @@ protected function orderMedia($media)
         return $media;
     }
 
+    protected function fileExists(string $filename, string $destination): bool
+    {
+        return file_exists("{$destination}/{$filename}");
+    }
+
     /**
      * Get filename, extension and meta part.
      *
@@ -239,6 +317,28 @@ protected function getFileParts($filename)
             }
         }
 
-        return array($name, $extension, $type, $extra);
+        return [$name, $extension, $type, $extra];
+    }
+
+    protected function getGrav(): Grav
+    {
+        return Grav::instance();
+    }
+
+    protected function getConfig(): Config
+    {
+        return $this->getGrav()['config'];
+    }
+
+    protected function getLanguage(): Language
+    {
+        return $this->getGrav()['language'];
+    }
+
+    protected function clearCache(): void
+    {
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->getGrav()['locator'];
+        $locator->clearCache();
     }
 }
diff --git a/system/src/Grav/Common/Page/Medium/AudioMedium.php b/system/src/Grav/Common/Page/Medium/AudioMedium.php
index 74ef746ab4..cc53f8198f 100644
--- a/system/src/Grav/Common/Page/Medium/AudioMedium.php
+++ b/system/src/Grav/Common/Page/Medium/AudioMedium.php
@@ -3,134 +3,22 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Medium;
 
-class AudioMedium extends Medium
-{
-    use StaticResizeTrait;
-
-    /**
-     * Parsedown element for source display mode
-     *
-     * @param  array $attributes
-     * @param  bool $reset
-     * @return array
-     */
-    protected function sourceParsedownElement(array $attributes, $reset = true)
-    {
-        $location = $this->url($reset);
-
-        return [
-            'name' => 'audio',
-            'text' => '<source src="' . $location . '">Your browser does not support the audio tag.',
-            'attributes' => $attributes
-        ];
-    }
-
-    /**
-     * Allows to set or remove the HTML5 default controls
-     *
-     * @param bool $display
-     * @return $this
-     */
-    public function controls($display = true)
-    {
-        if($display) {
-            $this->attributes['controls'] = true;
-        } else {
-            unset($this->attributes['controls']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Allows to set the preload behaviour
-     *
-     * @param string $preload
-     * @return $this
-     */
-    public function preload($preload)
-    {
-        $validPreloadAttrs = ['auto', 'metadata', 'none'];
-        
-        if (\in_array($preload, $validPreloadAttrs, true)) {
-            $this->attributes['preload'] = $preload;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Allows to set the controlsList behaviour
-     * Separate multiple values with a hyphen
-     *
-     * @param string $controlsList
-     * @return $this
-     */
-    public function controlsList($controlsList)
-    {
-        $controlsList = str_replace('-', ' ', $controlsList);
-        $this->attributes['controlsList'] = $controlsList;
-
-        return $this;
-    }
-
-    /**
-     * Allows to set the muted attribute
-     *
-     * @param bool $status
-     * @return $this
-     */
-    public function muted($status = false)
-    {
-        if($status) {
-            $this->attributes['muted'] = true;
-        } else {
-            unset($this->attributes['muted']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Allows to set the loop attribute
-     *
-     * @param bool $status
-     * @return $this
-     */
-    public function loop($status = false)
-    {
-        if($status) {
-            $this->attributes['loop'] = true;
-        } else {
-            unset($this->attributes['loop']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Allows to set the autoplay attribute
-     *
-     * @param bool $status
-     * @return $this
-     */
-    public function autoplay($status = false)
-    {
-        if($status) {
-            $this->attributes['autoplay'] = true;
-        } else {
-            unset($this->attributes['autoplay']);
-        }
-
-        return $this;
-    }
+use Grav\Common\Media\Interfaces\AudioMediaInterface;
+use Grav\Common\Media\Traits\AudioMediaTrait;
 
+/**
+ * Class AudioMedium
+ * @package Grav\Common\Page\Medium
+ */
+class AudioMedium extends Medium implements AudioMediaInterface
+{
+    use AudioMediaTrait;
 
     /**
      * Reset medium.
@@ -141,7 +29,7 @@ public function reset()
     {
         parent::reset();
 
-        $this->attributes['controls'] = true;
+        $this->resetPlayer();
 
         return $this;
     }
diff --git a/system/src/Grav/Common/Page/Medium/GlobalMedia.php b/system/src/Grav/Common/Page/Medium/GlobalMedia.php
index 9fb30e9824..20f63ad56c 100644
--- a/system/src/Grav/Common/Page/Medium/GlobalMedia.php
+++ b/system/src/Grav/Common/Page/Medium/GlobalMedia.php
@@ -3,42 +3,61 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Medium;
 
 use Grav\Common\Grav;
+use Grav\Common\Media\Interfaces\MediaObjectInterface;
+use Grav\Common\Utils;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function dirname;
 
+/**
+ * Class GlobalMedia
+ * @package Grav\Common\Page\Medium
+ */
 class GlobalMedia extends AbstractMedia
 {
+    /** @var self */
+    protected static $instance;
+
+    public static function getInstance(): self
+    {
+        if (null === self::$instance) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
     /**
      * Return media path.
      *
-     * @return null
+     * @return string|null
      */
-    public function getPath()
+    public function getPath(): ?string
     {
         return null;
     }
 
     /**
-     * @param mixed $offset
-     *
+     * @param string $offset
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return parent::offsetExists($offset) ?: !empty($this->resolveStream($offset));
     }
 
     /**
-     * @param mixed $offset
-     *
-     * @return mixed
+     * @param string $offset
+     * @return MediaObjectInterface|null
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return parent::offsetGet($offset) ?: $this->addMedium($offset);
@@ -52,13 +71,16 @@ protected function resolveStream($filename)
     {
         /** @var UniformResourceLocator $locator */
         $locator = Grav::instance()['locator'];
+        if (!$locator->isStream($filename)) {
+            return null;
+        }
 
-        return $locator->isStream($filename) ? ($locator->findResource($filename) ?: null) : null;
+        return $locator->findResource($filename) ?: null;
     }
 
     /**
      * @param string $stream
-     * @return Medium|null
+     * @return MediaObjectInterface|null
      */
     protected function addMedium($stream)
     {
@@ -68,10 +90,10 @@ protected function addMedium($stream)
         }
 
         $path = dirname($filename);
-        list($basename, $ext,, $extra) = $this->getFileParts(basename($filename));
+        [$basename, $ext,, $extra] = $this->getFileParts(Utils::basename($filename));
         $medium = MediumFactory::fromFile($filename);
 
-        if (empty($medium)) {
+        if (null === $medium) {
             return null;
         }
 
diff --git a/system/src/Grav/Common/Page/Medium/ImageFile.php b/system/src/Grav/Common/Page/Medium/ImageFile.php
index d56c342201..1aae7eeb67 100644
--- a/system/src/Grav/Common/Page/Medium/ImageFile.php
+++ b/system/src/Grav/Common/Page/Medium/ImageFile.php
@@ -3,27 +3,50 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Medium;
 
+use Exception;
+use Grav\Common\Config\Config;
 use Grav\Common\Grav;
 use Gregwar\Image\Exceptions\GenerationError;
 use Gregwar\Image\Image;
 use Gregwar\Image\Source;
 use RocketTheme\Toolbox\Event\Event;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use function array_key_exists;
+use function count;
+use function extension_loaded;
+use function in_array;
 
+/**
+ * Class ImageFile
+ * @package Grav\Common\Page\Medium
+ *
+ * @method Image applyExifOrientation($exif_orienation)
+ */
 class ImageFile extends Image
 {
+    /**
+     * Destruct also image object.
+     */
+    #[\ReturnTypeWillChange]
     public function __destruct()
     {
-        $this->getAdapter()->deinit();
+        $adapter = $this->adapter;
+        if ($adapter) {
+            $adapter->deinit();
+        }
     }
 
     /**
      * Clear previously applied operations
+     *
+     * @return void
      */
     public function clearOperations()
     {
@@ -37,7 +60,6 @@ public function clearOperations()
      * @param int $quality the quality (for JPEG)
      * @param bool $actual
      * @param array $extras
-     *
      * @return string
      */
     public function cacheFile($type = 'jpg', $quality = 80, $actual = false, $extras = [])
@@ -53,8 +75,11 @@ public function cacheFile($type = 'jpg', $quality = 80, $actual = false, $extras
         // Computes the hash
         $this->hash = $this->getHash($type, $quality, $extras);
 
+        /** @var Config $config */
+        $config = Grav::instance()['config'];
+
         // Seo friendly image names
-        $seofriendly = Grav::instance()['config']->get('system.images.seofriendly', false);
+        $seofriendly = $config->get('system.images.seofriendly', false);
 
         if ($seofriendly) {
             $mini_hash = substr($this->hash, 0, 4) . substr($this->hash, -4);
@@ -87,7 +112,7 @@ public function cacheFile($type = 'jpg', $quality = 80, $actual = false, $extras
 
         // Asking the cache for the cacheFile
         try {
-            $perms = Grav::instance()['config']->get('system.images.cache_perms', '0755');
+            $perms = $config->get('system.images.cache_perms', '0755');
             $perms = octdec($perms);
             $file = $this->getCacheSystem()->setDirectoryMode($perms)->getOrCreateFile($cacheFile, $conditions, $generate, $actual);
         } catch (GenerationError $e) {
@@ -95,8 +120,9 @@ public function cacheFile($type = 'jpg', $quality = 80, $actual = false, $extras
         }
 
         // Nulling the resource
-        $this->getAdapter()->setSource(new Source\File($file));
-        $this->getAdapter()->deinit();
+        $adapter = $this->getAdapter();
+        $adapter->setSource(new Source\File($file));
+        $adapter->deinit();
 
         if ($actual) {
             return $file;
@@ -107,10 +133,11 @@ public function cacheFile($type = 'jpg', $quality = 80, $actual = false, $extras
 
     /**
      * Gets the hash.
+     *
      * @param string $type
      * @param int $quality
-     * @param [] $extras
-     * @return null
+     * @param array $extras
+     * @return string
      */
     public function getHash($type = 'guess', $quality = 80, $extras = [])
     {
@@ -123,6 +150,7 @@ public function getHash($type = 'guess', $quality = 80, $extras = [])
 
     /**
      * Generates the hash.
+     *
      * @param string $type
      * @param int $quality
      * @param array $extras
@@ -131,15 +159,54 @@ public function generateHash($type = 'guess', $quality = 80, $extras = [])
     {
         $inputInfos = $this->source->getInfos();
 
-        $datas = array(
+        $data = [
             $inputInfos,
             $this->serializeOperations(),
             $type,
             $quality,
             $extras
-        );
+        ];
 
-        $this->hash = sha1(serialize($datas));
+        $this->hash = sha1(serialize($data));
     }
 
+    /**
+     * Read exif rotation from file and apply it.
+     */
+    public function fixOrientation()
+    {
+        if (!extension_loaded('exif')) {
+            throw new RuntimeException('You need to EXIF PHP Extension to use this function');
+        }
+
+        if (!in_array(exif_imagetype($this->source->getInfos()), [IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM], true)) {
+            return $this;
+        }
+
+        // resolve any streams
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+        $filepath = $this->source->getInfos();
+        if ($locator->isStream($filepath)) {
+            $filepath = $locator->findResource($this->source->getInfos(), true, true);
+        }
+
+        // Make sure file exists
+        if (!file_exists($filepath)) {
+            return $this;
+        }
+
+        try {
+            $exif = @exif_read_data($filepath);
+        } catch (Exception $e) {
+            Grav::instance()['log']->error($filepath . ' - ' . $e->getMessage());
+            return $this;
+        }
+
+        if ($exif === false || !array_key_exists('Orientation', $exif)) {
+            return $this;
+        }
+
+        return $this->applyExifOrientation($exif['Orientation']);
+    }
 }
diff --git a/system/src/Grav/Common/Page/Medium/ImageMedium.php b/system/src/Grav/Common/Page/Medium/ImageMedium.php
index 1925bef812..ab6ba4a90c 100644
--- a/system/src/Grav/Common/Page/Medium/ImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php
@@ -3,102 +3,70 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Medium;
 
+use BadFunctionCallException;
 use Grav\Common\Data\Blueprint;
-use Grav\Common\Grav;
+use Grav\Common\Media\Interfaces\ImageManipulateInterface;
+use Grav\Common\Media\Interfaces\ImageMediaInterface;
+use Grav\Common\Media\Interfaces\MediaLinkInterface;
+use Grav\Common\Media\Traits\ImageLoadingTrait;
+use Grav\Common\Media\Traits\ImageMediaTrait;
 use Grav\Common\Utils;
+use Gregwar\Image\Image;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function func_get_args;
+use function in_array;
 
-class ImageMedium extends Medium
+/**
+ * Class ImageMedium
+ * @package Grav\Common\Page\Medium
+ */
+class ImageMedium extends Medium implements ImageMediaInterface, ImageManipulateInterface
 {
-    /**
-     * @var array
-     */
-    protected $thumbnailTypes = ['page', 'media', 'default'];
-
-    /**
-     * @var ImageFile
-     */
-    protected $image;
-
-    /**
-     * @var string
-     */
-    protected $format = 'guess';
-
-    /**
-     * @var int
-     */
-    protected $quality;
-
-    /**
-     * @var int
-     */
-    protected $default_quality;
+    use ImageMediaTrait;
+    use ImageLoadingTrait;
 
     /**
-     * @var bool
+     * @var mixed|string
      */
-    protected $debug_watermarked = false;
-
-    /**
-     * @var array
-     */
-    public static $magic_actions = [
-        'resize', 'forceResize', 'cropResize', 'crop', 'zoomCrop',
-        'negate', 'brightness', 'contrast', 'grayscale', 'emboss',
-        'smooth', 'sharp', 'edge', 'colorize', 'sepia', 'enableProgressive',
-        'rotate', 'flip', 'fixOrientation', 'gaussianBlur'
-    ];
-
-    /**
-     * @var array
-     */
-    public static $magic_resize_actions = [
-        'resize' => [0, 1],
-        'forceResize' => [0, 1],
-        'cropResize' => [0, 1],
-        'crop' => [0, 1, 2, 3],
-        'zoomCrop' => [0, 1]
-    ];
-
-    /**
-     * @var string
-     */
-    protected $sizes = '100vw';
+    private $saved_image_path;
 
     /**
      * Construct.
      *
      * @param array $items
-     * @param Blueprint $blueprint
+     * @param Blueprint|null $blueprint
      */
     public function __construct($items = [], Blueprint $blueprint = null)
     {
         parent::__construct($items, $blueprint);
 
-        $config = Grav::instance()['config'];
+        $config = $this->getGrav()['config'];
+
+        $this->thumbnailTypes = ['page', 'media', 'default'];
+        $this->default_quality = $config->get('system.images.default_image_quality', 85);
+        $this->def('debug', $config->get('system.images.debug'));
 
         $path = $this->get('filepath');
         if (!$path || !file_exists($path) || !filesize($path)) {
             return;
         }
 
-        $image_info = getimagesize($path);
+        $this->set('thumbnails.media', $path);
 
-        $this->def('width', $image_info[0]);
-        $this->def('height', $image_info[1]);
-        $this->def('mime', $image_info['mime']);
-        $this->def('debug', $config->get('system.images.debug'));
-
-        $this->set('thumbnails.media', $this->get('filepath'));
-
-        $this->default_quality = $config->get('system.images.default_image_quality', 85);
+        if (!($this->offsetExists('width') && $this->offsetExists('height') && $this->offsetExists('mime'))) {
+            $image_info = getimagesize($path);
+            if ($image_info) {
+                $this->def('width', $image_info[0]);
+                $this->def('height', $image_info[1]);
+                $this->def('mime', $image_info['mime']);
+            }
+        }
 
         $this->reset();
 
@@ -107,18 +75,69 @@ public function __construct($items = [], Blueprint $blueprint = null)
         }
     }
 
+    /**
+     * @return array
+     */
+    public function getMeta(): array
+    {
+        return [
+            'width' => $this->width,
+            'height' => $this->height,
+        ] + parent::getMeta();
+    }
+
+    /**
+     * Also unset the image on destruct.
+     */
+    #[\ReturnTypeWillChange]
     public function __destruct()
     {
         unset($this->image);
     }
 
+    /**
+     * Also clone image.
+     */
+    #[\ReturnTypeWillChange]
     public function __clone()
     {
-        $this->image = $this->image ? clone $this->image : null;
+        if ($this->image) {
+            $this->image = clone $this->image;
+        }
 
         parent::__clone();
     }
 
+    /**
+     * Reset image.
+     *
+     * @return $this
+     */
+    public function reset()
+    {
+        parent::reset();
+
+        if ($this->image) {
+            $this->image();
+            $this->medium_querystring = [];
+            $this->filter();
+            $this->clearAlternatives();
+        }
+
+        $this->format = 'guess';
+        $this->quality = $this->default_quality;
+
+        $this->debug_watermarked = false;
+
+        $config = $this->getGrav()['config'];
+        // Set CLS configuration
+        $this->auto_sizes = $config->get('system.images.cls.auto_sizes', false);
+        $this->aspect_ratio = $config->get('system.images.cls.aspect_ratio', false);
+        $this->retina_scale = $config->get('system.images.cls.retina_scale', 1);
+
+        return $this;
+    }
+
     /**
      * Add meta file for the medium.
      *
@@ -135,14 +154,6 @@ public function addMetaFile($filepath)
         return $this;
     }
 
-    /**
-     * Clear out the alternatives
-     */
-    public function clearAlternatives()
-    {
-        $this->alternatives = [];
-    }
-
     /**
      * Return PATH to image.
      *
@@ -168,15 +179,17 @@ public function path($reset = true)
      */
     public function url($reset = true)
     {
+        $grav = $this->getGrav();
+
         /** @var UniformResourceLocator $locator */
-        $locator = Grav::instance()['locator'];
-        $image_path = $locator->findResource('cache://images', true) ?: $locator->findResource('cache://images', true, true);
-        $saved_image_path = $this->saveImage();
+        $locator = $grav['locator'];
+        $image_path = (string)($locator->findResource('cache://images', true) ?: $locator->findResource('cache://images', true, true));
+        $saved_image_path = $this->saved_image_path = $this->saveImage();
 
-        $output = preg_replace('|^' . preg_quote(GRAV_ROOT, '|') . '|', '', $saved_image_path);
+        $output = preg_replace('|^' . preg_quote(GRAV_ROOT, '|') . '|', '', $saved_image_path) ?: $saved_image_path;
 
         if ($locator->isStream($output)) {
-            $output = $locator->findResource($output, false);
+            $output = (string)($locator->findResource($output, false) ?: $locator->findResource($output, false, true));
         }
 
         if (Utils::startsWith($output, $image_path)) {
@@ -188,24 +201,9 @@ public function url($reset = true)
             $this->reset();
         }
 
-        return trim(Grav::instance()['base_url'] . '/' . $this->urlQuerystring($output), '\\');
-    }
-
-    /**
-     * Simply processes with no extra methods.  Useful for triggering events.
-     *
-     * @return $this
-     */
-    public function cache()
-    {
-        if (!$this->image) {
-            $this->image();
-        }
-
-        return $this;
+        return trim($grav['base_url'] . '/' . $this->urlQuerystring($output), '\\');
     }
 
-
     /**
      * Return srcset string for this Medium and its alternatives.
      *
@@ -231,106 +229,6 @@ public function srcset($reset = true)
         return implode(', ', $srcset);
     }
 
-    /**
-     * Allows the ability to override the image's pretty name stored in cache
-     *
-     * @param string $name
-     */
-    public function setImagePrettyName($name)
-    {
-        $this->set('prettyname', $name);
-        if ($this->image) {
-            $this->image->setPrettyName($name);
-        }
-    }
-
-    public function getImagePrettyName()
-    {
-        if ($this->get('prettyname')) {
-            return $this->get('prettyname');
-        }
-
-        $basename = $this->get('basename');
-        if (preg_match('/[a-z0-9]{40}-(.*)/', $basename, $matches)) {
-            $basename = $matches[1];
-        }
-        return $basename;
-    }
-
-    /**
-     * Generate alternative image widths, using either an array of integers, or
-     * a min width, a max width, and a step parameter to fill out the necessary
-     * widths. Existing image alternatives won't be overwritten.
-     *
-     * @param  int|int[] $min_width
-     * @param  int       $max_width
-     * @param  int       $step
-     * @return $this
-     */
-    public function derivatives($min_width, $max_width = 2500, $step = 200)
-    {
-        if (!empty($this->alternatives)) {
-            $max = max(array_keys($this->alternatives));
-            $base = $this->alternatives[$max];
-        } else {
-            $base = $this;
-        }
-
-        $widths = [];
-
-        if (func_num_args() === 1) {
-            foreach ((array) func_get_arg(0) as $width) {
-                if ($width < $base->get('width')) {
-                    $widths[] = $width;
-                }
-            }
-        } else {
-            $max_width = min($max_width, $base->get('width'));
-
-            for ($width = $min_width; $width < $max_width; $width = $width + $step) {
-                $widths[] = $width;
-            }
-        }
-
-        foreach ($widths as $width) {
-            // Only generate image alternatives that don't already exist
-            if (array_key_exists((int) $width, $this->alternatives)) {
-                continue;
-            }
-
-            $derivative = MediumFactory::fromFile($base->get('filepath'));
-
-            // It's possible that MediumFactory::fromFile returns null if the
-            // original image file no longer exists and this class instance was
-            // retrieved from the page cache
-            if (null !== $derivative) {
-                $index = 2;
-                $alt_widths = array_keys($this->alternatives);
-                sort($alt_widths);
-
-                foreach ($alt_widths as $i => $key) {
-                    if ($width > $key) {
-                        $index += max($i, 1);
-                    }
-                }
-
-                $basename = preg_replace('/(@\d+x){0,1}$/', "@{$width}w", $base->get('basename'), 1);
-                $derivative->setImagePrettyName($basename);
-
-                $ratio = $base->get('width') / $width;
-                $height = $derivative->get('height') / $ratio;
-
-                $derivative->resize($width, $height);
-                $derivative->set('width', $width);
-                $derivative->set('height', $height);
-
-                $this->addAlternative($ratio, $derivative);
-            }
-        }
-
-        return $this;
-    }
-
     /**
      * Parsedown element for source display mode
      *
@@ -348,31 +246,24 @@ public function sourceParsedownElement(array $attributes, $reset = true)
             $attributes['sizes'] = $this->sizes();
         }
 
-        return ['name' => 'img', 'attributes' => $attributes];
-    }
+        if ($this->saved_image_path && $this->auto_sizes) {
+            if (!array_key_exists('height', $this->attributes) && !array_key_exists('width', $this->attributes)) {
+                $info = getimagesize($this->saved_image_path);
+                $width = (int)$info[0];
+                $height = (int)$info[1];
 
-    /**
-     * Reset image.
-     *
-     * @return $this
-     */
-    public function reset()
-    {
-        parent::reset();
+                $scaling_factor = $this->retina_scale > 0 ? $this->retina_scale : 1;
+                $attributes['width'] = (int)($width / $scaling_factor);
+                $attributes['height'] = (int)($height / $scaling_factor);
 
-        if ($this->image) {
-            $this->image();
-            $this->medium_querystring = [];
-            $this->filter();
-            $this->clearAlternatives();
+                if ($this->aspect_ratio) {
+                    $style = ($attributes['style'] ?? ' ') . "--aspect-ratio: $width/$height;";
+                    $attributes['style'] = trim($style);
+                }
+            }
         }
 
-        $this->format = 'guess';
-        $this->quality = $this->default_quality;
-
-        $this->debug_watermarked = false;
-
-        return $this;
+        return ['name' => 'img', 'attributes' => $attributes];
     }
 
     /**
@@ -380,7 +271,7 @@ public function reset()
      *
      * @param  bool $reset
      * @param  array  $attributes
-     * @return Link
+     * @return MediaLinkInterface
      */
     public function link($reset = true, array $attributes = [])
     {
@@ -399,7 +290,7 @@ public function link($reset = true, array $attributes = [])
      * @param  int  $width
      * @param  int  $height
      * @param  bool $reset
-     * @return Link
+     * @return MediaLinkInterface
      */
     public function lightbox($width = null, $height = null, $reset = true)
     {
@@ -415,105 +306,146 @@ public function lightbox($width = null, $height = null, $reset = true)
     }
 
     /**
-     * Sets or gets the quality of the image
-     *
-     * @param  int $quality 0-100 quality
-     * @return int|$this
+     * @param string $enabled
+     * @return $this
      */
-    public function quality($quality = null)
+    public function autoSizes($enabled = 'true')
     {
-        if ($quality) {
-            if (!$this->image) {
-                $this->image();
-            }
+        $this->auto_sizes = $enabled === 'true' ?: false;
 
-            $this->quality = $quality;
+        return $this;
+    }
 
-            return $this;
-        }
+    /**
+     * @param string $enabled
+     * @return $this
+     */
+    public function aspectRatio($enabled = 'true')
+    {
+        $this->aspect_ratio = $enabled === 'true' ?: false;
 
-        return $this->quality;
+        return $this;
     }
 
     /**
-     * Sets image output format.
-     *
-     * @param string $format
+     * @param int $scale
      * @return $this
      */
-    public function format($format)
+    public function retinaScale($scale = 1)
     {
-        if (!$this->image) {
-            $this->image();
-        }
-
-        $this->format = $format;
+        $this->retina_scale = (int)$scale;
 
         return $this;
     }
 
     /**
-     * Set or get sizes parameter for srcset media action
-     *
-     * @param  string $sizes
-     * @return string
+     * @param string|null $image
+     * @param string|null $position
+     * @param int|float|null $scale
+     * @return $this
      */
-    public function sizes($sizes = null)
+    public function watermark($image = null, $position = null, $scale = null)
     {
+        $grav = $this->getGrav();
+
+        $locator = $grav['locator'];
+        $config = $grav['config'];
+
+        $args = func_get_args();
+
+        $file = $args[0] ?? '1'; // using '1' because of markdown. doing ![](image.jpg?watermark) returns $args[0]='1';
+        $file = $file === '1' ? $config->get('system.images.watermark.image') : $args[0];
+
+        $watermark = $locator->findResource($file);
+        $watermark = ImageFile::open($watermark);
+
+        // Scaling operations
+        $scale     = ($scale ?? $config->get('system.images.watermark.scale', 100)) / 100;
+        $wwidth    = (int)$this->get('width')  * $scale;
+        $wheight   = (int)$this->get('height') * $scale;
+        $watermark->resize($wwidth, $wheight);
+
+        // Position operations
+        $position = !empty($args[1]) ? explode('-',  $args[1]) : ['center', 'center']; // todo change to config
+        $positionY = $position[0] ?? $config->get('system.images.watermark.position_y', 'center');
+        $positionX = $position[1] ?? $config->get('system.images.watermark.position_x', 'center');
+
+        switch ($positionY)
+        {
+            case 'top':
+                $positionY = 0;
+                break;
 
-        if ($sizes) {
-            $this->sizes = $sizes;
+            case 'bottom':
+                $positionY = (int)$this->get('height')-$wheight;
+                break;
 
-            return $this;
+            case 'center':
+                $positionY = ((int)$this->get('height')/2) - ($wheight/2);
+                break;
         }
 
-        return empty($this->sizes) ? '100vw' : $this->sizes;
+        switch ($positionX)
+        {
+            case 'left':
+                $positionX = 0;
+                break;
+
+            case 'right':
+                $positionX = (int)$this->get('width')-$wwidth;
+                break;
+
+            case 'center':
+                $positionX = ((int)$this->get('width')/2) - ($wwidth/2);
+                break;
+        }
+
+        $this->__call('merge', [$watermark,$positionX, $positionY]);
+
+        return $this;
     }
 
     /**
-     * Allows to set the width attribute from Markdown or Twig
-     * Examples: ![Example](myimg.png?width=200&height=400)
-     *           ![Example](myimg.png?resize=100,200&width=100&height=200)
-     *           ![Example](myimg.png?width=auto&height=auto)
-     *           ![Example](myimg.png?width&height)
-     *           {{ page.media['myimg.png'].width().height().html }}
-     *           {{ page.media['myimg.png'].resize(100,200).width(100).height(200).html }}
+     * Handle this commonly used variant
      *
-     * @param mixed $value A value or 'auto' or empty to use the width of the image
      * @return $this
      */
-    public function width($value = 'auto')
+    public function cropZoom()
     {
-        if (!$value || $value === 'auto') {
-            $this->attributes['width'] = $this->get('width');
-        } else {
-            $this->attributes['width'] = $value;
-        }
+        $this->__call('zoomCrop', func_get_args());
 
         return $this;
     }
 
     /**
-     * Allows to set the height attribute from Markdown or Twig
-     * Examples: ![Example](myimg.png?width=200&height=400)
-     *           ![Example](myimg.png?resize=100,200&width=100&height=200)
-     *           ![Example](myimg.png?width=auto&height=auto)
-     *           ![Example](myimg.png?width&height)
-     *           {{ page.media['myimg.png'].width().height().html }}
-     *           {{ page.media['myimg.png'].resize(100,200).width(100).height(200).html }}
+     * Add a frame to image
      *
-     * @param mixed $value A value or 'auto' or empty to use the height of the image
      * @return $this
      */
-    public function height($value = 'auto')
+    public function addFrame(int $border = 10, string $color = '0x000000')
     {
-        if (!$value || $value === 'auto') {
-            $this->attributes['height'] = $this->get('height');
-        } else {
-            $this->attributes['height'] = $value;
-        }
-
+      if($border > 0 && preg_match('/^0x[a-f0-9]{6}$/i', $color)) { // $border must be an integer and bigger than 0; $color must be formatted as an HEX value (0x??????).
+        $image = ImageFile::open($this->path());
+      }
+      else {
         return $this;
+      }
+
+      $dst_width = $image->width()+2*$border;
+      $dst_height = $image->height()+2*$border;
+
+      $frame = ImageFile::create($dst_width, $dst_height);
+
+      $frame->__call('fill', [$color]);
+
+      $this->image = $frame;
+
+      $this->__call('merge', [$image, $border, $border]);
+
+      $this->saveImage();
+
+      return $this;
+
     }
 
     /**
@@ -523,13 +455,10 @@ public function height($value = 'auto')
      * @param mixed $args
      * @return $this|mixed
      */
+    #[\ReturnTypeWillChange]
     public function __call($method, $args)
     {
-        if ($method === 'cropZoom') {
-            $method = 'zoomCrop';
-        }
-
-        if (!\in_array($method, self::$magic_actions, true)) {
+        if (!in_array($method, static::$magic_actions, true)) {
             return parent::__call($method, $args);
         }
 
@@ -539,125 +468,28 @@ public function __call($method, $args)
         }
 
         try {
-            call_user_func_array([$this->image, $method], $args);
+            $this->image->{$method}(...$args);
 
+            /** @var ImageMediaInterface $medium */
             foreach ($this->alternatives as $medium) {
-                if (!$medium->image) {
-                    $medium->image();
-                }
-
                 $args_copy = $args;
 
                 // regular image: resize 400x400 -> 200x200
                 // --> @2x: resize 800x800->400x400
-                if (isset(self::$magic_resize_actions[$method])) {
-                    foreach (self::$magic_resize_actions[$method] as $param) {
+                if (isset(static::$magic_resize_actions[$method])) {
+                    foreach (static::$magic_resize_actions[$method] as $param) {
                         if (isset($args_copy[$param])) {
                             $args_copy[$param] *= $medium->get('ratio');
                         }
                     }
                 }
 
-                call_user_func_array([$medium, $method], $args_copy);
-            }
-        } catch (\BadFunctionCallException $e) {
-        }
-
-        return $this;
-    }
-
-    /**
-     * Gets medium image, resets image manipulation operations.
-     *
-     * @return $this
-     */
-    protected function image()
-    {
-        $locator = Grav::instance()['locator'];
-
-        $file = $this->get('filepath');
-
-        // Use existing cache folder or if it doesn't exist, create it.
-        $cacheDir = $locator->findResource('cache://images', true) ?: $locator->findResource('cache://images', true, true);
-
-        // Make sure we free previous image.
-        unset($this->image);
-
-        $this->image = ImageFile::open($file)
-            ->setCacheDir($cacheDir)
-            ->setActualCacheDir($cacheDir)
-            ->setPrettyName($this->getImagePrettyName());
-
-        return $this;
-    }
-
-    /**
-     * Save the image with cache.
-     *
-     * @return string
-     */
-    protected function saveImage()
-    {
-        if (!$this->image) {
-            return parent::path(false);
-        }
-
-        $this->filter();
-
-        if (isset($this->result)) {
-            return $this->result;
-        }
-
-        if (!$this->debug_watermarked && $this->get('debug')) {
-            $ratio = $this->get('ratio');
-            if (!$ratio) {
-                $ratio = 1;
-            }
-
-            $locator = Grav::instance()['locator'];
-            $overlay = $locator->findResource("system://assets/responsive-overlays/{$ratio}x.png") ?: $locator->findResource('system://assets/responsive-overlays/unknown.png');
-            $this->image->merge(ImageFile::open($overlay));
-        }
-
-        return $this->image->cacheFile($this->format, $this->quality, false, [$this->get('width'), $this->get('height'), $this->get('modified')]);
-    }
-
-    /**
-     * Filter image by using user defined filter parameters.
-     *
-     * @param string $filter Filter to be used.
-     */
-    public function filter($filter = 'image.filters.default')
-    {
-        $filters = (array) $this->get($filter, []);
-        foreach ($filters as $params) {
-            $params = (array) $params;
-            $method = array_shift($params);
-            $this->__call($method, $params);
-        }
-    }
-
-    /**
-     * Return the image higher quality version
-     *
-     * @return ImageMedium the alternative version with higher quality
-     */
-    public function higherQualityAlternative()
-    {
-        if ($this->alternatives) {
-            $max = reset($this->alternatives);
-            foreach($this->alternatives as $alternative)
-            {
-                if($alternative->quality() > $max->quality())
-                {
-                    $max = $alternative;
-                }
+                // Do the same call for alternative media.
+                $medium->__call($method, $args_copy);
             }
-
-            return $max;
+        } catch (BadFunctionCallException $e) {
         }
 
         return $this;
     }
-
 }
diff --git a/system/src/Grav/Common/Page/Medium/Link.php b/system/src/Grav/Common/Page/Medium/Link.php
index 6978635196..c76d8c191d 100644
--- a/system/src/Grav/Common/Page/Medium/Link.php
+++ b/system/src/Grav/Common/Page/Medium/Link.php
@@ -3,41 +3,60 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Medium;
 
-class Link implements RenderableInterface
+use BadMethodCallException;
+use Grav\Common\Media\Interfaces\MediaLinkInterface;
+use Grav\Common\Media\Interfaces\MediaObjectInterface;
+use RuntimeException;
+use function call_user_func_array;
+use function get_class;
+use function is_array;
+use function is_callable;
+
+/**
+ * Class Link
+ * @package Grav\Common\Page\Medium
+ */
+class Link implements RenderableInterface, MediaLinkInterface
 {
     use ParsedownHtmlTrait;
 
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $attributes = [];
+    /** @var MediaObjectInterface|MediaLinkInterface */
     protected $source;
 
     /**
      * Construct.
      * @param array  $attributes
-     * @param Medium $medium
+     * @param MediaObjectInterface $medium
      */
-    public function __construct(array $attributes, Medium $medium)
+    public function __construct(array $attributes, MediaObjectInterface $medium)
     {
         $this->attributes = $attributes;
-        $this->source = $medium->reset()->thumbnail('auto')->display('thumbnail');
-        $this->source->linked = true;
+
+        $source = $medium->reset()->thumbnail('auto')->display('thumbnail');
+        if (!$source instanceof MediaObjectInterface) {
+            throw new RuntimeException('Media has no thumbnail set');
+        }
+
+        $source->set('linked', true);
+
+        $this->source = $source;
     }
 
     /**
      * Get an element (is array) that can be rendered by the Parsedown engine
      *
-     * @param  string  $title
-     * @param  string  $alt
-     * @param  string  $class
-     * @param  string  $id
+     * @param  string|null  $title
+     * @param  string|null  $alt
+     * @param  string|null  $class
+     * @param  string|null  $id
      * @param  bool $reset
      * @return array
      */
@@ -48,7 +67,7 @@ public function parsedownElement($title = null, $alt = null, $class = null, $id
         return [
             'name' => 'a',
             'attributes' => $this->attributes,
-            'handler' => is_string($innerElement) ? 'line' : 'element',
+            'handler' => is_array($innerElement) ? 'element' : 'line',
             'text' => $innerElement
         ];
     }
@@ -60,12 +79,24 @@ public function parsedownElement($title = null, $alt = null, $class = null, $id
      * @param mixed $args
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function __call($method, $args)
     {
-        $this->source = call_user_func_array(array($this->source, $method), $args);
+        $object = $this->source;
+        $callable = [$object, $method];
+        if (!is_callable($callable)) {
+            throw new BadMethodCallException(get_class($object) . '::' . $method . '() not found.');
+        }
+
+        $object = call_user_func_array($callable, $args);
+        if (!$object instanceof MediaLinkInterface) {
+            // Don't start nesting links, if user has multiple link calls in his
+            // actions, we will drop the previous links.
+            return $this;
+        }
+
+        $this->source = $object;
 
-        // Don't start nesting links, if user has multiple link calls in his
-        // actions, we will drop the previous links.
-        return $this->source instanceof Link ? $this->source : $this;
+        return $object;
     }
 }
diff --git a/system/src/Grav/Common/Page/Medium/Medium.php b/system/src/Grav/Common/Page/Medium/Medium.php
index bf0bb1fab3..0891c0c46a 100644
--- a/system/src/Grav/Common/Page/Medium/Medium.php
+++ b/system/src/Grav/Common/Page/Medium/Medium.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,68 +13,35 @@
 use Grav\Common\Grav;
 use Grav\Common\Data\Data;
 use Grav\Common\Data\Blueprint;
-use Grav\Common\Media\Interfaces\MediaObjectInterface;
-use Grav\Common\Utils;
+use Grav\Common\Media\Interfaces\MediaFileInterface;
+use Grav\Common\Media\Interfaces\MediaLinkInterface;
+use Grav\Common\Media\Traits\MediaFileTrait;
+use Grav\Common\Media\Traits\MediaObjectTrait;
 
 /**
  * Class Medium
  * @package Grav\Common\Page\Medium
  *
+ * @property string $filepath
+ * @property string $filename
+ * @property string $basename
  * @property string $mime
+ * @property int $size
+ * @property int $modified
+ * @property array $metadata
+ * @property int|string $timestamp
  */
-class Medium extends Data implements RenderableInterface, MediaObjectInterface
+class Medium extends Data implements RenderableInterface, MediaFileInterface
 {
+    use MediaObjectTrait;
+    use MediaFileTrait;
     use ParsedownHtmlTrait;
 
-    /**
-     * @var string
-     */
-    protected $mode = 'source';
-
-    /**
-     * @var Medium
-     */
-    protected $_thumbnail = null;
-
-    /**
-     * @var array
-     */
-    protected $thumbnailTypes = ['page', 'default'];
-
-    protected $thumbnailType = null;
-
-    /**
-     * @var Medium[]
-     */
-    protected $alternatives = [];
-
-    /**
-     * @var array
-     */
-    protected $attributes = [];
-
-    /**
-     * @var array
-     */
-    protected $styleAttributes = [];
-
-    /**
-     * @var array
-     */
-    protected $metadata = [];
-
-    /**
-     * @var array
-     */
-    protected $medium_querystring = [];
-
-    protected $timestamp;
-
     /**
      * Construct.
      *
      * @param array $items
-     * @param Blueprint $blueprint
+     * @param Blueprint|null $blueprint
      */
     public function __construct($items = [], Blueprint $blueprint = null)
     {
@@ -85,99 +52,22 @@ public function __construct($items = [], Blueprint $blueprint = null)
         }
 
         $this->def('mime', 'application/octet-stream');
-        $this->reset();
-    }
-
-    public function __clone()
-    {
-        // Allows future compatibility as parent::__clone() works.
-    }
-
-    /**
-     * Create a copy of this media object
-     *
-     * @return Medium
-     */
-    public function copy()
-    {
-        return clone $this;
-    }
-
-    /**
-     * Return just metadata from the Medium object
-     *
-     * @return Data
-     */
-    public function meta()
-    {
-        return new Data($this->items);
-    }
-
-    /**
-     * Check if this medium exists or not
-     *
-     * @return bool
-     */
-    public function exists()
-    {
-        $path = $this->get('filepath');
-        if (file_exists($path)) {
-            return true;
-        }
-        return false;
-    }
 
-    /**
-     * Get file modification time for the medium.
-     *
-     * @return int|null
-     */
-    public function modified()
-    {
-        $path = $this->get('filepath');
-
-        if (!file_exists($path)) {
-            return null;
+        if (!$this->offsetExists('size')) {
+            $path = $this->get('filepath');
+            $this->def('size', filesize($path));
         }
 
-        return filemtime($path) ?: null;
-    }
-
-    /**
-     * @return int
-     */
-    public function size()
-    {
-        $path = $this->get('filepath');
-
-        if (!file_exists($path)) {
-            return 0;
-        }
-
-        return filesize($path) ?: 0;
-    }
-
-    /**
-     * Set querystring to file modification timestamp (or value provided as a parameter).
-     *
-     * @param string|int|null $timestamp
-     * @return $this
-     */
-    public function setTimestamp($timestamp = null)
-    {
-        $this->timestamp = (string)($timestamp ?? $this->modified());
-
-        return $this;
+        $this->reset();
     }
 
     /**
-     * Returns an array containing just the metadata
-     *
-     * @return array
+     * Clone medium.
      */
-    public function metadata()
+    #[\ReturnTypeWillChange]
+    public function __clone()
     {
-        return $this->metadata;
+        // Allows future compatibility as parent::__clone() works.
     }
 
     /**
@@ -192,21 +82,15 @@ public function addMetaFile($filepath)
     }
 
     /**
-     * Add alternative Medium to this Medium.
-     *
-     * @param int|float $ratio
-     * @param Medium $alternative
+     * @return array
      */
-    public function addAlternative($ratio, Medium $alternative)
+    public function getMeta(): array
     {
-        if (!is_numeric($ratio) || $ratio === 0) {
-            return;
-        }
-
-        $alternative->set('ratio', $ratio);
-        $width = $alternative->get('width');
-
-        $this->alternatives[$width] = $alternative;
+        return [
+            'mime' => $this->mime,
+            'size' => $this->size,
+            'modified' => $this->modified,
+        ];
     }
 
     /**
@@ -214,466 +98,43 @@ public function addAlternative($ratio, Medium $alternative)
      *
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function __toString()
     {
         return $this->html();
     }
 
     /**
-     * Return PATH to file.
-     *
-     * @param bool $reset
-     * @return string path to file
-     */
-    public function path($reset = true)
-    {
-        if ($reset) {
-            $this->reset();
-        }
-
-        return $this->get('filepath');
-    }
-
-    /**
-     * Return the relative path to file
-     *
-     * @param bool $reset
-     * @return mixed
-     */
-    public function relativePath($reset = true)
-    {
-        $output = preg_replace('|^' . preg_quote(GRAV_ROOT, '|') . '|', '', $this->get('filepath'));
-
-        $locator = Grav::instance()['locator'];
-        if ($locator->isStream($output)) {
-            $output = $locator->findResource($output, false);
-        }
-
-        if ($reset) {
-            $this->reset();
-        }
-
-        return str_replace(GRAV_ROOT, '', $output);
-    }
-
-    /**
-     * Return URL to file.
-     *
-     * @param bool $reset
-     * @return string
-     */
-    public function url($reset = true)
-    {
-        $output = preg_replace('|^' . preg_quote(GRAV_ROOT, '|') . '|', '', $this->get('filepath'));
-
-        $locator = Grav::instance()['locator'];
-        if ($locator->isStream($output)) {
-            $output = $locator->findResource($output, false);
-        }
-
-        if ($reset) {
-            $this->reset();
-        }
-
-        return trim(Grav::instance()['base_url'] . '/' . $this->urlQuerystring($output), '\\');
-    }
-
-    /**
-     * Get/set querystring for the file's url
-     *
-     * @param  string  $querystring
-     * @param  bool $withQuestionmark
-     * @return string
-     */
-    public function querystring($querystring = null, $withQuestionmark = true)
-    {
-        if (null !== $querystring) {
-            $this->medium_querystring[] = ltrim($querystring, '?&');
-            foreach ($this->alternatives as $alt) {
-                $alt->querystring($querystring, $withQuestionmark);
-            }
-        }
-
-        if (empty($this->medium_querystring)) {
-            return '';
-        }
-
-        // join the strings
-        $querystring = implode('&', $this->medium_querystring);
-        // explode all strings
-        $query_parts = explode('&', $querystring);
-        // Join them again now ensure the elements are unique
-        $querystring = implode('&', array_unique($query_parts));
-
-        return $withQuestionmark ? ('?' . $querystring) : $querystring;
-    }
-
-    /**
-     * Get the URL with full querystring
-     *
-     * @param string $url
-     * @return string
-     */
-    public function urlQuerystring($url)
-    {
-        $querystring = $this->querystring();
-        if (isset($this->timestamp) && !Utils::contains($querystring, $this->timestamp)) {
-            $querystring = empty($querystring) ? ('?' . $this->timestamp) : ($querystring . '&' . $this->timestamp);
-        }
-
-        return ltrim($url . $querystring . $this->urlHash(), '/');
-    }
-
-    /**
-     * Get/set hash for the file's url
-     *
-     * @param  string  $hash
-     * @param  bool $withHash
-     * @return string
-     */
-    public function urlHash($hash = null, $withHash = true)
-    {
-        if ($hash) {
-            $this->set('urlHash', ltrim($hash, '#'));
-        }
-
-        $hash = $this->get('urlHash', '');
-
-        return $withHash && !empty($hash) ? '#' . $hash : $hash;
-    }
-
-    /**
-     * Get an element (is array) that can be rendered by the Parsedown engine
-     *
-     * @param  string  $title
-     * @param  string  $alt
-     * @param  string  $class
-     * @param  string  $id
-     * @param  bool $reset
-     * @return array
-     */
-    public function parsedownElement($title = null, $alt = null, $class = null, $id = null, $reset = true)
-    {
-        $attributes = $this->attributes;
-
-        $style = '';
-        foreach ($this->styleAttributes as $key => $value) {
-            if (is_numeric($key)) // Special case for inline style attributes, refer to style() method
-                $style .= $value;
-            else
-                $style .= $key . ': ' . $value . ';';
-        }
-        if ($style) {
-            $attributes['style'] = $style;
-        }
-
-        if (empty($attributes['title'])) {
-            if (!empty($title)) {
-                $attributes['title'] = $title;
-            } elseif (!empty($this->items['title'])) {
-                $attributes['title'] = $this->items['title'];
-            }
-        }
-
-        if (empty($attributes['alt'])) {
-            if (!empty($alt)) {
-                $attributes['alt'] = $alt;
-            } elseif (!empty($this->items['alt'])) {
-                $attributes['alt'] = $this->items['alt'];
-            } elseif (!empty($this->items['alt_text'])) {
-                $attributes['alt'] = $this->items['alt_text'];
-            } else {
-                $attributes['alt'] = '';
-            }
-        }
-
-        if (empty($attributes['class'])) {
-            if (!empty($class)) {
-                $attributes['class'] = $class;
-            } elseif (!empty($this->items['class'])) {
-                $attributes['class'] = $this->items['class'];
-            }
-        }
-
-        if (empty($attributes['id'])) {
-            if (!empty($id)) {
-                $attributes['id'] = $id;
-            } elseif (!empty($this->items['id'])) {
-                $attributes['id'] = $this->items['id'];
-            }
-        }
-
-        switch ($this->mode) {
-            case 'text':
-                $element = $this->textParsedownElement($attributes, false);
-                break;
-            case 'thumbnail':
-                $element = $this->getThumbnail()->sourceParsedownElement($attributes, false);
-                break;
-            case 'source':
-                $element = $this->sourceParsedownElement($attributes, false);
-                break;
-            default:
-                $element = [];
-        }
-
-        if ($reset) {
-            $this->reset();
-        }
-
-        $this->display('source');
-
-        return $element;
-    }
-
-    /**
-     * Parsedown element for source display mode
-     *
-     * @param  array $attributes
-     * @param  bool $reset
-     * @return array
-     */
-    protected function sourceParsedownElement(array $attributes, $reset = true)
-    {
-        return $this->textParsedownElement($attributes, $reset);
-    }
-
-    /**
-     * Parsedown element for text display mode
-     *
-     * @param  array $attributes
-     * @param  bool $reset
-     * @return array
-     */
-    protected function textParsedownElement(array $attributes, $reset = true)
-    {
-        $text = empty($attributes['title']) ? empty($attributes['alt']) ? $this->get('filename') : $attributes['alt'] : $attributes['title'];
-
-        $element = [
-            'name' => 'p',
-            'attributes' => $attributes,
-            'text' => $text
-        ];
-
-        if ($reset) {
-            $this->reset();
-        }
-
-        return $element;
-    }
-
-    /**
-     * Reset medium.
-     *
-     * @return $this
-     */
-    public function reset()
-    {
-        $this->attributes = [];
-        return $this;
-    }
-
-    /**
-     * Switch display mode.
-     *
-     * @param string $mode
-     *
-     * @return $this
-     */
-    public function display($mode = 'source')
-    {
-        if ($this->mode === $mode) {
-            return $this;
-        }
-
-
-        $this->mode = $mode;
-
-        return $mode === 'thumbnail' ? ($this->getThumbnail() ? $this->getThumbnail()->reset() : null) : $this->reset();
-    }
-
-    /**
-     * Helper method to determine if this media item has a thumbnail or not
-     *
-     * @param string $type;
-     *
-     * @return bool
+     * @param string $thumb
+     * @return Medium|null
      */
-    public function thumbnailExists($type = 'page')
+    protected function createThumbnail($thumb)
     {
-        $thumbs = $this->get('thumbnails');
-        if (isset($thumbs[$type])) {
-            return true;
-        }
-        return false;
+        return MediumFactory::fromFile($thumb, ['type' => 'thumbnail']);
     }
 
     /**
-     * Switch thumbnail.
-     *
-     * @param string $type
-     *
-     * @return $this
-     */
-    public function thumbnail($type = 'auto')
-    {
-        if ($type !== 'auto' && !\in_array($type, $this->thumbnailTypes, true)) {
-            return $this;
-        }
-
-        if ($this->thumbnailType !== $type) {
-            $this->_thumbnail = null;
-        }
-
-        $this->thumbnailType = $type;
-
-        return $this;
-    }
-
-
-    /**
-     * Turn the current Medium into a Link
-     *
-     * @param  bool $reset
-     * @param  array  $attributes
-     * @return Link
+     * @param array $attributes
+     * @return MediaLinkInterface
      */
-    public function link($reset = true, array $attributes = [])
+    protected function createLink(array $attributes)
     {
-        if ($this->mode !== 'source') {
-            $this->display('source');
-        }
-
-        foreach ($this->attributes as $key => $value) {
-            empty($attributes['data-' . $key]) && $attributes['data-' . $key] = $value;
-        }
-
-        empty($attributes['href']) && $attributes['href'] = $this->url();
-
         return new Link($attributes, $this);
     }
 
     /**
-     * Turn the current Medium into a Link with lightbox enabled
-     *
-     * @param  int  $width
-     * @param  int  $height
-     * @param  bool $reset
-     * @return Link
-     */
-    public function lightbox($width = null, $height = null, $reset = true)
-    {
-        $attributes = ['rel' => 'lightbox'];
-
-        if ($width && $height) {
-            $attributes['data-width'] = $width;
-            $attributes['data-height'] = $height;
-        }
-
-        return $this->link($reset, $attributes);
-    }
-
-    /**
-     * Add a class to the element from Markdown or Twig
-     * Example: ![Example](myimg.png?classes=float-left) or ![Example](myimg.png?classes=myclass1,myclass2)
-     *
-     * @return $this
-     */
-    public function classes()
-    {
-        $classes = func_get_args();
-        if (!empty($classes)) {
-            $this->attributes['class'] = implode(',', $classes);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add an id to the element from Markdown or Twig
-     * Example: ![Example](myimg.png?id=primary-img)
-     *
-     * @param string $id
-     * @return $this
-     */
-    public function id($id)
-    {
-        if (is_string($id)) {
-            $this->attributes['id'] = trim($id);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Allows to add an inline style attribute from Markdown or Twig
-     * Example: ![Example](myimg.png?style=float:left)
-     *
-     * @param string $style
-     * @return $this
-     */
-    public function style($style)
-    {
-        $this->styleAttributes[] = rtrim($style, ';') . ';';
-        return $this;
-    }
-
-    /**
-     * Allow any action to be called on this medium from twig or markdown
-     *
-     * @param string $method
-     * @param mixed $args
-     * @return $this
+     * @return Grav
      */
-    public function __call($method, $args)
+    protected function getGrav(): Grav
     {
-        $qs = $method;
-        if (\count($args) > 1 || (\count($args) === 1 && !empty($args[0]))) {
-            $qs .= '=' . implode(',', array_map(function ($a) {
-                if (is_array($a)) {
-                    $a = '[' . implode(',', $a) . ']';
-                }
-                return rawurlencode($a);
-            }, $args));
-        }
-
-        if (!empty($qs)) {
-            $this->querystring($this->querystring(null, false) . '&' . $qs);
-        }
-
-        return $this;
+        return Grav::instance();
     }
 
     /**
-     * Get the thumbnail Medium object
-     *
-     * @return ThumbnailImageMedium
+     * @return array
      */
-    protected function getThumbnail()
+    protected function getItems(): array
     {
-        if (!$this->_thumbnail) {
-            $types = $this->thumbnailTypes;
-
-            if ($this->thumbnailType !== 'auto') {
-                array_unshift($types, $this->thumbnailType);
-            }
-
-            foreach ($types as $type) {
-                $thumb = $this->get('thumbnails.' . $type, false);
-
-                if ($thumb) {
-                    $thumb = $thumb instanceof ThumbnailImageMedium ? $thumb : MediumFactory::fromFile($thumb, ['type' => 'thumbnail']);
-                    $thumb->parent = $this;
-                }
-
-                if ($thumb) {
-                    $this->_thumbnail = $thumb;
-                    break;
-                }
-            }
-        }
-
-        return $this->_thumbnail;
+        return $this->items;
     }
-
 }
diff --git a/system/src/Grav/Common/Page/Medium/MediumFactory.php b/system/src/Grav/Common/Page/Medium/MediumFactory.php
index dc372d81db..913f198f17 100644
--- a/system/src/Grav/Common/Page/Medium/MediumFactory.php
+++ b/system/src/Grav/Common/Page/Medium/MediumFactory.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,8 +11,18 @@
 
 use Grav\Common\Grav;
 use Grav\Common\Data\Blueprint;
+use Grav\Common\Media\Interfaces\ImageMediaInterface;
+use Grav\Common\Media\Interfaces\MediaObjectInterface;
+use Grav\Common\Utils;
 use Grav\Framework\Form\FormFlashFile;
+use Psr\Http\Message\UploadedFileInterface;
+use function dirname;
+use function is_array;
 
+/**
+ * Class MediumFactory
+ * @package Grav\Common\Page\Medium
+ */
 class MediumFactory
 {
     /**
@@ -20,7 +30,7 @@ class MediumFactory
      *
      * @param  string $file
      * @param  array  $params
-     * @return Medium
+     * @return Medium|null
      */
     public static function fromFile($file, array $params = [])
     {
@@ -28,19 +38,24 @@ public static function fromFile($file, array $params = [])
             return null;
         }
 
-        $parts = pathinfo($file);
+        $parts = Utils::pathinfo($file);
         $path = $parts['dirname'];
         $filename = $parts['basename'];
-        $ext = $parts['extension'];
+        $ext = $parts['extension'] ?? '';
         $basename = $parts['filename'];
 
         $config = Grav::instance()['config'];
 
-        $media_params = $config->get('media.types.' . strtolower($ext));
-        if (!\is_array($media_params)) {
+        $media_params = $ext ? $config->get('media.types.' . strtolower($ext)) : null;
+        if (!is_array($media_params)) {
             return null;
         }
 
+        // Remove empty 'image' attribute
+        if (isset($media_params['image']) && empty($media_params['image'])) {
+            unset($media_params['image']);
+        }
+
         $params += $media_params;
 
         // Add default settings for undefined variables.
@@ -71,23 +86,33 @@ public static function fromFile($file, array $params = [])
     /**
      * Create Medium from an uploaded file
      *
-     * @param  FormFlashFile $uploadedFile
+     * @param  UploadedFileInterface $uploadedFile
      * @param  array  $params
-     * @return Medium
+     * @return Medium|null
      */
-    public static function fromUploadedFile(FormFlashFile $uploadedFile, array $params = [])
+    public static function fromUploadedFile(UploadedFileInterface $uploadedFile, array $params = [])
     {
-        $parts = pathinfo($uploadedFile->getClientFilename());
+        // For now support only FormFlashFiles, which exist over multiple requests. Also ignore errored and moved media.
+        if (!$uploadedFile instanceof FormFlashFile || $uploadedFile->getError() !== \UPLOAD_ERR_OK || $uploadedFile->isMoved()) {
+            return null;
+        }
+
+        $clientName = $uploadedFile->getClientFilename();
+        if (!$clientName) {
+            return null;
+        }
+
+        $parts = Utils::pathinfo($clientName);
         $filename = $parts['basename'];
-        $ext = $parts['extension'];
+        $ext = $parts['extension'] ?? '';
         $basename = $parts['filename'];
         $file = $uploadedFile->getTmpFile();
-        $path = dirname($file);
+        $path = $file ? dirname($file) : '';
 
         $config = Grav::instance()['config'];
 
-        $media_params = $config->get('media.types.' . strtolower($ext));
-        if (!\is_array($media_params)) {
+        $media_params = $ext ? $config->get('media.types.' . strtolower($ext)) : null;
+        if (!is_array($media_params)) {
             return null;
         }
 
@@ -104,7 +129,7 @@ public static function fromUploadedFile(FormFlashFile $uploadedFile, array $para
             'basename' => $basename,
             'extension' => $ext,
             'path' => $path,
-            'modified' => filemtime($file),
+            'modified' => $file ? filemtime($file) : 0,
             'thumbnails' => []
         ];
 
@@ -134,8 +159,9 @@ public static function fromArray(array $items = [], Blueprint $blueprint = null)
                 return new ImageMedium($items, $blueprint);
             case 'thumbnail':
                 return new ThumbnailImageMedium($items, $blueprint);
-            case 'animated':
             case 'vector':
+                return new VectorImageMedium($items, $blueprint);
+            case 'animated':
                 return new StaticImageMedium($items, $blueprint);
             case 'video':
                 return new VideoMedium($items, $blueprint);
@@ -149,14 +175,14 @@ public static function fromArray(array $items = [], Blueprint $blueprint = null)
     /**
      * Create a new ImageMedium by scaling another ImageMedium object.
      *
-     * @param  ImageMedium $medium
+     * @param  ImageMediaInterface|MediaObjectInterface $medium
      * @param  int         $from
      * @param  int         $to
-     * @return Medium|array
+     * @return ImageMediaInterface|MediaObjectInterface|array
      */
     public static function scaledFromMedium($medium, $from, $to)
     {
-        if (! $medium instanceof ImageMedium) {
+        if (!$medium instanceof ImageMedium) {
             return $medium;
         }
 
@@ -169,7 +195,7 @@ public static function scaledFromMedium($medium, $from, $to)
         $height = $medium->get('height') * $ratio;
 
         $prev_basename = $medium->get('basename');
-        $basename = str_replace('@'.$from.'x', '@'.$to.'x', $prev_basename);
+        $basename = str_replace('@' . $from . 'x', $to !== 1 ? '@' . $to . 'x' : '', $prev_basename);
 
         $debug = $medium->get('debug');
         $medium->set('debug', false);
@@ -184,6 +210,8 @@ public static function scaledFromMedium($medium, $from, $to)
 
         $medium = self::fromFile($file);
         if ($medium) {
+            $medium->set('basename', $basename);
+            $medium->set('filename', $basename . '.' . $medium->extension);
             $medium->set('size', $size);
         }
 
diff --git a/system/src/Grav/Common/Page/Medium/ParsedownHtmlTrait.php b/system/src/Grav/Common/Page/Medium/ParsedownHtmlTrait.php
index c6d75bc779..4ab2fb58f3 100644
--- a/system/src/Grav/Common/Page/Medium/ParsedownHtmlTrait.php
+++ b/system/src/Grav/Common/Page/Medium/ParsedownHtmlTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,20 +12,22 @@
 use Grav\Common\Markdown\Parsedown;
 use Grav\Common\Page\Markdown\Excerpts;
 
+/**
+ * Trait ParsedownHtmlTrait
+ * @package Grav\Common\Page\Medium
+ */
 trait ParsedownHtmlTrait
 {
-    /**
-     * @var \Grav\Common\Markdown\Parsedown
-     */
+    /** @var Parsedown|null */
     protected $parsedown;
 
     /**
      * Return HTML markup from the medium.
      *
-     * @param string $title
-     * @param string $alt
-     * @param string $class
-     * @param string $id
+     * @param string|null $title
+     * @param string|null $alt
+     * @param string|null $class
+     * @param string|null $id
      * @param bool $reset
      * @return string
      */
diff --git a/system/src/Grav/Common/Page/Medium/RenderableInterface.php b/system/src/Grav/Common/Page/Medium/RenderableInterface.php
index 50a6e67908..1ee6a96602 100644
--- a/system/src/Grav/Common/Page/Medium/RenderableInterface.php
+++ b/system/src/Grav/Common/Page/Medium/RenderableInterface.php
@@ -3,34 +3,39 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Medium;
 
+/**
+ * Interface RenderableInterface
+ * @package Grav\Common\Page\Medium
+ */
 interface RenderableInterface
 {
     /**
      * Return HTML markup from the medium.
      *
-     * @param string $title
-     * @param string $alt
-     * @param string $class
+     * @param string|null $title
+     * @param string|null $alt
+     * @param string|null $class
+     * @param string|null $id
      * @param bool $reset
      * @return string
      */
-    public function html($title = null, $alt = null, $class = null, $reset = true);
+    public function html($title = null, $alt = null, $class = null, $id = null, $reset = true);
 
     /**
      * Return Parsedown Element from the medium.
      *
-     * @param string $title
-     * @param string $alt
-     * @param string $class
-     * @param string $id
+     * @param string|null $title
+     * @param string|null $alt
+     * @param string|null $class
+     * @param string|null $id
      * @param bool $reset
-     * @return string
+     * @return array
      */
     public function parsedownElement($title = null, $alt = null, $class = null, $id = null, $reset = true);
 }
diff --git a/system/src/Grav/Common/Page/Medium/StaticImageMedium.php b/system/src/Grav/Common/Page/Medium/StaticImageMedium.php
index 1fa543973c..97801000ae 100644
--- a/system/src/Grav/Common/Page/Medium/StaticImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/StaticImageMedium.php
@@ -3,15 +3,24 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Medium;
 
-class StaticImageMedium extends Medium
+use Grav\Common\Media\Interfaces\ImageMediaInterface;
+use Grav\Common\Media\Traits\ImageLoadingTrait;
+use Grav\Common\Media\Traits\StaticResizeTrait;
+
+/**
+ * Class StaticImageMedium
+ * @package Grav\Common\Page\Medium
+ */
+class StaticImageMedium extends Medium implements ImageMediaInterface
 {
     use StaticResizeTrait;
+    use ImageLoadingTrait;
 
     /**
      * Parsedown element for source display mode
@@ -22,8 +31,18 @@ class StaticImageMedium extends Medium
      */
     protected function sourceParsedownElement(array $attributes, $reset = true)
     {
-        empty($attributes['src']) && $attributes['src'] = $this->url($reset);
+        if (empty($attributes['src'])) {
+            $attributes['src'] = $this->url($reset);
+        }
 
         return ['name' => 'img', 'attributes' => $attributes];
     }
+
+    /**
+     * @return $this
+     */
+    public function higherQualityAlternative()
+    {
+        return $this;
+    }
 }
diff --git a/system/src/Grav/Common/Page/Medium/StaticResizeTrait.php b/system/src/Grav/Common/Page/Medium/StaticResizeTrait.php
index 8d6d43fb45..caaa7e2d6a 100644
--- a/system/src/Grav/Common/Page/Medium/StaticResizeTrait.php
+++ b/system/src/Grav/Common/Page/Medium/StaticResizeTrait.php
@@ -3,26 +3,22 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Medium;
 
+use Grav\Common\Media\Traits\StaticResizeTrait as NewResizeTrait;
+
+user_error('Grav\Common\Page\Medium\StaticResizeTrait is deprecated since Grav 1.7, use Grav\Common\Media\Traits\StaticResizeTrait instead', E_USER_DEPRECATED);
+
+/**
+ * Trait StaticResizeTrait
+ * @package Grav\Common\Page\Medium
+ * @deprecated 1.7 Use `Grav\Common\Media\Traits\StaticResizeTrait` instead
+ */
 trait StaticResizeTrait
 {
-    /**
-     * Resize media by setting attributes
-     *
-     * @param  int $width
-     * @param  int $height
-     * @return $this
-     */
-    public function resize($width = null, $height = null)
-    {
-        $this->styleAttributes['width'] = $width . 'px';
-        $this->styleAttributes['height'] = $height . 'px';
-
-        return $this;
-    }
+    use NewResizeTrait;
 }
diff --git a/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php b/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php
index 380baee64d..1e4d862f91 100644
--- a/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php
@@ -3,130 +3,19 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Medium;
 
+use Grav\Common\Media\Traits\ThumbnailMediaTrait;
+
+/**
+ * Class ThumbnailImageMedium
+ * @package Grav\Common\Page\Medium
+ */
 class ThumbnailImageMedium extends ImageMedium
 {
-    /**
-     * @var Medium
-     */
-    public $parent = null;
-
-    /**
-     * @var bool
-     */
-    public $linked = false;
-
-    /**
-     * Return srcset string for this Medium and its alternatives.
-     *
-     * @param bool $reset
-     * @return string
-     */
-    public function srcset($reset = true)
-    {
-        return '';
-    }
-
-    /**
-     * Get an element (is array) that can be rendered by the Parsedown engine
-     *
-     * @param  string $title
-     * @param  string $alt
-     * @param  string $class
-     * @param  string $id
-     * @param  bool $reset
-     * @return array
-     */
-    public function parsedownElement($title = null, $alt = null, $class = null, $id = null, $reset = true)
-    {
-        return $this->bubble('parsedownElement', [$title, $alt, $class, $id, $reset]);
-    }
-
-    /**
-     * Return HTML markup from the medium.
-     *
-     * @param string $title
-     * @param string $alt
-     * @param string $class
-     * @param string $id
-     * @param bool $reset
-     * @return string
-     */
-    public function html($title = null, $alt = null, $class = null, $id = null, $reset = true)
-    {
-        return $this->bubble('html', [$title, $alt, $class, $id, $reset]);
-    }
-
-    /**
-     * Switch display mode.
-     *
-     * @param string $mode
-     *
-     * @return $this
-     */
-    public function display($mode = 'source')
-    {
-        return $this->bubble('display', [$mode], false);
-    }
-
-    /**
-     * Switch thumbnail.
-     *
-     * @param string $type
-     *
-     * @return $this
-     */
-    public function thumbnail($type = 'auto')
-    {
-        $this->bubble('thumbnail', [$type], false);
-
-        return $this->bubble('getThumbnail', [], false);
-    }
-
-    /**
-     * Turn the current Medium into a Link
-     *
-     * @param  bool $reset
-     * @param  array  $attributes
-     * @return Link
-     */
-    public function link($reset = true, array $attributes = [])
-    {
-        return $this->bubble('link', [$reset, $attributes], false);
-    }
-
-    /**
-     * Turn the current Medium into a Link with lightbox enabled
-     *
-     * @param  int  $width
-     * @param  int  $height
-     * @param  bool $reset
-     * @return Link
-     */
-    public function lightbox($width = null, $height = null, $reset = true)
-    {
-        return $this->bubble('lightbox', [$width, $height, $reset], false);
-    }
-
-    /**
-     * Bubble a function call up to either the superclass function or the parent Medium instance
-     *
-     * @param  string  $method
-     * @param  array  $arguments
-     * @param  bool $testLinked
-     * @return Medium
-     */
-    protected function bubble($method, array $arguments = [], $testLinked = true)
-    {
-        if (!$testLinked || $this->linked) {
-            return $this->parent ? call_user_func_array(array($this->parent, $method), $arguments) : $this;
-        }
-
-        return call_user_func_array(array($this, 'parent::' . $method), $arguments);
-    }
+    use ThumbnailMediaTrait;
 }
diff --git a/system/src/Grav/Common/Page/Medium/VectorImageMedium.php b/system/src/Grav/Common/Page/Medium/VectorImageMedium.php
new file mode 100644
index 0000000000..c44f35a77b
--- /dev/null
+++ b/system/src/Grav/Common/Page/Medium/VectorImageMedium.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * @package    Grav\Common\Page
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Page\Medium;
+
+use Grav\Common\Data\Blueprint;
+
+
+/**
+ * Class StaticImageMedium
+ * @package Grav\Common\Page\Medium
+ */
+class VectorImageMedium extends StaticImageMedium
+{
+    /**
+     * Construct.
+     *
+     * @param array $items
+     * @param Blueprint|null $blueprint
+     */
+    public function __construct($items = [], Blueprint $blueprint = null)
+    {
+        parent::__construct($items, $blueprint);
+
+        // If we already have the image size, we do not need to do anything else.
+        $width = $this->get('width');
+        $height = $this->get('height');
+        if ($width && $height) {
+            return;
+        }
+
+        // Make sure that getting image size is supported.
+        if ($this->mime !== 'image/svg+xml' || !\extension_loaded('simplexml')) {
+            return;
+        }
+
+        // Make sure that the image exists.
+        $path = $this->get('filepath');
+        if (!$path || !file_exists($path) || !filesize($path)) {
+            return;
+        }
+
+        $xml = simplexml_load_string(file_get_contents($path));
+        $attr = $xml ? $xml->attributes() : null;
+        if (!$attr instanceof \SimpleXMLElement) {
+            return;
+        }
+
+        // Get the size from svg image.
+        if ($attr->width && $attr->height) {
+            $width = (string)$attr->width;
+            $height = (string)$attr->height;
+        } elseif ($attr->viewBox && \count($size = explode(' ', (string)$attr->viewBox)) === 4) {
+            [,$width,$height,] = $size;
+        }
+
+        if ($width && $height) {
+            $this->def('width', (int)$width);
+            $this->def('height', (int)$height);
+        }
+    }
+}
diff --git a/system/src/Grav/Common/Page/Medium/VideoMedium.php b/system/src/Grav/Common/Page/Medium/VideoMedium.php
index c0b488aa02..0e629dc89e 100644
--- a/system/src/Grav/Common/Page/Medium/VideoMedium.php
+++ b/system/src/Grav/Common/Page/Medium/VideoMedium.php
@@ -3,148 +3,22 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page\Medium;
 
-class VideoMedium extends Medium
-{
-    use StaticResizeTrait;
-
-    /**
-     * Parsedown element for source display mode
-     *
-     * @param  array $attributes
-     * @param  bool $reset
-     * @return array
-     */
-    protected function sourceParsedownElement(array $attributes, $reset = true)
-    {
-        $location = $this->url($reset);
-
-        return [
-            'name' => 'video',
-            'text' => '<source src="' . $location . '">Your browser does not support the video tag.',
-            'attributes' => $attributes
-        ];
-    }
+use Grav\Common\Media\Interfaces\VideoMediaInterface;
+use Grav\Common\Media\Traits\VideoMediaTrait;
 
-    /**
-     * Allows to set or remove the HTML5 default controls
-     *
-     * @param bool $display
-     * @return $this
-     */
-    public function controls($display = true)
-    {
-        if($display) {
-            $this->attributes['controls'] = true;
-        } else {
-            unset($this->attributes['controls']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Allows to set the video's poster image
-     *
-     * @param string $urlImage
-     * @return $this
-     */
-    public function poster($urlImage)
-    {
-        $this->attributes['poster'] = $urlImage;
-
-        return $this;
-    }
-
-    /**
-     * Allows to set the loop attribute
-     *
-     * @param bool $status
-     * @return $this
-     */
-    public function loop($status = false)
-    {
-        if($status) {
-            $this->attributes['loop'] = true;
-        } else {
-            unset($this->attributes['loop']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Allows to set the autoplay attribute
-     *
-     * @param bool $status
-     * @return $this
-     */
-    public function autoplay($status = false)
-    {
-        if ($status) {
-            $this->attributes['autoplay'] = '';
-        } else {
-            unset($this->attributes['autoplay']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Allows ability to set the preload option
-     *
-     * @param null $status
-     * @return $this
-     */
-    public function preload($status = null)
-    {
-        if ($status) {
-            $this->attributes['preload'] = $status;
-        } else {
-            unset($this->attributes['preload']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Allows to set the playsinline attribute
-     *
-     * @param bool $status
-     * @return $this
-     */
-    public function playsinline($status = false)
-    {
-        if($status) {
-            $this->attributes['playsinline'] = true;
-        } else {
-            unset($this->attributes['playsinline']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Allows to set the muted attribute
-     *
-     * @param bool $status
-     * @return $this
-     */
-    public function muted($status = false)
-    {
-        if($status) {
-            $this->attributes['muted'] = true;
-        } else {
-            unset($this->attributes['muted']);
-        }
-
-        return $this;
-    }
+/**
+ * Class VideoMedium
+ * @package Grav\Common\Page\Medium
+ */
+class VideoMedium extends Medium implements VideoMediaInterface
+{
+    use VideoMediaTrait;
 
     /**
      * Reset medium.
@@ -155,7 +29,7 @@ public function reset()
     {
         parent::reset();
 
-        $this->attributes['controls'] = true;
+        $this->resetPlayer();
 
         return $this;
     }
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 6da3bbaed6..ccf676f6c4 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -3,107 +3,163 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page;
 
+use Exception;
 use Grav\Common\Cache;
 use Grav\Common\Config\Config;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
+use Grav\Common\Language\Language;
 use Grav\Common\Markdown\Parsedown;
 use Grav\Common\Markdown\ParsedownExtra;
+use Grav\Common\Page\Interfaces\PageCollectionInterface;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Media\Traits\MediaTrait;
 use Grav\Common\Page\Markdown\Excerpts;
-use Grav\Common\Taxonomy;
+use Grav\Common\Page\Traits\PageFormTrait;
+use Grav\Common\Twig\Twig;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
 use Grav\Common\Yaml;
-use Negotiation\Accept;
-use Negotiation\Negotiator;
+use Grav\Framework\Flex\Flex;
+use InvalidArgumentException;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\File\MarkdownFile;
+use RuntimeException;
+use SplFileInfo;
+use function dirname;
+use function in_array;
+use function is_array;
+use function is_object;
+use function is_string;
+use function strlen;
 
 define('PAGE_ORDER_PREFIX_REGEX', '/^[0-9]+\./u');
 
+/**
+ * Class Page
+ * @package Grav\Common\Page
+ */
 class Page implements PageInterface
 {
+    use PageFormTrait;
     use MediaTrait;
 
-    /**
-     * @var string Filename. Leave as null if page is folder.
-     */
+    /** @var string|null Filename. Leave as null if page is folder. */
     protected $name;
+    /** @var bool */
+    protected $initialized = false;
+    /** @var string */
     protected $folder;
+    /** @var string */
     protected $path;
+    /** @var string */
     protected $extension;
+    /** @var string */
     protected $url_extension;
-
+    /** @var string */
     protected $id;
+    /** @var string */
     protected $parent;
+    /** @var string */
     protected $template;
+    /** @var int */
     protected $expires;
+    /** @var string */
     protected $cache_control;
+    /** @var bool */
     protected $visible;
+    /** @var bool */
     protected $published;
+    /** @var int */
     protected $publish_date;
+    /** @var int|null */
     protected $unpublish_date;
+    /** @var string */
     protected $slug;
+    /** @var string|null */
     protected $route;
+    /** @var string|null */
     protected $raw_route;
+    /** @var string */
     protected $url;
+    /** @var array */
     protected $routes;
+    /** @var bool */
     protected $routable;
+    /** @var int */
     protected $modified;
+    /** @var string */
     protected $redirect;
+    /** @var string */
     protected $external_url;
-    protected $items;
+    /** @var object|null */
     protected $header;
+    /** @var string */
     protected $frontmatter;
+    /** @var string */
     protected $language;
+    /** @var string|null */
     protected $content;
+    /** @var array */
     protected $content_meta;
+    /** @var string|null */
     protected $summary;
+    /** @var string */
     protected $raw_content;
-    protected $pagination;
+    /** @var array|null */
     protected $metadata;
+    /** @var string */
     protected $title;
+    /** @var int */
     protected $max_count;
+    /** @var string */
     protected $menu;
+    /** @var int */
     protected $date;
+    /** @var string */
     protected $dateformat;
+    /** @var array */
     protected $taxonomy;
+    /** @var string */
     protected $order_by;
+    /** @var string */
     protected $order_dir;
+    /** @var array|string|null */
     protected $order_manual;
-    protected $modular;
+    /** @var bool */
     protected $modular_twig;
+    /** @var array */
     protected $process;
+    /** @var int|null */
     protected $summary_size;
+    /** @var bool */
     protected $markdown_extra;
+    /** @var bool */
     protected $etag;
+    /** @var bool */
     protected $last_modified;
+    /** @var string */
     protected $home_route;
+    /** @var bool */
     protected $hide_home_route;
+    /** @var bool */
     protected $ssl;
+    /** @var string */
     protected $template_format;
+    /** @var bool */
     protected $debugger;
-    /** @var array */
-    protected $forms;
 
-    /**
-     * @var PageInterface Unmodified (original) version of the page. Used for copying and moving the page.
-     */
+    /** @var PageInterface|null Unmodified (original) version of the page. Used for copying and moving the page. */
     private $_original;
-
-    /**
-     * @var string Action
-     */
+    /** @var string Action */
     private $_action;
 
     /**
@@ -122,15 +178,16 @@ public function __construct()
     /**
      * Initializes the page instance variables based on a file
      *
-     * @param  \SplFileInfo $file The file information for the .md file that the page represents
-     * @param  string $extension
-     *
+     * @param  SplFileInfo $file The file information for the .md file that the page represents
+     * @param  string|null $extension
      * @return $this
      */
-    public function init(\SplFileInfo $file, $extension = null)
+    public function init(SplFileInfo $file, $extension = null)
     {
         $config = Grav::instance()['config'];
 
+        $this->initialized = true;
+
         // some extension logic
         if (empty($extension)) {
             $this->extension('.' . $file->getExtension());
@@ -139,7 +196,7 @@ public function init(\SplFileInfo $file, $extension = null)
         }
 
         // extract page language from page extension
-        $language = trim(basename($this->extension(), 'md'), '.') ?: null;
+        $language = trim(Utils::basename($this->extension(), 'md'), '.') ?: null;
         $this->language($language);
 
         $this->hide_home_route = $config->get('system.home.hide_in_urls', false);
@@ -158,10 +215,32 @@ public function init(\SplFileInfo $file, $extension = null)
         $this->published();
         $this->urlExtension();
 
-
         return $this;
     }
 
+    #[\ReturnTypeWillChange]
+    public function __clone()
+    {
+        $this->initialized = false;
+        $this->header = $this->header ? clone $this->header : null;
+    }
+
+    /**
+     * @return void
+     */
+    public function initialize(): void
+    {
+        if (!$this->initialized) {
+            $this->initialized = true;
+            $this->route = null;
+            $this->raw_route = null;
+            $this->_forms = null;
+        }
+    }
+
+    /**
+     * @return void
+     */
     protected function processFrontmatter()
     {
         // Quick check for twig output tags in frontmatter if enabled
@@ -183,22 +262,38 @@ protected function processFrontmatter()
      * Return an array with the routes of other translated languages
      *
      * @param bool $onlyPublished only return published translations
-     *
      * @return array the page translated languages
      */
     public function translatedLanguages($onlyPublished = false)
     {
-        $filename = substr($this->name, 0, -(strlen($this->extension())));
-        $config = Grav::instance()['config'];
-        $languages = $config->get('system.languages.supported', []);
+        $grav = Grav::instance();
+
+        /** @var Language $language */
+        $language = $grav['language'];
+
+        $languages = $language->getLanguages();
+        $defaultCode = $language->getDefault();
+
+        $name = substr($this->name, 0, -strlen($this->extension()));
         $translatedLanguages = [];
 
-        foreach ($languages as $language) {
-            $path = $this->path . DS . $this->folder . DS . $filename . '.' . $language . '.md';
-            if (file_exists($path)) {
-                $aPage = new Page();
-                $aPage->init(new \SplFileInfo($path), $language . '.md');
+        foreach ($languages as $languageCode) {
+            $languageExtension = ".{$languageCode}.md";
+            $path = $this->path . DS . $this->folder . DS . $name . $languageExtension;
+            $exists = file_exists($path);
+
+            // Default language may be saved without language file location.
+            if (!$exists && $languageCode === $defaultCode) {
+                $languageExtension = '.md';
+                $path = $this->path . DS . $this->folder . DS . $name . $languageExtension;
+                $exists = file_exists($path);
+            }
 
+            if ($exists) {
+                $aPage = new Page();
+                $aPage->init(new SplFileInfo($path), $languageExtension);
+                $aPage->route($this->route());
+                $aPage->rawRoute($this->rawRoute());
                 $route = $aPage->header()->routes['default'] ?? $aPage->rawRoute();
                 if (!$route) {
                     $route = $aPage->route();
@@ -208,7 +303,7 @@ public function translatedLanguages($onlyPublished = false)
                     continue;
                 }
 
-                $translatedLanguages[$language] = $route;
+                $translatedLanguages[$languageCode] = $route;
             }
         }
 
@@ -219,37 +314,25 @@ public function translatedLanguages($onlyPublished = false)
      * Return an array listing untranslated languages available
      *
      * @param bool $includeUnpublished also list unpublished translations
-     *
      * @return array the page untranslated languages
      */
     public function untranslatedLanguages($includeUnpublished = false)
     {
-        $filename = substr($this->name, 0, -strlen($this->extension()));
-        $config = Grav::instance()['config'];
-        $languages = $config->get('system.languages.supported', []);
-        $untranslatedLanguages = [];
+        $grav = Grav::instance();
 
-        foreach ($languages as $language) {
-            $path = $this->path . DS . $this->folder . DS . $filename . '.' . $language . '.md';
-            if (file_exists($path)) {
-                $aPage = new Page();
-                $aPage->init(new \SplFileInfo($path), $language . '.md');
-                if ($includeUnpublished && !$aPage->published()) {
-                    $untranslatedLanguages[] = $language;
-                }
-            } else {
-                $untranslatedLanguages[] = $language;
-            }
-        }
+        /** @var Language $language */
+        $language = $grav['language'];
+
+        $languages = $language->getLanguages();
+        $translated = array_keys($this->translatedLanguages(!$includeUnpublished));
 
-        return $untranslatedLanguages;
+        return array_values(array_diff($languages, $translated));
     }
 
     /**
      * Gets and Sets the raw data
      *
-     * @param  string $var Raw content string
-     *
+     * @param  string|null $var Raw content string
      * @return string      Raw content string
      */
     public function raw($var = null)
@@ -282,7 +365,6 @@ public function raw($var = null)
      */
     public function frontmatter($var = null)
     {
-
         if ($var) {
             $this->frontmatter = (string)$var;
 
@@ -305,9 +387,8 @@ public function frontmatter($var = null)
     /**
      * Gets and Sets the header based on the YAML configuration at the top of the .md file
      *
-     * @param  object|array $var a YAML object representing the configuration for the file
-     *
-     * @return object      the current YAML configuration
+     * @param  object|array|null $var a YAML object representing the configuration for the file
+     * @return \stdClass      the current YAML configuration
      */
     public function header($var = null)
     {
@@ -337,8 +418,10 @@ public function header($var = null)
                         $frontmatterFile = CompiledYamlFile::instance($this->path . '/' . $this->folder . '/frontmatter.yaml');
                         if ($frontmatterFile->exists()) {
                             $frontmatter_data = (array)$frontmatterFile->content();
-                            $this->header = (object)array_replace_recursive($frontmatter_data,
-                                (array)$this->header);
+                            $this->header = (object)array_replace_recursive(
+                                $frontmatter_data,
+                                (array)$this->header
+                            );
                             $frontmatterFile->free();
                         }
                         // Process frontmatter with Twig if enabled
@@ -346,7 +429,7 @@ public function header($var = null)
                             $this->processFrontmatter();
                         }
                     }
-                } catch (\Exception $e) {
+                } catch (Exception $e) {
                     $file->raw(Grav::instance()['language']->translate([
                         'GRAV.FRONTMATTER_ERROR_PAGE',
                         $this->slug(),
@@ -360,8 +443,6 @@ public function header($var = null)
                 }
                 $var = true;
             }
-
-
         }
 
         if ($var) {
@@ -465,8 +546,7 @@ public function header($var = null)
     /**
      * Get page language
      *
-     * @param string $var
-     *
+     * @param string|null $var
      * @return mixed
      */
     public function language($var = null)
@@ -497,6 +577,9 @@ public function httpResponseCode()
         return (int)($this->header()->http_response_code ?? 200);
     }
 
+    /**
+     * @return array
+     */
     public function httpHeaders()
     {
         $headers = [];
@@ -529,9 +612,9 @@ public function httpHeaders()
             $headers['Last-Modified'] = $last_modified_date;
         }
 
-        // Calculate ETag based on the raw file
+        // Ask Grav to calculate ETag from the final content.
         if ($this->eTag()) {
-            $headers['ETag'] = '"' . md5($this->raw() . $this->modified()).'"';
+            $headers['ETag'] = '1';
         }
 
         // Set Vary: Accept-Encoding header
@@ -539,16 +622,19 @@ public function httpHeaders()
             $headers['Vary'] = 'Accept-Encoding';
         }
 
-        return $headers;
+
+        // Added new Headers event
+        $headers_obj = (object) $headers;
+        Grav::instance()->fireEvent('onPageHeaders', new Event(['headers' => $headers_obj]));
+
+        return (array)$headers_obj;
     }
 
     /**
      * Get the summary.
      *
-     * @param  int $size Max summary size.
-     *
+     * @param int|null $size Max summary size.
      * @param bool $textOnly Only count text size.
-     *
      * @return string
      */
     public function summary($size = null, $textOnly = false)
@@ -568,8 +654,7 @@ public function summary($size = null, $textOnly = false)
             $content = $textOnly ? strip_tags($this->content()) : $this->content();
             $summary_size = $this->summary_size;
         } else {
-            $content = strip_tags($this->summary);
-            // Use mb_strwidth to deal with the 2 character widths characters
+            $content = $textOnly ? strip_tags($this->summary) : $this->summary;
             $summary_size = mb_strwidth($content, 'utf-8');
         }
 
@@ -580,7 +665,7 @@ public function summary($size = null, $textOnly = false)
             return $content;
         }
         if (($format === 'short') && isset($summary_size)) {
-            // Use mb_strimwidth to slice the string
+            // Slice the string
             if (mb_strwidth($content, 'utf8') > $summary_size) {
                 return mb_substr($content, 0, $summary_size);
             }
@@ -608,12 +693,12 @@ public function summary($size = null, $textOnly = false)
                 return $content;
             }
 
-            return mb_strimwidth($content, 0, $size, '...', 'utf-8');
+            return mb_strimwidth($content, 0, $size, '…', 'UTF-8');
         }
 
         $summary = Utils::truncateHtml($content, $size);
 
-        return html_entity_decode($summary);
+        return html_entity_decode($summary, ENT_COMPAT | ENT_HTML401, 'UTF-8');
     }
 
     /**
@@ -629,8 +714,7 @@ public function setSummary($summary)
     /**
      * Gets and Sets the content based on content portion of the .md file
      *
-     * @param  string $var Content
-     *
+     * @param  string|null $var Content
      * @return string      Content
      */
     public function content($var = null)
@@ -659,7 +743,7 @@ public function content($var = null)
             // Load cached content
             /** @var Cache $cache */
             $cache = Grav::instance()['cache'];
-            $cache_id = md5('page' . $this->id());
+            $cache_id = md5('page' . $this->getCacheKey());
             $content_obj = $cache->fetch($cache_id);
 
             if (is_array($content_obj)) {
@@ -673,14 +757,20 @@ public function content($var = null)
             $process_markdown = $this->shouldProcess('markdown');
             $process_twig = $this->shouldProcess('twig') || $this->modularTwig();
 
-            $cache_enable = $this->header->cache_enable ?? $config->get('system.cache.enabled',
-                true);
-            $twig_first = $this->header->twig_first ?? $config->get('system.pages.twig_first',
-                true);
+            $cache_enable = $this->header->cache_enable ?? $config->get(
+                'system.cache.enabled',
+                true
+            );
+            $twig_first = $this->header->twig_first ?? $config->get(
+                'system.pages.twig_first',
+                false
+            );
 
             // never cache twig means it's always run after content
-            $never_cache_twig = $this->header->never_cache_twig ?? $config->get('system.pages.never_cache_twig',
-                false);
+            $never_cache_twig = $this->header->never_cache_twig ?? $config->get(
+                'system.pages.never_cache_twig',
+                true
+            );
 
             // if no cached-content run everything
             if ($never_cache_twig) {
@@ -703,7 +793,6 @@ public function content($var = null)
                 if ($process_twig) {
                     $this->processTwig();
                 }
-
             } else {
                 if ($this->content === false || $cache_enable === false) {
                     $this->content = $this->raw_content;
@@ -719,10 +808,9 @@ public function content($var = null)
 
                         // Content Processed but not cached yet
                         Grav::instance()->fireEvent('onPageContentProcessed', new Event(['page' => $this]));
-
                     } else {
                         if ($process_markdown) {
-                            $this->processMarkdown();
+                            $this->processMarkdown($process_twig);
                         }
 
                         // Content Processed but not cached yet
@@ -772,7 +860,7 @@ public function contentMeta()
      * Add an entry to the page's contentMeta array
      *
      * @param string $name
-     * @param string $value
+     * @param mixed $value
      */
     public function addContentMeta($name, $value)
     {
@@ -784,16 +872,12 @@ public function addContentMeta($name, $value)
      *
      * @param string|null $name
      *
-     * @return string
+     * @return mixed|null
      */
     public function getContentMeta($name = null)
     {
         if ($name) {
-            if (isset($this->content_meta[$name])) {
-                return $this->content_meta[$name];
-            }
-
-            return null;
+            return $this->content_meta[$name] ?? null;
         }
 
         return $this->content_meta;
@@ -813,8 +897,11 @@ public function setContentMeta($content_meta)
 
     /**
      * Process the Markdown content.  Uses Parsedown or Parsedown Extra depending on configuration
+     *
+     * @param bool $keepTwig If true, content between twig tags will not be processed.
+     * @return void
      */
-    protected function processMarkdown()
+    protected function processMarkdown(bool $keepTwig = false)
     {
         /** @var Config $config */
         $config = Grav::instance()['config'];
@@ -846,26 +933,57 @@ protected function processMarkdown()
             $parsedown = new Parsedown($excerpts);
         }
 
-        $this->content = $parsedown->text($this->content);
+        $content = $this->content;
+        if ($keepTwig) {
+            $token = [
+                '/' . Utils::generateRandomString(3),
+                Utils::generateRandomString(3) . '/'
+            ];
+            // Base64 encode any twig.
+            $content = preg_replace_callback(
+                ['/({#.*?#})/mu', '/({{.*?}})/mu', '/({%.*?%})/mu'],
+                static function ($matches) use ($token) { return $token[0] . base64_encode($matches[1]) . $token[1]; },
+                $content
+            );
+        }
+
+        $content = $parsedown->text($content);
+
+        if ($keepTwig) {
+            // Base64 decode the encoded twig.
+            $content = preg_replace_callback(
+                ['`' . $token[0] . '([A-Za-z0-9+/]+={0,2})' . $token[1] . '`mu'],
+                static function ($matches) { return base64_decode($matches[1]); },
+                $content
+            );
+        }
+
+        $this->content = $content;
     }
 
 
     /**
      * Process the Twig page content.
+     *
+     * @return void
      */
     private function processTwig()
     {
+        /** @var Twig $twig */
         $twig = Grav::instance()['twig'];
         $this->content = $twig->processPage($this, $this->content);
     }
 
     /**
      * Fires the onPageContentProcessed event, and caches the page content using a unique ID for the page
+     *
+     * @return void
      */
     public function cachePageContent()
     {
+        /** @var Cache $cache */
         $cache = Grav::instance()['cache'];
-        $cache_id = md5('page' . $this->id());
+        $cache_id = md5('page' . $this->getCacheKey());
         $cache->save($cache_id, ['content' => $this->content, 'content_meta' => $this->content_meta]);
     }
 
@@ -882,7 +1000,8 @@ public function getRawContent()
     /**
      * Needed by the onPageContentProcessed event to set the raw page content
      *
-     * @param string $content
+     * @param string|null $content
+     * @return void
      */
     public function setRawContent($content)
     {
@@ -894,7 +1013,6 @@ public function setRawContent($content)
      *
      * @param string $name Variable name.
      * @param mixed $default
-     *
      * @return mixed
      */
     public function value($name, $default = null)
@@ -922,13 +1040,16 @@ public function value($name, $default = null)
             return $this->slug();
         }
         if ($name === 'name') {
+            $name = $this->name();
             $language = $this->language() ? '.' . $this->language() : '';
-            $name_val = str_replace($language . '.md', '', $this->name());
-            if ($this->modular()) {
-                return 'modular/' . $name_val;
+            $pattern = '%(' . preg_quote($language, '%') . ')?\.md$%';
+            $name = preg_replace($pattern, '', $name);
+
+            if ($this->isModule()) {
+                return 'modular/' . $name;
             }
 
-            return $name_val;
+            return $name;
         }
         if ($name === 'media') {
             return $this->media()->all();
@@ -975,7 +1096,6 @@ public function value($name, $default = null)
      * Gets and Sets the Page raw content
      *
      * @param string|null $var
-     *
      * @return string
      */
     public function rawMarkdown($var = null)
@@ -987,6 +1107,15 @@ public function rawMarkdown($var = null)
         return $this->raw_content;
     }
 
+    /**
+     * @return bool
+     * @internal
+     */
+    public function translated(): bool
+    {
+        return $this->initialized;
+    }
+
     /**
      * Get file object to the page.
      *
@@ -1004,7 +1133,7 @@ public function file()
     /**
      * Save page if there's a file assigned to it.
      *
-     * @param bool|mixed $reorder Internal use.
+     * @param bool|array $reorder Internal use.
      */
     public function save($reorder = true)
     {
@@ -1024,6 +1153,14 @@ public function save($reorder = true)
             $this->doReorder($reorder);
         }
 
+        // We need to signal Flex Pages about the change.
+        /** @var Flex|null $flex */
+        $flex = Grav::instance()['flex'] ?? null;
+        $directory = $flex ? $flex->getDirectory('pages') : null;
+        if (null !== $directory) {
+            $directory->clearCache();
+        }
+
         $this->_original = null;
     }
 
@@ -1033,7 +1170,6 @@ public function save($reorder = true)
      * You need to call $this->save() in order to perform the move.
      *
      * @param PageInterface $parent New parent page.
-     *
      * @return $this
      */
     public function move(PageInterface $parent)
@@ -1046,10 +1182,10 @@ public function move(PageInterface $parent)
         $this->_action = 'move';
 
         if ($this->route() === $parent->route()) {
-            throw new \RuntimeException('Failed: Cannot set page parent to self');
+            throw new RuntimeException('Failed: Cannot set page parent to self');
         }
         if (Utils::startsWith($parent->rawRoute(), $this->rawRoute())) {
-            throw new \RuntimeException('Failed: Cannot set page parent to a child of current page');
+            throw new RuntimeException('Failed: Cannot set page parent to a child of current page');
         }
 
         $this->parent($parent);
@@ -1077,7 +1213,6 @@ public function move(PageInterface $parent)
      * You need to call $this->save() in order to perform the move.
      *
      * @param PageInterface $parent New parent page.
-     *
      * @return $this
      */
     public function copy(PageInterface $parent)
@@ -1117,6 +1252,17 @@ public function blueprints()
         return $blueprint;
     }
 
+    /**
+     * Returns the blueprint from the page.
+     *
+     * @param string $name Not used.
+     * @return Blueprint Returns a Blueprint.
+     */
+    public function getBlueprint(string $name = '')
+    {
+        return $this->blueprints();
+    }
+
     /**
      * Get the blueprint name for this page.  Use the blueprint form field if set
      *
@@ -1132,7 +1278,8 @@ public function blueprintName()
     /**
      * Validate page header.
      *
-     * @throws \Exception
+     * @return void
+     * @throws Exception
      */
     public function validate()
     {
@@ -1142,6 +1289,8 @@ public function validate()
 
     /**
      * Filter page header from illegal contents.
+     *
+     * @return void
      */
     public function filter()
     {
@@ -1200,97 +1349,15 @@ public function toJson()
     /**
      * @return string
      */
-    protected function getCacheKey()
+    public function getCacheKey(): string
     {
         return $this->id();
     }
 
-    /**
-     * Returns normalized list of name => form pairs.
-     *
-     * @return array
-     */
-    public function forms()
-    {
-        if (null === $this->forms) {
-            $header = $this->header();
-
-            // Call event to allow filling the page header form dynamically (e.g. use case: Comments plugin)
-            $grav = Grav::instance();
-            $grav->fireEvent('onFormPageHeaderProcessed', new Event(['page' => $this, 'header' => $header]));
-
-            $rules = $header->rules ?? null;
-            if (!\is_array($rules)) {
-                $rules = [];
-            }
-
-            $forms = [];
-
-            // First grab page.header.form
-            $form = $this->normalizeForm($header->form ?? null, null, $rules);
-            if ($form) {
-                $forms[$form['name']] = $form;
-            }
-
-            // Append page.header.forms (override singular form if it clashes)
-            $headerForms = $header->forms ?? null;
-            if (\is_array($headerForms)) {
-                foreach ($headerForms as $name => $form) {
-                    $form = $this->normalizeForm($form, $name, $rules);
-                    if ($form) {
-                        $forms[$form['name']] = $form;
-                    }
-                }
-            }
-
-            $this->forms = $forms;
-        }
-
-        return $this->forms;
-    }
-
-    /**
-     * @param array $new
-     */
-    public function addForms(array $new)
-    {
-        // Initialize forms.
-        $this->forms();
-
-        foreach ($new as $form) {
-            $form = $this->normalizeForm($form);
-            if ($form) {
-                $this->forms[$form['name']] = $form;
-            }
-        }
-    }
-
-    protected function normalizeForm($form, $name = null, array $rules = [])
-    {
-        if (!\is_array($form)) {
-            return null;
-        }
-
-        // Ignore numeric indexes on name.
-        if (!$name || (string)(int)$name === (string)$name) {
-            $name = null;
-        }
-
-        $name = $name ?? $form['name'] ?? $this->slug();
-
-        $formRules = $form['rules'] ?? null;
-        if (!\is_array($formRules)) {
-            $formRules = [];
-        }
-
-        return ['name' => $name, 'rules' => $rules + $formRules] + $form;
-    }
-
     /**
      * Gets and sets the associated media as found in the page folder.
      *
-     * @param  Media $var Representation of associated media.
-     *
+     * @param  Media|null $var Representation of associated media.
      * @return Media      Representation of associated media.
      */
     public function media($var = null)
@@ -1299,7 +1366,10 @@ public function media($var = null)
             $this->setMedia($var);
         }
 
-        return $this->getMedia();
+        /** @var Media $media */
+        $media = $this->getMedia();
+
+        return $media;
     }
 
     /**
@@ -1327,8 +1397,7 @@ public function getMediaOrder()
     /**
      * Gets and sets the name field.  If no name field is set, it will return 'default.md'.
      *
-     * @param  string $var The name of this page.
-     *
+     * @param  string|null $var The name of this page.
      * @return string      The name of this page.
      */
     public function name($var = null)
@@ -1354,8 +1423,7 @@ public function childType()
      * Gets and sets the template field. This is used to find the correct Twig template file to render.
      * If no field is set, it will return the name without the .md extension
      *
-     * @param  string $var the template name
-     *
+     * @param  string|null $var the template name
      * @return string      the template name
      */
     public function template($var = null)
@@ -1364,74 +1432,37 @@ public function template($var = null)
             $this->template = $var;
         }
         if (empty($this->template)) {
-            $this->template = ($this->modular() ? 'modular/' : '') . str_replace($this->extension(), '', $this->name());
+            $this->template = ($this->isModule() ? 'modular/' : '') . str_replace($this->extension(), '', $this->name());
         }
 
         return $this->template;
     }
 
     /**
-     * Allows a page to override the output render format, usually the extension provided
-     * in the URL. (e.g. `html`, `json`, `xml`, etc).
-     *
-     * @param null $var
+     * Allows a page to override the output render format, usually the extension provided in the URL.
+     * (e.g. `html`, `json`, `xml`, etc).
      *
-     * @return null
+     * @param string|null $var
+     * @return string
      */
     public function templateFormat($var = null)
     {
-        if ($var !== null) {
-            $this->template_format = $var;
-            return $this->template_format;
-        }
-
-        if (isset($this->template_format)) {
-            return $this->template_format;
-        }
-
-        // Set from URL extension set on page
-        $page_extension = trim($this->header->append_url_extension ?? '' , '.');
-        if (!empty($page_extension)) {
-            $this->template_format = $page_extension;
-
-            return $this->template_format;
+        if (null !== $var) {
+            $this->template_format = is_string($var) ? $var : null;
         }
 
-        // Set from uri extension
-        $uri_extension = Grav::instance()['uri']->extension();
-        if (is_string($uri_extension)) {
-            $this->template_format = $uri_extension;
-
-            return $this->template_format;
+        if (!isset($this->template_format)) {
+            $this->template_format = ltrim($this->header->append_url_extension ?? Utils::getPageFormat(), '.');
         }
 
-        // Use content negotiation via the `accept:` header
-        $http_accept = $_SERVER['HTTP_ACCEPT'] ?? null;
-        if (is_string($http_accept)) {
-            $negotiator = new Negotiator();
-
-            $supported_types = Utils::getSupportPageTypes(['html', 'json']);
-            $priorities = Utils::getMimeTypes($supported_types);
-
-            $media_type = $negotiator->getBest($http_accept, $priorities);
-            $mimetype = $media_type instanceof Accept ? $media_type->getValue() : '';
-
-            $this->template_format = Utils::getExtensionByMime($mimetype);
-
-            return $this->template_format;
-        }
-
-        // Last chance set a default type
-        $this->template_format = 'html';
         return $this->template_format;
     }
 
     /**
      * Gets and sets the extension field.
      *
-     * @param null $var
-     *
-     * @return null|string
+     * @param string|null $var
+     * @return string
      */
     public function extension($var = null)
     {
@@ -1439,7 +1470,7 @@ public function extension($var = null)
             $this->extension = $var;
         }
         if (empty($this->extension)) {
-            $this->extension = '.' . pathinfo($this->name(), PATHINFO_EXTENSION);
+            $this->extension = '.' . Utils::pathinfo($this->name(), PATHINFO_EXTENSION);
         }
 
         return $this->extension;
@@ -1468,8 +1499,7 @@ public function urlExtension()
     /**
      * Gets and sets the expires field. If not set will return the default
      *
-     * @param  int $var The new expires value.
-     *
+     * @param  int|null $var The new expires value.
      * @return int      The expires value
      */
     public function expires($var = null)
@@ -1485,8 +1515,8 @@ public function expires($var = null)
      * Gets and sets the cache-control property.  If not set it will return the default value (null)
      * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control for more details on valid options
      *
-     * @param null $var
-     * @return null
+     * @param string|null $var
+     * @return string|null
      */
     public function cacheControl($var = null)
     {
@@ -1500,8 +1530,7 @@ public function cacheControl($var = null)
     /**
      * Gets and sets the title for this Page.  If no title is set, it will use the slug() to get a name
      *
-     * @param  string $var the title of the Page
-     *
+     * @param  string|null $var the title of the Page
      * @return string      the title of the Page
      */
     public function title($var = null)
@@ -1520,8 +1549,7 @@ public function title($var = null)
      * Gets and sets the menu name for this Page.  This is the text that can be used specifically for navigation.
      * If no menu field is set, it will use the title()
      *
-     * @param  string $var the menu field for the page
-     *
+     * @param  string|null $var the menu field for the page
      * @return string      the menu field for the page
      */
     public function menu($var = null)
@@ -1539,8 +1567,7 @@ public function menu($var = null)
     /**
      * Gets and Sets whether or not this Page is visible for navigation
      *
-     * @param  bool $var true if the page is visible
-     *
+     * @param  bool|null $var true if the page is visible
      * @return bool      true if the page is visible
      */
     public function visible($var = null)
@@ -1565,8 +1592,7 @@ public function visible($var = null)
     /**
      * Gets and Sets whether or not this Page is considered published
      *
-     * @param  bool $var true if the page is published
-     *
+     * @param  bool|null $var true if the page is published
      * @return bool      true if the page is published
      */
     public function published($var = null)
@@ -1586,8 +1612,7 @@ public function published($var = null)
     /**
      * Gets and Sets the Page publish date
      *
-     * @param  string $var string representation of a date
-     *
+     * @param  string|null $var string representation of a date
      * @return int         unix timestamp representation of the date
      */
     public function publishDate($var = null)
@@ -1602,8 +1627,7 @@ public function publishDate($var = null)
     /**
      * Gets and Sets the Page unpublish date
      *
-     * @param  string $var string representation of a date
-     *
+     * @param  string|null $var string representation of a date
      * @return int|null         unix timestamp representation of the date
      */
     public function unpublishDate($var = null)
@@ -1620,8 +1644,7 @@ public function unpublishDate($var = null)
      * via a URL.
      * The page must be *routable* and *published*
      *
-     * @param  bool $var true if the page is routable
-     *
+     * @param  bool|null $var true if the page is routable
      * @return bool      true if the page is routable
      */
     public function routable($var = null)
@@ -1633,6 +1656,10 @@ public function routable($var = null)
         return $this->routable && $this->published();
     }
 
+    /**
+     * @param bool|null $var
+     * @return bool
+     */
     public function ssl($var = null)
     {
         if ($var !== null) {
@@ -1646,8 +1673,7 @@ public function ssl($var = null)
      * Gets and Sets the process setup for this Page. This is multi-dimensional array that consists of
      * a simple array of arrays with the form array("markdown"=>true) for example
      *
-     * @param  array $var an Array of name value pairs where the name is the process and value is true or false
-     *
+     * @param  array|null $var an Array of name value pairs where the name is the process and value is true or false
      * @return array      an Array of name value pairs where the name is the process and value is true or false
      */
     public function process($var = null)
@@ -1660,9 +1686,9 @@ public function process($var = null)
     }
 
     /**
-     * Returns the state of the debugger override etting for this page
+     * Returns the state of the debugger override setting for this page
      *
-     * @return mixed
+     * @return bool
      */
     public function debugger()
     {
@@ -1673,8 +1699,7 @@ public function debugger()
      * Function to merge page metadata tags and build an array of Metadata objects
      * that can then be rendered in the page.
      *
-     * @param  array $var an Array of metadata values to set
-     *
+     * @param  array|null $var an Array of metadata values to set
      * @return array      an Array of metadata values for the page
      */
     public function metadata($var = null)
@@ -1685,18 +1710,23 @@ public function metadata($var = null)
 
         // if not metadata yet, process it.
         if (null === $this->metadata) {
-            $header_tag_http_equivs = ['content-type', 'default-style', 'refresh', 'x-ua-compatible'];
+            $header_tag_http_equivs = ['content-type', 'default-style', 'refresh', 'x-ua-compatible', 'content-security-policy'];
 
             $this->metadata = [];
 
-            $metadata = [];
             // Set the Generator tag
-            $metadata['generator'] = 'GravCMS';
+            $metadata = [
+                'generator' => 'GravCMS'
+            ];
+
+            $config = Grav::instance()['config'];
+
+            $escape = !$config->get('system.strict_mode.twig_compat', false) || $config->get('system.twig.autoescape', true);
 
             // Get initial metadata for the page
-            $metadata = array_merge($metadata, Grav::instance()['config']->get('site.metadata'));
+            $metadata = array_merge($metadata, $config->get('site.metadata', []));
 
-            if (isset($this->header->metadata)) {
+            if (isset($this->header->metadata) && is_array($this->header->metadata)) {
                 // Merge any site.metadata settings in with page metadata
                 $metadata = array_merge($metadata, $this->header->metadata);
             }
@@ -1713,28 +1743,28 @@ public function metadata($var = null)
                         $this->metadata[$prop_key] = [
                             'name' => $prop_key,
                             'property' => $prop_key,
-                            'content' => htmlspecialchars($prop_value, ENT_QUOTES, 'UTF-8')
+                            'content' => $escape ? htmlspecialchars($prop_value, ENT_QUOTES | ENT_HTML5, 'UTF-8') : $prop_value
                         ];
                     }
                 } else {
                     // If it this is a standard meta data type
                     if ($value) {
-                        if (\in_array($key, $header_tag_http_equivs, true)) {
+                        if (in_array($key, $header_tag_http_equivs, true)) {
                             $this->metadata[$key] = [
                                 'http_equiv' => $key,
-                                'content' => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')
+                                'content' => $escape ? htmlspecialchars($value, ENT_COMPAT, 'UTF-8') : $value
                             ];
                         } elseif ($key === 'charset') {
-                            $this->metadata[$key] = ['charset' => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')];
+                            $this->metadata[$key] = ['charset' => $escape ? htmlspecialchars($value, ENT_QUOTES | ENT_HTML5, 'UTF-8') : $value];
                         } else {
                             // if it's a social metadata with separator, render as property
                             $separator = strpos($key, ':');
                             $hasSeparator = $separator && $separator < strlen($key) - 1;
                             $entry = [
-                                'content' => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')
+                                'content' => $escape ? htmlspecialchars($value, ENT_QUOTES | ENT_HTML5, 'UTF-8') : $value
                             ];
 
-                            if ($hasSeparator && !Utils::startsWith($key, 'twitter')) {
+                            if ($hasSeparator && !Utils::startsWith($key, ['twitter', 'flattr'])) {
                                 $entry['property'] = $key;
                             } else {
                                 $entry['name'] = $key;
@@ -1762,8 +1792,7 @@ public function resetMetadata()
      * Gets and Sets the slug for the Page. The slug is used in the URL routing. If not set it uses
      * the parent folder from the path
      *
-     * @param  string $var the slug, e.g. 'my-blog'
-     *
+     * @param  string|null $var the slug, e.g. 'my-blog'
      * @return string      the slug
      */
     public function slug($var = null)
@@ -1782,9 +1811,8 @@ public function slug($var = null)
     /**
      * Get/set order number of this page.
      *
-     * @param int $var
-     *
-     * @return int|bool
+     * @param int|null $var
+     * @return string|bool
      */
     public function order($var = null)
     {
@@ -1804,7 +1832,6 @@ public function order($var = null)
      * Gets the URL for a page - alias of url().
      *
      * @param bool $include_host
-     *
      * @return string the permalink
      */
     public function link($include_host = false)
@@ -1825,7 +1852,6 @@ public function permalink()
      * Returns the canonical URL for a page
      *
      * @param bool $include_lang
-     *
      * @return string
      */
     public function canonical($include_lang = true)
@@ -1840,7 +1866,6 @@ public function canonical($include_lang = true)
      * @param bool $canonical    True to return the canonical URL
      * @param bool $include_base Include base url on multisite as well as language code
      * @param bool $raw_route
-     *
      * @return string The url.
      */
     public function url($include_host = false, $canonical = false, $include_base = true, $raw_route = false)
@@ -1878,11 +1903,6 @@ public function url($include_host = false, $canonical = false, $include_base = t
         $uri = $grav['uri'];
         $url = $uri->rootUrl($include_host) . '/' . trim($route, '/') . $this->urlExtension();
 
-        // trim trailing / if not root
-        if ($url !== '/') {
-            $url = rtrim($url, '/');
-        }
-
         return Uri::filterPath($url);
     }
 
@@ -1890,9 +1910,8 @@ public function url($include_host = false, $canonical = false, $include_base = t
      * Gets the route for the page based on the route headers if available, else from
      * the parents route and the current Page's slug.
      *
-     * @param  string $var Set new default route.
-     *
-     * @return string  The route for the Page.
+     * @param  string|null $var Set new default route.
+     * @return string|null  The route for the Page.
      */
     public function route($var = null)
     {
@@ -1937,8 +1956,7 @@ public function unsetRouteSlug()
     /**
      * Gets and Sets the page raw route
      *
-     * @param null $var
-     *
+     * @param string|null $var
      * @return null|string
      */
     public function rawRoute($var = null)
@@ -1962,8 +1980,7 @@ public function rawRoute($var = null)
     /**
      * Gets the route aliases for the page based on page headers.
      *
-     * @param  array $var list of route aliases
-     *
+     * @param  array|null $var list of route aliases
      * @return array  The route aliases for the Page.
      */
     public function routeAliases($var = null)
@@ -1983,8 +2000,7 @@ public function routeAliases($var = null)
      * Gets the canonical route for this page if its set. If provided it will use
      * that value, else if it's `true` it will use the default route.
      *
-     * @param null $var
-     *
+     * @param string|null $var
      * @return bool|string
      */
     public function routeCanonical($var = null)
@@ -2003,12 +2019,15 @@ public function routeCanonical($var = null)
     /**
      * Gets and sets the identifier for this Page object.
      *
-     * @param  string $var the identifier
-     *
+     * @param  string|null $var the identifier
      * @return string      the identifier
      */
     public function id($var = null)
     {
+        if (null === $this->id) {
+            // We need to set unique id to avoid potential cache conflicts between pages.
+            $var = time() . md5($this->filePath());
+        }
         if ($var !== null) {
             // store unique per language
             $active_lang = Grav::instance()['language']->getLanguage() ?: '';
@@ -2022,8 +2041,7 @@ public function id($var = null)
     /**
      * Gets and sets the modified timestamp.
      *
-     * @param  int $var modified unix timestamp
-     *
+     * @param  int|null $var modified unix timestamp
      * @return int      modified unix timestamp
      */
     public function modified($var = null)
@@ -2038,9 +2056,8 @@ public function modified($var = null)
     /**
      * Gets the redirect set in the header.
      *
-     * @param  string $var redirect url
-     *
-     * @return string
+     * @param  string|null $var redirect url
+     * @return string|null
      */
     public function redirect($var = null)
     {
@@ -2048,17 +2065,16 @@ public function redirect($var = null)
             $this->redirect = $var;
         }
 
-        return $this->redirect;
+        return $this->redirect ?: null;
     }
 
     /**
      * Gets and sets the option to show the etag header for the page.
      *
-     * @param  bool $var show etag header
-     *
+     * @param  bool|null $var show etag header
      * @return bool      show etag header
      */
-    public function eTag($var = null)
+    public function eTag($var = null): bool
     {
         if ($var !== null) {
             $this->etag = $var;
@@ -2067,14 +2083,13 @@ public function eTag($var = null)
             $this->etag = (bool)Grav::instance()['config']->get('system.pages.etag');
         }
 
-        return $this->etag;
+        return $this->etag ?? false;
     }
 
     /**
      * Gets and sets the option to show the last_modified header for the page.
      *
-     * @param  bool $var show last_modified header
-     *
+     * @param  bool|null $var show last_modified header
      * @return bool      show last_modified header
      */
     public function lastModified($var = null)
@@ -2092,22 +2107,21 @@ public function lastModified($var = null)
     /**
      * Gets and sets the path to the .md file for this Page object.
      *
-     * @param  string $var the file path
-     *
+     * @param  string|null $var the file path
      * @return string|null      the file path
      */
     public function filePath($var = null)
     {
         if ($var !== null) {
             // Filename of the page.
-            $this->name = basename($var);
+            $this->name = Utils::basename($var);
             // Folder of the page.
-            $this->folder = basename(dirname($var));
+            $this->folder = Utils::basename(dirname($var));
             // Path to the page.
             $this->path = dirname($var, 2);
         }
 
-        return $this->path . '/' . $this->folder . '/' . ($this->name ?: '');
+        return rtrim($this->path . '/' . $this->folder . '/' . ($this->name() ?: ''), '/');
     }
 
     /**
@@ -2117,11 +2131,13 @@ public function filePath($var = null)
      */
     public function filePathClean()
     {
-        return str_replace(ROOT_DIR, '', $this->filePath());
+        return str_replace(GRAV_ROOT . DS, '', $this->filePath());
     }
 
     /**
      * Returns the clean path to the page file
+     *
+     * @return string
      */
     public function relativePagePath()
     {
@@ -2132,15 +2148,14 @@ public function relativePagePath()
      * Gets and sets the path to the folder where the .md for this Page object resides.
      * This is equivalent to the filePath but without the filename.
      *
-     * @param  string $var the path
-     *
+     * @param  string|null $var the path
      * @return string|null      the path
      */
     public function path($var = null)
     {
         if ($var !== null) {
             // Folder of the page.
-            $this->folder = basename($var);
+            $this->folder = Utils::basename($var);
             // Path to the page.
             $this->path = dirname($var);
         }
@@ -2151,8 +2166,7 @@ public function path($var = null)
     /**
      * Get/set the folder.
      *
-     * @param string $var Optional path
-     *
+     * @param string|null $var Optional path
      * @return string|null
      */
     public function folder($var = null)
@@ -2167,8 +2181,7 @@ public function folder($var = null)
     /**
      * Gets and sets the date for this Page object. This is typically passed in via the page headers
      *
-     * @param  string $var string representation of a date
-     *
+     * @param  string|null $var string representation of a date
      * @return int         unix timestamp representation of the date
      */
     public function date($var = null)
@@ -2188,8 +2201,7 @@ public function date($var = null)
      * Gets and sets the date format for this Page object. This is typically passed in via the page headers
      * using typical PHP date string structure - http://php.net/manual/en/function.date.php
      *
-     * @param  string $var string representation of a date format
-     *
+     * @param  string|null $var string representation of a date format
      * @return string      string representation of a date format
      */
     public function dateformat($var = null)
@@ -2204,8 +2216,7 @@ public function dateformat($var = null)
     /**
      * Gets and sets the order by which any sub-pages should be sorted.
      *
-     * @param  string $var the order, either "asc" or "desc"
-     *
+     * @param  string|null $var the order, either "asc" or "desc"
      * @return string      the order, either "asc" or "desc"
      * @deprecated 1.6
      */
@@ -2232,8 +2243,7 @@ public function orderDir($var = null)
      * date - is the order based on the date set in the pages
      * folder - is the order based on the name of the folder with any numerics omitted
      *
-     * @param  string $var supported options include "default", "title", "date", and "folder"
-     *
+     * @param  string|null $var supported options include "default", "title", "date", and "folder"
      * @return string      supported options include "default", "title", "date", and "folder"
      * @deprecated 1.6
      */
@@ -2251,8 +2261,7 @@ public function orderBy($var = null)
     /**
      * Gets the manual order set in the header.
      *
-     * @param  string $var supported options include "default", "title", "date", and "folder"
-     *
+     * @param  string|null $var supported options include "default", "title", "date", and "folder"
      * @return array
      * @deprecated 1.6
      */
@@ -2271,8 +2280,7 @@ public function orderManual($var = null)
      * Gets and sets the maxCount field which describes how many sub-pages should be displayed if the
      * sub_pages header property is set for this page object.
      *
-     * @param  int $var the maximum number of sub-pages
-     *
+     * @param  int|null $var the maximum number of sub-pages
      * @return int      the maximum number of sub-pages
      * @deprecated 1.6
      */
@@ -2295,19 +2303,18 @@ public function maxCount($var = null)
     /**
      * Gets and sets the taxonomy array which defines which taxonomies this page identifies itself with.
      *
-     * @param  array $var an array of taxonomies
-     *
+     * @param  array|null $var an array of taxonomies
      * @return array      an array of taxonomies
      */
     public function taxonomy($var = null)
     {
         if ($var !== null) {
             // make sure first level are arrays
-            array_walk($var, function(&$value) {
+            array_walk($var, static function (&$value) {
                 $value = (array) $value;
             });
             // make sure all values are strings
-            array_walk_recursive($var, function(&$value) {
+            array_walk_recursive($var, static function (&$value) {
                 $value = (string) $value;
             });
             $this->taxonomy = $var;
@@ -2319,12 +2326,14 @@ public function taxonomy($var = null)
     /**
      * Gets and sets the modular var that helps identify this page is a modular child
      *
-     * @param  bool $var true if modular_twig
-     *
+     * @param  bool|null $var true if modular_twig
      * @return bool      true if modular_twig
+     * @deprecated 1.7 Use ->isModule() or ->modularTwig() method instead.
      */
     public function modular($var = null)
     {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, use ->isModule() or ->modularTwig() method instead', E_USER_DEPRECATED);
+
         return $this->modularTwig($var);
     }
 
@@ -2332,8 +2341,7 @@ public function modular($var = null)
      * Gets and sets the modular_twig var that helps identify this page as a modular child page that will need
      * twig processing handled differently from a regular page.
      *
-     * @param  bool $var true if modular_twig
-     *
+     * @param  bool|null $var true if modular_twig
      * @return bool      true if modular_twig
      */
     public function modularTwig($var = null)
@@ -2349,14 +2357,13 @@ public function modularTwig($var = null)
             }
         }
 
-        return $this->modular_twig;
+        return $this->modular_twig ?? false;
     }
 
     /**
      * Gets the configured state of the processing method.
      *
      * @param  string $process the process, eg "twig" or "markdown"
-     *
      * @return bool            whether or not the processing method is enabled for this Page
      */
     public function shouldProcess($process)
@@ -2367,8 +2374,7 @@ public function shouldProcess($process)
     /**
      * Gets and Sets the parent object for this page
      *
-     * @param  PageInterface $var the parent page object
-     *
+     * @param  PageInterface|null $var the parent page object
      * @return PageInterface|null the parent page object if it exists.
      */
     public function parent(PageInterface $var = null)
@@ -2386,17 +2392,13 @@ public function parent(PageInterface $var = null)
     }
 
     /**
-     * Gets the top parent object for this page
+     * Gets the top parent object for this page. Can return page itself.
      *
-     * @return PageInterface|null the top parent page object if it exists.
+     * @return PageInterface The top parent page object.
      */
     public function topParent()
     {
-        $topParent = $this->parent();
-
-        if (!$topParent) {
-            return null;
-        }
+        $topParent = $this;
 
         while (true) {
             $theParent = $topParent->parent();
@@ -2413,7 +2415,7 @@ public function topParent()
     /**
      * Returns children of this page.
      *
-     * @return Collection
+     * @return PageCollectionInterface|Collection
      */
     public function children()
     {
@@ -2480,8 +2482,7 @@ public function nextSibling()
      * Returns the adjacent sibling based on a direction.
      *
      * @param  int $direction either -1 or +1
-     *
-     * @return PageInterface|bool             the sibling page
+     * @return PageInterface|false             the sibling page
      */
     public function adjacentSibling($direction = 1)
     {
@@ -2497,7 +2498,7 @@ public function adjacentSibling($direction = 1)
     /**
      * Returns the item in the current position.
      *
-     * @return int   the index of the current page.
+     * @return int|null   The index of the current page.
      */
     public function currentPosition()
     {
@@ -2531,21 +2532,23 @@ public function active()
      */
     public function activeChild()
     {
-        $uri = Grav::instance()['uri'];
-        $pages = Grav::instance()['pages'];
+        $grav = Grav::instance();
+        /** @var Uri $uri */
+        $uri = $grav['uri'];
+        /** @var Pages $pages */
+        $pages = $grav['pages'];
         $uri_path = rtrim(urldecode($uri->path()), '/');
-        $routes = Grav::instance()['pages']->routes();
+        $routes = $pages->routes();
 
         if (isset($routes[$uri_path])) {
-            /** @var PageInterface $child_page */
-            $child_page = $pages->dispatch($uri->route())->parent();
-            if ($child_page) {
-                while (!$child_page->root()) {
-                    if ($this->path() === $child_page->path()) {
-                        return true;
-                    }
-                    $child_page = $child_page->parent();
+            $page = $pages->find($uri->route());
+            /** @var PageInterface|null $child_page */
+            $child_page = $page ? $page->parent() : null;
+            while ($child_page && !$child_page->root()) {
+                if ($this->path() === $child_page->path()) {
+                    return true;
                 }
+                $child_page = $child_page->parent();
             }
         }
 
@@ -2577,8 +2580,7 @@ public function root()
     /**
      * Helper method to return an ancestor page.
      *
-     * @param bool $lookup Name of the parent folder
-     *
+     * @param bool|null $lookup Name of the parent folder
      * @return PageInterface page you were looking for if it exists
      */
     public function ancestor($lookup = null)
@@ -2594,12 +2596,11 @@ public function ancestor($lookup = null)
      * page object is returned.
      *
      * @param string $field Name of the parent folder
-     *
      * @return PageInterface
      */
     public function inherited($field)
     {
-        list($inherited, $currentParams) = $this->getInheritedParams($field);
+        [$inherited, $currentParams] = $this->getInheritedParams($field);
 
         $this->modifyHeader($field, $currentParams);
 
@@ -2616,7 +2617,7 @@ public function inherited($field)
      */
     public function inheritedField($field)
     {
-        list($inherited, $currentParams) = $this->getInheritedParams($field);
+        [$inherited, $currentParams] = $this->getInheritedParams($field);
 
         return $currentParams;
     }
@@ -2625,7 +2626,6 @@ public function inheritedField($field)
      * Method that contains shared logic for inherited() and inheritedField()
      *
      * @param string $field Name of the parent folder
-     *
      * @return array
      */
     protected function getInheritedParams($field)
@@ -2665,327 +2665,52 @@ public function find($url, $all = false)
      * @param string|array $params
      * @param bool $pagination
      *
-     * @return Collection
-     * @throws \InvalidArgumentException
+     * @return PageCollectionInterface|Collection
+     * @throws InvalidArgumentException
      */
     public function collection($params = 'content', $pagination = true)
     {
         if (is_string($params)) {
+            // Look into a page header field.
             $params = (array)$this->value('header.' . $params);
         } elseif (!is_array($params)) {
-            throw new \InvalidArgumentException('Argument should be either header variable name or array of parameters');
-        }
-
-        if (!isset($params['items'])) {
-            return new Collection();
-        }
-
-        // See if require published filter is set and use that, if assume published=true
-        $only_published = true;
-        if (isset($params['filter']['published']) && $params['filter']['published']) {
-            $only_published = false;
-        } elseif (isset($params['filter']['non-published']) && $params['filter']['non-published']) {
-            $only_published = false;
-        }
-
-        $collection = $this->evaluate($params['items'], $only_published);
-        if (!$collection instanceof Collection) {
-            $collection = new Collection();
-        }
-        $collection->setParams($params);
-
-        /** @var Uri $uri */
-        $uri = Grav::instance()['uri'];
-        /** @var Config $config */
-        $config = Grav::instance()['config'];
-
-        $process_taxonomy = $params['url_taxonomy_filters'] ?? $config->get('system.pages.url_taxonomy_filters');
-
-        if ($process_taxonomy) {
-            foreach ((array)$config->get('site.taxonomies') as $taxonomy) {
-                if ($uri->param(rawurlencode($taxonomy))) {
-                    $items = explode(',', $uri->param($taxonomy));
-                    $collection->setParams(['taxonomies' => [$taxonomy => $items]]);
-
-                    foreach ($collection as $page) {
-                        // Don't filter modular pages
-                        if ($page->modular()) {
-                            continue;
-                        }
-                        foreach ($items as $item) {
-                            $item = rawurldecode($item);
-                            if (empty($page->taxonomy[$taxonomy]) || !\in_array(htmlspecialchars_decode($item, ENT_QUOTES), $page->taxonomy[$taxonomy], true)
-                            ) {
-                                $collection->remove($page->path());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // If  a filter or filters are set, filter the collection...
-        if (isset($params['filter'])) {
-
-            // remove any inclusive sets from filer:
-            $sets = ['published', 'visible', 'modular', 'routable'];
-            foreach ($sets as $type) {
-                $var = "non-{$type}";
-                if (isset($params['filter'][$type], $params['filter'][$var]) && $params['filter'][$type] && $params['filter'][$var]) {
-                    unset ($params['filter'][$type], $params['filter'][$var]);
-                }
-            }
-
-            foreach ((array)$params['filter'] as $type => $filter) {
-                switch ($type) {
-                    case 'published':
-                        if ((bool) $filter) {
-                            $collection->published();
-                        }
-                        break;
-                    case 'non-published':
-                        if ((bool) $filter) {
-                            $collection->nonPublished();
-                        }
-                        break;
-                    case 'visible':
-                        if ((bool) $filter) {
-                            $collection->visible();
-                        }
-                        break;
-                    case 'non-visible':
-                        if ((bool) $filter) {
-                            $collection->nonVisible();
-                        }
-                        break;
-                    case 'modular':
-                        if ((bool) $filter) {
-                            $collection->modular();
-                        }
-                        break;
-                    case 'non-modular':
-                        if ((bool) $filter) {
-                            $collection->nonModular();
-                        }
-                        break;
-                    case 'routable':
-                        if ((bool) $filter) {
-                            $collection->routable();
-                        }
-                        break;
-                    case 'non-routable':
-                        if ((bool) $filter) {
-                            $collection->nonRoutable();
-                        }
-                        break;
-                    case 'type':
-                        $collection->ofType($filter);
-                        break;
-                    case 'types':
-                        $collection->ofOneOfTheseTypes($filter);
-                        break;
-                    case 'access':
-                        $collection->ofOneOfTheseAccessLevels($filter);
-                        break;
-                }
-            }
-        }
-
-        if (isset($params['dateRange'])) {
-            $start = $params['dateRange']['start'] ?? 0;
-            $end = $params['dateRange']['end'] ?? false;
-            $field = $params['dateRange']['field'] ?? false;
-            $collection->dateRange($start, $end, $field);
+            throw new InvalidArgumentException('Argument should be either header variable name or array of parameters');
         }
 
-        if (isset($params['order'])) {
-            $by = $params['order']['by'] ?? 'default';
-            $dir = $params['order']['dir'] ?? 'asc';
-            $custom = $params['order']['custom'] ?? null;
-            $sort_flags = $params['order']['sort_flags'] ?? null;
-
-            if (is_array($sort_flags)) {
-                $sort_flags = array_map('constant', $sort_flags); //transform strings to constant value
-                $sort_flags = array_reduce($sort_flags, function ($a, $b) {
-                    return $a | $b;
-                }, 0); //merge constant values using bit or
-            }
-
-            $collection->order($by, $dir, $custom, $sort_flags);
-        }
-
-        /** @var Grav $grav */
-        $grav = Grav::instance();
-
-        // New Custom event to handle things like pagination.
-        $grav->fireEvent('onCollectionProcessed', new Event(['collection' => $collection]));
-
-        // Slice and dice the collection if pagination is required
-        if ($pagination) {
-            $params = $collection->params();
-
-            $limit = $params['limit'] ?? 0;
-            $start = !empty($params['pagination']) ? ($uri->currentPage() - 1) * $limit : 0;
+        $params['filter'] = ($params['filter'] ?? []) + ['translated' => true];
+        $context = [
+            'pagination' => $pagination,
+            'self' => $this
+        ];
 
-            if ($limit && $collection->count() > $limit) {
-                $collection->slice($start, $limit);
-            }
-        }
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
 
-        return $collection;
+        return $pages->getCollection($params, $context);
     }
 
     /**
      * @param string|array $value
      * @param bool $only_published
-     * @return mixed
+     * @return PageCollectionInterface|Collection
      */
     public function evaluate($value, $only_published = true)
     {
-        // Parse command.
-        if (is_string($value)) {
-            // Format: @command.param
-            $cmd = $value;
-            $params = [];
-        } elseif (is_array($value) && count($value) == 1 && !is_int(key($value))) {
-            // Format: @command.param: { attr1: value1, attr2: value2 }
-            $cmd = (string)key($value);
-            $params = (array)current($value);
-        } else {
-            $result = [];
-            foreach ((array)$value as $key => $val) {
-                if (is_int($key)) {
-                    $result = $result + $this->evaluate($val)->toArray();
-                } else {
-                    $result = $result + $this->evaluate([$key => $val])->toArray();
-                }
-
-            }
-
-            return new Collection($result);
-        }
+        $params = [
+            'items' => $value,
+            'published' => $only_published
+        ];
+        $context = [
+            'event' => false,
+            'pagination' => false,
+            'url_taxonomy_filters' => false,
+            'self' => $this
+        ];
 
         /** @var Pages $pages */
         $pages = Grav::instance()['pages'];
 
-        $parts = explode('.', $cmd);
-        $current = array_shift($parts);
-
-        /** @var Collection $results */
-        $results = new Collection();
-
-        switch ($current) {
-            case 'self@':
-            case '@self':
-                if (!empty($parts)) {
-                    switch ($parts[0]) {
-                        case 'modular':
-                            // @self.modular: false (alternative to @self.children)
-                            if (!empty($params) && $params[0] === false) {
-                                $results = $this->children()->nonModular();
-                                break;
-                            }
-                            $results = $this->children()->modular();
-                            break;
-                        case 'children':
-                            $results = $this->children()->nonModular();
-                            break;
-                        case 'all':
-                            $results = $this->children();
-                            break;
-                        case 'parent':
-                            $collection = new Collection();
-                            $results = $collection->addPage($this->parent());
-                            break;
-                        case 'siblings':
-                            if (!$this->parent()) {
-                                return new Collection();
-                            }
-                            $results = $this->parent()->children()->remove($this->path());
-                            break;
-                        case 'descendants':
-                            $results = $pages->all($this)->remove($this->path())->nonModular();
-                            break;
-                    }
-                }
-
-
-                break;
-
-            case 'page@':
-            case '@page':
-                $page = null;
-
-                if (!empty($params)) {
-                    $page = $this->find($params[0]);
-                }
-
-                // safety check in case page is not found
-                if (!isset($page)) {
-                    return $results;
-                }
-
-                // Handle a @page.descendants
-                if (!empty($parts)) {
-                    switch ($parts[0]) {
-                        case 'modular':
-                            $results = new Collection();
-                            foreach ($page->children() as $child) {
-                                $results = $results->addPage($child);
-                            }
-                            $results->modular();
-                            break;
-                        case 'page':
-                        case 'self':
-                            $results = new Collection();
-                            $results = $results->addPage($page);
-                            break;
-
-                        case 'descendants':
-                            $results = $pages->all($page)->remove($page->path())->nonModular();
-                            break;
-
-                        case 'children':
-                            $results = $page->children()->nonModular();
-                            break;
-                    }
-                } else {
-                    $results = $page->children()->nonModular();
-                }
-
-                break;
-
-            case 'root@':
-            case '@root':
-                if (!empty($parts) && $parts[0] === 'descendants') {
-                    $results = $pages->all($pages->root())->nonModular();
-                } else {
-                    $results = $pages->root()->children()->nonModular();
-                }
-                break;
-
-            case 'taxonomy@':
-            case '@taxonomy':
-                // Gets a collection of pages by using one of the following formats:
-                // @taxonomy.category: blog
-                // @taxonomy.category: [ blog, featured ]
-                // @taxonomy: { category: [ blog, featured ], level: 1 }
-
-                /** @var Taxonomy $taxonomy_map */
-                $taxonomy_map = Grav::instance()['taxonomy'];
-
-                if (!empty($parts)) {
-                    $params = [implode('.', $parts) => $params];
-                }
-                $results = $taxonomy_map->findTaxonomy($params);
-                break;
-        }
-
-        if ($only_published) {
-            $results = $results->published();
-        }
-
-        return $results;
+        return $pages->getCollection($params, $context);
     }
 
     /**
@@ -3012,6 +2737,14 @@ public function isDir()
         return !$this->isPage();
     }
 
+    /**
+     * @return bool
+     */
+    public function isModule(): bool
+    {
+        return $this->modularTwig();
+    }
+
     /**
      * Returns whether the page exists in the filesystem.
      *
@@ -3038,7 +2771,6 @@ public function folderExists()
      * Cleans the path.
      *
      * @param  string $path the path
-     *
      * @return string       the path
      */
     protected function cleanPath($path)
@@ -3103,8 +2835,8 @@ protected function doReorder($new_order)
      * Moves or copies the page in filesystem.
      *
      * @internal
-     *
-     * @throws \Exception
+     * @return void
+     * @throws Exception
      */
     protected function doRelocation()
     {
@@ -3126,9 +2858,11 @@ protected function doRelocation()
                 rename($path . '/' . $this->_original->name(), $path . '/' . $this->name());
             }
         }
-
     }
 
+    /**
+     * @return void
+     */
     protected function setPublishState()
     {
         // Handle publishing dates if no explicit published option set
@@ -3150,6 +2884,10 @@ protected function setPublishState()
         }
     }
 
+    /**
+     * @param string $route
+     * @return string
+     */
     protected function adjustRouteCase($route)
     {
         $case_insensitive = Grav::instance()['config']->get('system.force_lowercase_urls');
@@ -3164,16 +2902,16 @@ protected function adjustRouteCase($route)
      */
     public function getOriginal()
     {
-      return $this->_original;
+        return $this->_original;
     }
 
     /**
      * Gets the action.
      *
-     * @return string The Action string.
+     * @return string|null The Action string.
      */
     public function getAction()
     {
-      return $this->_action;
+        return $this->_action;
     }
 }
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index cd0dcc09de..6e2d14f298 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -3,130 +3,155 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page;
 
+use Exception;
+use FilesystemIterator;
 use Grav\Common\Cache;
 use Grav\Common\Config\Config;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\Blueprints;
+use Grav\Common\Debugger;
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\Flex\Types\Pages\PageCollection;
+use Grav\Common\Flex\Types\Pages\PageIndex;
 use Grav\Common\Grav;
 use Grav\Common\Language\Language;
+use Grav\Common\Page\Interfaces\PageCollectionInterface;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Taxonomy;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
+use Grav\Framework\Flex\Flex;
+use Grav\Framework\Flex\FlexDirectory;
+use Grav\Framework\Flex\Interfaces\FlexTranslateInterface;
+use Grav\Framework\Flex\Pages\FlexPageObject;
 use Grav\Plugin\Admin;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use SplFileInfo;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Whoops\Exception\ErrorException;
 use Collator;
+use function array_key_exists;
+use function array_search;
+use function count;
+use function dirname;
+use function extension_loaded;
+use function in_array;
+use function is_array;
+use function is_int;
+use function is_string;
 
+/**
+ * Class Pages
+ * @package Grav\Common\Page
+ */
 class Pages
 {
-    /**
-     * @var Grav
-     */
-    protected $grav;
-
-    /**
-     * @var array|PageInterface[]
-     */
-    protected $instances;
+    /** @var FlexDirectory|null */
+    private $directory;
 
-    /**
-     * @var array|string[]
-     */
+    /** @var Grav */
+    protected $grav;
+    /** @var array<PageInterface> */
+    protected $instances = [];
+    /** @var array<PageInterface|string> */
+    protected $index = [];
+    /** @var array */
     protected $children;
-
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $base = '';
-
-    /**
-     * @var array|string[]
-     */
+    /** @var string[] */
     protected $baseRoute = [];
-
-    /**
-     * @var array|string[]
-     */
+    /** @var string[] */
     protected $routes = [];
-
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $sort;
-
-    /**
-     * @var Blueprints
-     */
+    /** @var Blueprints */
     protected $blueprints;
-
-    /**
-     * @var int
-     */
+    /** @var bool */
+    protected $enable_pages = true;
+    /** @var int */
     protected $last_modified;
-
-    /**
-     * @var array|string[]
-     */
+    /** @var string[] */
     protected $ignore_files;
-
-    /**
-     * @var array|string[]
-     */
+    /** @var string[] */
     protected $ignore_folders;
-
-    /**
-     * @var bool
-     */
+    /** @var bool */
     protected $ignore_hidden;
-
     /** @var string */
     protected $check_method;
-
+    /** @var string */
+    protected $simple_pages_hash;
+    /** @var string */
     protected $pages_cache_id;
-
+    /** @var bool */
     protected $initialized = false;
+    /** @var string */
+    protected $active_lang;
+    /** @var bool */
+    protected $fire_events = false;
+    /** @var Types|null */
+    protected static $types;
+    /** @var string|null */
+    protected static $home_route;
+
 
     /**
-     * @var Types
+     * Constructor
+     *
+     * @param Grav $grav
      */
-    static protected $types;
+    public function __construct(Grav $grav)
+    {
+        $this->grav = $grav;
+    }
 
     /**
-     * @var string
+     * @return FlexDirectory|null
      */
-    static protected $home_route;
+    public function getDirectory(): ?FlexDirectory
+    {
+        return $this->directory;
+    }
 
     /**
-     * Constructor
-     *
-     * @param Grav $c
+     * Method used in admin to disable frontend pages from being initialized.
      */
-    public function __construct(Grav $c)
+    public function disablePages(): void
     {
-        $this->grav = $c;
+        $this->enable_pages = false;
+    }
+
+    /**
+     * Method used in admin to later load frontend pages.
+     */
+    public function enablePages(): void
+    {
+        if (!$this->enable_pages) {
+            $this->enable_pages = true;
+
+            $this->init();
+        }
     }
 
     /**
      * Get or set base path for the pages.
      *
-     * @param  string $path
-     *
+     * @param  string|null $path
      * @return string
      */
     public function base($path = null)
     {
         if ($path !== null) {
             $path = trim($path, '/');
-            $this->base = $path ? '/' . $path : null;
+            $this->base = $path ? '/' . $path : '';
             $this->baseRoute = [];
         }
 
@@ -137,13 +162,12 @@ public function base($path = null)
      *
      * Get base route for Grav pages.
      *
-     * @param  string $lang     Optional language code for multilingual routes.
-     *
+     * @param  string|null $lang     Optional language code for multilingual routes.
      * @return string
      */
     public function baseRoute($lang = null)
     {
-        $key = $lang ?: 'default';
+        $key = $lang ?: $this->active_lang ?: 'default';
 
         if (!isset($this->baseRoute[$key])) {
             /** @var Language $language */
@@ -163,8 +187,7 @@ public function baseRoute($lang = null)
      * Get route for Grav site.
      *
      * @param  string $route    Optional route to the page.
-     * @param  string $lang     Optional language code for multilingual links.
-     *
+     * @param  string|null $lang     Optional language code for multilingual links.
      * @return string
      */
     public function route($route = '/', $lang = null)
@@ -176,13 +199,64 @@ public function route($route = '/', $lang = null)
         return $this->baseRoute($lang) . $route;
     }
 
+    /**
+     * Get relative referrer route and language code. Returns null if the route isn't within the current base, language (if set) and route.
+     *
+     * @example `$langCode = null; $referrer = $pages->referrerRoute($langCode, '/admin');` returns relative referrer url within /admin and updates $langCode
+     * @example `$langCode = 'en'; $referrer = $pages->referrerRoute($langCode, '/admin');` returns relative referrer url within the /en/admin
+     *
+     * @param string|null $langCode Variable to store the language code. If already set, check only against that language.
+     * @param string $route Optional route within the site.
+     * @return string|null
+     * @since 1.7.23
+     */
+    public function referrerRoute(?string &$langCode, string $route = '/'): ?string
+    {
+        $referrer = $_SERVER['HTTP_REFERER'] ?? null;
+
+        // Start by checking that referrer came from our site.
+        $root = $this->grav['base_url_absolute'];
+        if (!is_string($referrer) || !str_starts_with($referrer, $root)) {
+            return null;
+        }
+
+        /** @var Language $language */
+        $language = $this->grav['language'];
+
+        // Get all language codes and append no language.
+        if (null === $langCode) {
+            $languages = $language->enabled() ? $language->getLanguages() : [];
+            $languages[] = '';
+        } else {
+            $languages[] = $langCode;
+        }
+
+        $path_base = rtrim($this->base(), '/');
+        $path_route = rtrim($route, '/');
+
+        // Try to figure out the language code.
+        foreach ($languages as $code) {
+            $path_lang = $code ? "/{$code}" : '';
+
+            $base = $path_base . $path_lang . $path_route;
+            if ($referrer === $base || str_starts_with($referrer, "{$base}/")) {
+                if (null === $langCode) {
+                    $langCode = $code;
+                }
+
+                return substr($referrer, \strlen($base));
+            }
+        }
+
+        return null;
+    }
+
     /**
      *
      * Get base URL for Grav pages.
      *
-     * @param  string     $lang     Optional language code for multilingual links.
+     * @param  string|null $lang     Optional language code for multilingual links.
      * @param  bool|null  $absolute If true, return absolute url, if false, return relative url. Otherwise return default.
-     *
      * @return string
      */
     public function baseUrl($lang = null, $absolute = null)
@@ -202,9 +276,8 @@ public function baseUrl($lang = null, $absolute = null)
      *
      * Get home URL for Grav site.
      *
-     * @param  string $lang     Optional language code for multilingual links.
-     * @param  bool   $absolute If true, return absolute url, if false, return relative url. Otherwise return default.
-     *
+     * @param  string|null $lang     Optional language code for multilingual links.
+     * @param  bool|null   $absolute If true, return absolute url, if false, return relative url. Otherwise return default.
      * @return string
      */
     public function homeUrl($lang = null, $absolute = null)
@@ -217,9 +290,8 @@ public function homeUrl($lang = null, $absolute = null)
      * Get URL for Grav site.
      *
      * @param  string $route    Optional route to the page.
-     * @param  string $lang     Optional language code for multilingual links.
-     * @param  bool   $absolute If true, return absolute url, if false, return relative url. Otherwise return default.
-     *
+     * @param  string|null $lang     Optional language code for multilingual links.
+     * @param  bool|null   $absolute If true, return absolute url, if false, return relative url. Otherwise return default.
      * @return string
      */
     public function url($route = '/', $lang = null, $absolute = null)
@@ -231,26 +303,56 @@ public function url($route = '/', $lang = null, $absolute = null)
         return $this->baseUrl($lang, $absolute) . Uri::filterPath($route);
     }
 
-    public function setCheckMethod($method)
+    /**
+     * @param string $method
+     * @return void
+     */
+    public function setCheckMethod($method): void
     {
         $this->check_method = strtolower($method);
     }
 
+    /**
+     * @return void
+     */
+    public function register(): void
+    {
+        $config = $this->grav['config'];
+        $type = $config->get('system.pages.type');
+        if ($type === 'flex') {
+            $this->initFlexPages();
+        }
+    }
+
+    /**
+     * Reset pages (used in search indexing etc).
+     *
+     * @return void
+     */
+    public function reset(): void
+    {
+        $this->initialized = false;
+
+        $this->init();
+    }
+
     /**
      * Class initialization. Must be called before using this class.
      */
-    public function init()
+    public function init(): void
     {
         if ($this->initialized) {
             return;
         }
 
         $config = $this->grav['config'];
-        $this->ignore_files = $config->get('system.pages.ignore_files');
-        $this->ignore_folders = $config->get('system.pages.ignore_folders');
-        $this->ignore_hidden = $config->get('system.pages.ignore_hidden');
+        $this->ignore_files = (array)$config->get('system.pages.ignore_files');
+        $this->ignore_folders = (array)$config->get('system.pages.ignore_folders');
+        $this->ignore_hidden = (bool)$config->get('system.pages.ignore_hidden');
+        $this->fire_events = (bool)$config->get('system.pages.events.page');
 
         $this->instances = [];
+        $this->index = [];
         $this->children = [];
         $this->routes = [];
 
@@ -258,14 +360,22 @@ public function init()
             $this->setCheckMethod($config->get('system.cache.check.method', 'file'));
         }
 
+        if ($this->enable_pages === false) {
+            $page = $this->buildRootPage();
+            $this->instances[$page->path()] = $page;
+
+            return;
+        }
+
         $this->buildPages();
+
+        $this->initialized = true;
     }
 
     /**
      * Get or set last modification time.
      *
-     * @param int $modified
-     *
+     * @param int|null $modified
      * @return int|null
      */
     public function lastModified($modified = null)
@@ -280,11 +390,19 @@ public function lastModified($modified = null)
     /**
      * Returns a list of all pages.
      *
-     * @return array|PageInterface[]
+     * @return PageInterface[]
      */
     public function instances()
     {
-        return $this->instances;
+        $instances = [];
+        foreach ($this->index as $path => $instance) {
+            $page = $this->get($path);
+            if ($page) {
+                $instances[$path] = $page;
+            }
+        }
+
+        return $instances;
     }
 
     /**
@@ -301,29 +419,352 @@ public function routes()
      * Adds a page and assigns a route to it.
      *
      * @param PageInterface   $page  Page to be added.
-     * @param string $route Optional route (uses route from the object if not set).
+     * @param string|null $route Optional route (uses route from the object if not set).
      */
-    public function addPage(PageInterface $page, $route = null)
+    public function addPage(PageInterface $page, $route = null): void
     {
-        if (!isset($this->instances[$page->path()])) {
-            $this->instances[$page->path()] = $page;
+        $path = $page->path() ?? '';
+        if (!isset($this->index[$path])) {
+            $this->index[$path] = $page;
+            $this->instances[$path] = $page;
         }
         $route = $page->route($route);
-        if ($page->parent()) {
-            $this->children[$page->parent()->path()][$page->path()] = ['slug' => $page->slug()];
+        $parent = $page->parent();
+        if ($parent) {
+            $this->children[$parent->path() ?? ''][$path] = ['slug' => $page->slug()];
         }
-        $this->routes[$route] = $page->path();
+        $this->routes[$route] = $path;
 
         $this->grav->fireEvent('onPageProcessed', new Event(['page' => $page]));
     }
 
+    /**
+     * Get a collection of pages in the given context.
+     *
+     * @param array $params
+     * @param array $context
+     * @return PageCollectionInterface|Collection
+     */
+    public function getCollection(array $params = [], array $context = [])
+    {
+        if (!isset($params['items'])) {
+            return new Collection();
+        }
+
+        /** @var Config $config */
+        $config = $this->grav['config'];
+
+        $context += [
+            'event' => true,
+            'pagination' => true,
+            'url_taxonomy_filters' => $config->get('system.pages.url_taxonomy_filters'),
+            'taxonomies' => (array)$config->get('site.taxonomies'),
+            'pagination_page' => 1,
+            'self' => null,
+        ];
+
+        // Include taxonomies from the URL if requested.
+        $process_taxonomy = $params['url_taxonomy_filters'] ?? $context['url_taxonomy_filters'];
+        if ($process_taxonomy) {
+            /** @var Uri $uri */
+            $uri = $this->grav['uri'];
+            foreach ($context['taxonomies'] as $taxonomy) {
+                $param = $uri->param(rawurlencode($taxonomy));
+                $items = is_string($param) ? explode(',', $param) : [];
+                foreach ($items as $item) {
+                    $params['taxonomies'][$taxonomy][] = htmlspecialchars_decode(rawurldecode($item), ENT_QUOTES);
+                }
+            }
+        }
+
+        $pagination = $params['pagination'] ?? $context['pagination'];
+        if ($pagination && !isset($params['page'], $params['start'])) {
+            /** @var Uri $uri */
+            $uri = $this->grav['uri'];
+            $context['current_page'] = $uri->currentPage();
+        }
+
+        $collection = $this->evaluate($params['items'], $context['self']);
+        $collection->setParams($params);
+
+        // Filter by taxonomies.
+        foreach ($params['taxonomies'] ?? [] as $taxonomy => $items) {
+            foreach ($collection as $page) {
+                // Don't include modules
+                if ($page->isModule()) {
+                    continue;
+                }
+
+                $test = $page->taxonomy()[$taxonomy] ?? [];
+                foreach ($items as $item) {
+                    if (!$test || !in_array($item, $test, true)) {
+                        $collection->remove($page->path());
+                    }
+                }
+            }
+        }
+
+        $filters = $params['filter'] ?? [];
+
+        // Assume published=true if not set.
+        if (!isset($filters['published']) && !isset($filters['non-published'])) {
+            $filters['published'] = true;
+        }
+
+        // Remove any inclusive sets from filter.
+        $sets = ['published', 'visible', 'modular', 'routable'];
+        foreach ($sets as $type) {
+            $nonType = "non-{$type}";
+            if (isset($filters[$type], $filters[$nonType]) && $filters[$type] === $filters[$nonType]) {
+                if (!$filters[$type]) {
+                    // Both options are false, return empty collection as nothing can match the filters.
+                    return new Collection();
+                }
+
+                // Both options are true, remove opposite filters as all pages will match the filters.
+                unset($filters[$type], $filters[$nonType]);
+            }
+        }
+
+        // Filter the collection
+        foreach ($filters as $type => $filter) {
+            if (null === $filter) {
+                continue;
+            }
+
+            // Convert non-type to type.
+            if (str_starts_with($type, 'non-')) {
+                $type = substr($type, 4);
+                $filter = !$filter;
+            }
+
+            switch ($type) {
+                case 'translated':
+                    if ($filter) {
+                        $collection = $collection->translated();
+                    } else {
+                        $collection = $collection->nonTranslated();
+                    }
+                    break;
+                case 'published':
+                    if ($filter) {
+                        $collection = $collection->published();
+                    } else {
+                        $collection = $collection->nonPublished();
+                    }
+                    break;
+                case 'visible':
+                    if ($filter) {
+                        $collection = $collection->visible();
+                    } else {
+                        $collection = $collection->nonVisible();
+                    }
+                    break;
+                case 'page':
+                    if ($filter) {
+                        $collection = $collection->pages();
+                    } else {
+                        $collection = $collection->modules();
+                    }
+                    break;
+                case 'module':
+                case 'modular':
+                    if ($filter) {
+                        $collection = $collection->modules();
+                    } else {
+                        $collection = $collection->pages();
+                    }
+                    break;
+                case 'routable':
+                    if ($filter) {
+                        $collection = $collection->routable();
+                    } else {
+                        $collection = $collection->nonRoutable();
+                    }
+                    break;
+                case 'type':
+                    $collection = $collection->ofType($filter);
+                    break;
+                case 'types':
+                    $collection = $collection->ofOneOfTheseTypes($filter);
+                    break;
+                case 'access':
+                    $collection = $collection->ofOneOfTheseAccessLevels($filter);
+                    break;
+            }
+        }
+
+        if (isset($params['dateRange'])) {
+            $start = $params['dateRange']['start'] ?? null;
+            $end = $params['dateRange']['end'] ?? null;
+            $field = $params['dateRange']['field'] ?? null;
+            $collection = $collection->dateRange($start, $end, $field);
+        }
+
+        if (isset($params['order'])) {
+            $by = $params['order']['by'] ?? 'default';
+            $dir = $params['order']['dir'] ?? 'asc';
+            $custom = $params['order']['custom'] ?? null;
+            $sort_flags = $params['order']['sort_flags'] ?? null;
+
+            if (is_array($sort_flags)) {
+                $sort_flags = array_map('constant', $sort_flags); //transform strings to constant value
+                $sort_flags = array_reduce($sort_flags, static function ($a, $b) {
+                    return $a | $b;
+                }, 0); //merge constant values using bit or
+            }
+
+            $collection = $collection->order($by, $dir, $custom, $sort_flags);
+        }
+
+        // New Custom event to handle things like pagination.
+        if ($context['event']) {
+            $this->grav->fireEvent('onCollectionProcessed', new Event(['collection' => $collection, 'context' => $context]));
+        }
+
+        if ($context['pagination']) {
+            // Slice and dice the collection if pagination is required
+            $params = $collection->params();
+
+            $limit = (int)($params['limit'] ?? 0);
+            $page = (int)($params['page'] ?? $context['current_page'] ?? 0);
+            $start = (int)($params['start'] ?? 0);
+            $start = $limit > 0 && $page > 0 ? ($page - 1) * $limit : max(0, $start);
+
+            if ($start || ($limit && $collection->count() > $limit)) {
+                $collection->slice($start, $limit ?: null);
+            }
+        }
+
+        return $collection;
+    }
+
+    /**
+     * @param array|string $value
+     * @param PageInterface|null $self
+     * @return Collection
+     */
+    protected function evaluate($value, PageInterface $self = null)
+    {
+        // Parse command.
+        if (is_string($value)) {
+            // Format: @command.param
+            $cmd = $value;
+            $params = [];
+        } elseif (is_array($value) && count($value) === 1 && !is_int(key($value))) {
+            // Format: @command.param: { attr1: value1, attr2: value2 }
+            $cmd = (string)key($value);
+            $params = (array)current($value);
+        } else {
+            $result = [];
+            foreach ((array)$value as $key => $val) {
+                if (is_int($key)) {
+                    $result = $result + $this->evaluate($val, $self)->toArray();
+                } else {
+                    $result = $result + $this->evaluate([$key => $val], $self)->toArray();
+                }
+            }
+
+            return new Collection($result);
+        }
+
+        $parts = explode('.', $cmd);
+        $scope = array_shift($parts);
+        $type = $parts[0] ?? null;
+
+        /** @var PageInterface|null $page */
+        $page = null;
+        switch ($scope) {
+            case 'self@':
+            case '@self':
+                $page = $self;
+                break;
+
+            case 'page@':
+            case '@page':
+                $page = isset($params[0]) ? $this->find($params[0]) : null;
+                break;
+
+            case 'root@':
+            case '@root':
+                $page = $this->root();
+                break;
+
+            case 'taxonomy@':
+            case '@taxonomy':
+                // Gets a collection of pages by using one of the following formats:
+                // @taxonomy.category: blog
+                // @taxonomy.category: [ blog, featured ]
+                // @taxonomy: { category: [ blog, featured ], level: 1 }
+
+                /** @var Taxonomy $taxonomy_map */
+                $taxonomy_map = Grav::instance()['taxonomy'];
+
+                if (!empty($parts)) {
+                    $params = [implode('.', $parts) => $params];
+                }
+
+                return $taxonomy_map->findTaxonomy($params);
+        }
+
+        if (!$page) {
+            return new Collection();
+        }
+
+        // Handle '@page', '@page.modular: false', '@self' and '@self.modular: false'.
+        if (null === $type || (in_array($type, ['modular', 'modules']) && ($params[0] ?? null) === false)) {
+            $type = 'children';
+        }
+
+        switch ($type) {
+            case 'all':
+                $collection = $page->children();
+                break;
+            case 'modules':
+            case 'modular':
+                $collection = $page->children()->modules();
+                break;
+            case 'pages':
+            case 'children':
+                $collection = $page->children()->pages();
+                break;
+            case 'page':
+            case 'self':
+                $collection = !$page->root() ? (new Collection())->addPage($page) : new Collection();
+                break;
+            case 'parent':
+                $parent = $page->parent();
+                $collection = new Collection();
+                $collection = $parent ? $collection->addPage($parent) : $collection;
+                break;
+            case 'siblings':
+                $parent = $page->parent();
+                if ($parent) {
+                    /** @var Collection $collection */
+                    $collection = $parent->children();
+                    $collection = $collection->remove($page->path());
+                } else {
+                    $collection = new Collection();
+                }
+                break;
+            case 'descendants':
+                $collection = $this->all($page)->remove($page->path())->pages();
+                break;
+            default:
+                // Unknown type; return empty collection.
+                $collection = new Collection();
+                break;
+        }
+
+        return $collection;
+    }
+
     /**
      * Sort sub-pages in a page.
      *
      * @param PageInterface   $page
-     * @param string $order_by
-     * @param string $order_dir
-     *
+     * @param string|null $order_by
+     * @param string|null $order_dir
      * @return array
      */
     public function sort(PageInterface $page, $order_by = null, $order_dir = null, $sort_flags = null)
@@ -336,6 +777,10 @@ public function sort(PageInterface $page, $order_by = null, $order_dir = null, $
         }
 
         $path = $page->path();
+        if (null === $path) {
+            return [];
+        }
+
         $children = $this->children[$path] ?? [];
 
         if (!$children) {
@@ -357,11 +802,10 @@ public function sort(PageInterface $page, $order_by = null, $order_dir = null, $
 
     /**
      * @param Collection $collection
-     * @param string|int $orderBy
+     * @param string     $orderBy
      * @param string     $orderDir
      * @param array|null $orderManual
      * @param int|null   $sort_flags
-     *
      * @return array
      * @internal
      */
@@ -384,27 +828,70 @@ public function sortCollection(Collection $collection, $orderBy, $orderDir = 'as
         }
 
         return $sort;
-
     }
 
     /**
      * Get a page instance.
      *
      * @param  string $path The filesystem full path of the page
-     *
-     * @return PageInterface
-     * @throws \Exception
+     * @return PageInterface|null
+     * @throws RuntimeException
      */
     public function get($path)
     {
-        return $this->instances[(string)$path] ?? null;
+        $path = (string)$path;
+        if ($path === '') {
+            return null;
+        }
+
+        // Check for local instances first.
+        if (array_key_exists($path, $this->instances)) {
+            return $this->instances[$path];
+        }
+
+        $instance = $this->index[$path] ?? null;
+        if (is_string($instance)) {
+            if ($this->directory) {
+                /** @var Language $language */
+                $language = $this->grav['language'];
+                $lang = $language->getActive();
+                if ($lang) {
+                    $languages = $language->getFallbackLanguages($lang, true);
+                    $key = $instance;
+                    $instance = null;
+                    foreach ($languages as $code) {
+                        $test = $code ? $key . ':' . $code : $key;
+                        if (($instance = $this->directory->getObject($test, 'flex_key')) !== null) {
+                            break;
+                        }
+                    }
+                } else {
+                    $instance = $this->directory->getObject($instance, 'flex_key');
+                }
+            }
+
+            if ($instance instanceof PageInterface) {
+                if ($this->fire_events && method_exists($instance, 'initialize')) {
+                    $instance->initialize();
+                }
+            } else {
+                /** @var Debugger $debugger */
+                $debugger = $this->grav['debugger'];
+                $debugger->addMessage(sprintf('Flex page %s is missing or broken!', $instance), 'debug');
+            }
+        }
+
+        if ($instance) {
+            $this->instances[$path] = $instance;
+        }
+
+        return $instance;
     }
 
     /**
      * Get children of the path.
      *
      * @param string $path
-     *
      * @return Collection
      */
     public function children($path)
@@ -418,14 +905,13 @@ public function children($path)
      * Get a page ancestor.
      *
      * @param  string $route The relative URL of the page
-     * @param  string $path The relative path of the ancestor folder
-     *
+     * @param  string|null $path The relative path of the ancestor folder
      * @return PageInterface|null
      */
     public function ancestor($route, $path = null)
     {
         if ($path !== null) {
-            $page = $this->dispatch($route, true);
+            $page = $this->find($route, true);
 
             if ($page && $page->path() === $path) {
                 return $page;
@@ -444,15 +930,13 @@ public function ancestor($route, $path = null)
      * Get a page ancestor trait.
      *
      * @param  string $route The relative route of the page
-     * @param  string $field The field name of the ancestor to query for
-     *
+     * @param  string|null $field The field name of the ancestor to query for
      * @return PageInterface|null
      */
     public function inherited($route, $field = null)
     {
         if ($field !== null) {
-
-            $page = $this->dispatch($route, true);
+            $page = $this->find($route, true);
 
             $parent = $page ? $page->parent() : null;
             if ($parent && $parent->value('header.' . $field) !== null) {
@@ -467,97 +951,151 @@ public function inherited($route, $field = null)
     }
 
     /**
-     * alias method to return find a page.
-     *
-     * @param string $route The relative URL of the page
-     * @param bool   $all
+     * Find a page based on route.
      *
+     * @param string $route The route of the page
+     * @param bool   $all   If true, return also non-routable pages, otherwise return null if page isn't routable
      * @return PageInterface|null
      */
     public function find($route, $all = false)
     {
-        return $this->dispatch($route, $all, false);
+        $route = urldecode((string)$route);
+
+        // Fetch page if there's a defined route to it.
+        $path = $this->routes[$route] ?? null;
+        $page = null !== $path ? $this->get($path) : null;
+
+        // Try without trailing slash
+        if (null === $page && Utils::endsWith($route, '/')) {
+            $path = $this->routes[rtrim($route, '/')] ?? null;
+            $page = null !== $path ? $this->get($path) : null;
+        }
+
+        if (!$all && !isset($this->grav['admin'])) {
+            if (null === $page || !$page->routable()) {
+                // If the page cannot be accessed, look for the site wide routes and wildcards.
+                $page = $this->findSiteBasedRoute($route) ?? $page;
+            }
+        }
+
+        return $page;
+    }
+
+    /**
+     * Check site based routes.
+     *
+     * @param string $route
+     * @return PageInterface|null
+     */
+    protected function findSiteBasedRoute($route)
+    {
+        /** @var Config $config */
+        $config = $this->grav['config'];
+
+        $site_routes = $config->get('site.routes');
+        if (!is_array($site_routes)) {
+            return null;
+        }
+
+        $page = null;
+
+        // See if route matches one in the site configuration
+        $site_route = $site_routes[$route] ?? null;
+        if ($site_route) {
+            $page = $this->find($site_route);
+        } else {
+            // Use reverse order because of B/C (previously matched multiple and returned the last match).
+            foreach (array_reverse($site_routes, true) as $pattern => $replace) {
+                $pattern = '#^' . str_replace('/', '\/', ltrim($pattern, '^')) . '#';
+                try {
+                    $found = preg_replace($pattern, $replace, $route);
+                    if ($found && $found !== $route) {
+                        $page = $this->find($found);
+                        if ($page) {
+                            return $page;
+                        }
+                    }
+                } catch (ErrorException $e) {
+                    $this->grav['log']->error('site.routes: ' . $pattern . '-> ' . $e->getMessage());
+                }
+            }
+        }
+
+        return $page;
     }
 
     /**
      * Dispatch URI to a page.
      *
      * @param string $route The relative URL of the page
-     * @param bool $all
-     *
-     * @param bool $redirect
+     * @param bool $all If true, return also non-routable pages, otherwise return null if page isn't routable
+     * @param bool $redirect If true, allow redirects
      * @return PageInterface|null
-     * @throws \Exception
+     * @throws Exception
      */
     public function dispatch($route, $all = false, $redirect = true)
     {
-        $route = urldecode($route);
+        $page = $this->find($route, true);
 
-        // Fetch page if there's a defined route to it.
-        $page = isset($this->routes[$route]) ? $this->get($this->routes[$route]) : null;
-        // Try without trailing slash
-        if (!$page && Utils::endsWith($route, '/')) {
-            $page = isset($this->routes[rtrim($route, '/')]) ? $this->get($this->routes[rtrim($route, '/')]) : null;
+        // If we want all pages or are in admin, return what we already have.
+        if ($all || isset($this->grav['admin'])) {
+            return $page;
         }
 
-        // Are we in the admin? this is important!
-        $not_admin = !isset($this->grav['admin']);
+        if ($page) {
+            $routable = $page->routable();
+            if ($redirect) {
+                if ($page->redirect()) {
+                    // Follow a redirect page.
+                    $this->grav->redirectLangSafe($page->redirect());
+                }
 
-        // If the page cannot be reached, look into site wide redirects, routes + wildcards
-        if (!$all && $not_admin) {
+                if (!$routable) {
+                    /** @var Collection $children */
+                    $children = $page->children()->visible()->routable()->published();
+                    $child = $children->first();
+                    if ($child !== null) {
+                        // Redirect to the first visible child as current page isn't routable.
+                        $this->grav->redirectLangSafe($child->route());
+                    }
+                }
+            }
 
-            // If the page is a simple redirect, just do it.
-            if ($redirect && $page && $page->redirect()) {
-                $this->grav->redirectLangSafe($page->redirect());
+            if ($routable) {
+                return $page;
             }
+        }
 
-            // fall back and check site based redirects
-            if (!$page || ($page && !$page->routable())) {
-                /** @var Config $config */
-                $config = $this->grav['config'];
+        $route = urldecode((string)$route);
 
-                // See if route matches one in the site configuration
-                $site_route = $config->get("site.routes.{$route}");
-                if ($site_route) {
-                    $page = $this->dispatch($site_route, $all);
-                } else {
+        // The page cannot be reached, look into site wide redirects, routes and wildcards.
+        $redirectedPage = $this->findSiteBasedRoute($route);
+        if ($redirectedPage) {
+            $page = $this->dispatch($redirectedPage->route(), false, $redirect);
+        }
 
-                    /** @var Uri $uri */
-                    $uri = $this->grav['uri'];
-                    /** @var \Grav\Framework\Uri\Uri $source_url */
-                    $source_url = $uri->uri(false);
-
-                    // Try Regex style redirects
-                    $site_redirects = $config->get('site.redirects');
-                    if (is_array($site_redirects)) {
-                        foreach ((array)$site_redirects as $pattern => $replace) {
-                            $pattern = '#^' . str_replace('/', '\/', ltrim($pattern, '^')) . '#';
-                            try {
-                                $found = preg_replace($pattern, $replace, $source_url);
-                                if ($found !== $source_url) {
-                                    $this->grav->redirectLangSafe($found);
-                                }
-                            } catch (ErrorException $e) {
-                                $this->grav['log']->error('site.redirects: ' . $pattern . '-> ' . $e->getMessage());
-                            }
-                        }
-                    }
+        /** @var Config $config */
+        $config = $this->grav['config'];
 
-                    // Try Regex style routes
-                    $site_routes = $config->get('site.routes');
-                    if (is_array($site_routes)) {
-                        foreach ((array)$site_routes as $pattern => $replace) {
-                            $pattern = '#^' . str_replace('/', '\/', ltrim($pattern, '^')) . '#';
-                            try {
-                                $found = preg_replace($pattern, $replace, $source_url);
-                                if ($found !== $source_url) {
-                                    $page = $this->dispatch($found, $all);
-                                }
-                            } catch (ErrorException $e) {
-                                $this->grav['log']->error('site.routes: ' . $pattern . '-> ' . $e->getMessage());
-                            }
-                        }
+        /** @var Uri $uri */
+        $uri = $this->grav['uri'];
+        /** @var \Grav\Framework\Uri\Uri $source_url */
+        $source_url = $uri->uri(false);
+
+        // Try Regex style redirects
+        $site_redirects = $config->get('site.redirects');
+        if (is_array($site_redirects)) {
+            foreach ((array)$site_redirects as $pattern => $replace) {
+                $pattern = ltrim($pattern, '^');
+                $pattern = '#^' . str_replace('/', '\/', $pattern) . '#';
+                try {
+                    /** @var string $found */
+                    $found = preg_replace($pattern, $replace, $source_url);
+                    if ($found && $found !== $source_url) {
+                        $this->grav->redirectLangSafe($found);
                     }
+                } catch (ErrorException $e) {
+                    $this->grav['log']->error('site.redirects: ' . $pattern . '-> ' . $e->getMessage());
                 }
             }
         }
@@ -569,20 +1107,26 @@ public function dispatch($route, $all = false, $redirect = true)
      * Get root page.
      *
      * @return PageInterface
+     * @throws RuntimeException
      */
     public function root()
     {
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
 
-        return $this->instances[rtrim($locator->findResource('page://'), DS)];
+        $path = $locator->findResource('page://');
+        $root = is_string($path) ? $this->get(rtrim($path, '/')) : null;
+        if (null === $root) {
+            throw new RuntimeException('Internal error');
+        }
+
+        return $root;
     }
 
     /**
      * Get a blueprint for a page type.
      *
      * @param  string $type
-     *
      * @return Blueprint
      */
     public function blueprints($type)
@@ -593,13 +1137,13 @@ public function blueprints($type)
 
         try {
             $blueprint = $this->blueprints->get($type);
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
             $blueprint = $this->blueprints->get('default');
         }
 
         if (empty($blueprint->initialized)) {
-            $this->grav->fireEvent('onBlueprintCreated', new Event(['blueprint' => $blueprint, 'type' => $type]));
             $blueprint->initialized = true;
+            $this->grav->fireEvent('onBlueprintCreated', new Event(['blueprint' => $blueprint, 'type' => $type]));
         }
 
         return $blueprint;
@@ -608,9 +1152,8 @@ public function blueprints($type)
     /**
      * Get all pages
      *
-     * @param PageInterface $current
-     *
-     * @return \Grav\Common\Page\Collection
+     * @param PageInterface|null $current
+     * @return Collection
      */
     public function all(PageInterface $current = null)
     {
@@ -646,7 +1189,6 @@ public static function parentsRawRoutes()
      * Get available parents routes
      *
      * @param bool $rawRoutes get the raw route or the normal route
-     *
      * @return array
      */
     private static function getParents($rawRoutes)
@@ -669,19 +1211,17 @@ private static function getParents($rawRoutes)
             if (isset($parents[$page_route])) {
                 unset($parents[$page_route]);
             }
-
         }
 
         return $parents;
     }
 
     /**
-     * Get list of route/title of all pages.
+     * Get list of route/title of all pages. Title is in HTML.
      *
-     * @param PageInterface $current
+     * @param PageInterface|null $current
      * @param int $level
      * @param bool $rawRoutes
-     *
      * @param bool $showAll
      * @param bool $showFullpath
      * @param bool $showSlug
@@ -693,7 +1233,7 @@ public function getList(PageInterface $current = null, $level = 0, $rawRoutes =
     {
         if (!$current) {
             if ($level) {
-                throw new \RuntimeException('Internal error');
+                throw new RuntimeException('Internal error');
             }
 
             $current = $this->root();
@@ -709,22 +1249,18 @@ public function getList(PageInterface $current = null, $level = 0, $rawRoutes =
             }
 
             if ($showFullpath) {
-                $option = $current->route();
+                $option = htmlspecialchars($current->route());
             } else {
                 $extra  = $showSlug ? '(' . $current->slug() . ') ' : '';
-                $option = str_repeat('&mdash;-', $level). '&rtrif; ' . $extra . $current->title();
-
-
+                $option = str_repeat('&mdash;-', $level). '&rtrif; ' . $extra . htmlspecialchars($current->title());
             }
 
             $list[$route] = $option;
-
-
         }
 
         if ($limitLevels === false || ($level+1 < $limitLevels)) {
             foreach ($current->children() as $next) {
-                if ($showAll || $next->routable() || ($next->modular() && $showModular)) {
+                if ($showAll || $next->routable() || ($next->isModule() && $showModular)) {
                     $list = array_merge($list, $this->getList($next, $level + 1, $rawRoutes, $showAll, $showFullpath, $showSlug, $showModular, $limitLevels));
                 }
             }
@@ -740,23 +1276,38 @@ public function getList(PageInterface $current = null, $level = 0, $rawRoutes =
      */
     public static function getTypes()
     {
-        if (!self::$types) {
+        if (null === self::$types) {
             $grav = Grav::instance();
 
-            $scanBlueprintsAndTemplates = function () use ($grav) {
+            /** @var UniformResourceLocator $locator */
+            $locator = $grav['locator'];
+
+            // Prevent calls made before theme:// has been initialized (happens when upgrading old version of Admin plugin).
+            if (!$locator->isStream('theme://')) {
+                return new Types();
+            }
+
+            $scanBlueprintsAndTemplates = static function (Types $types) use ($grav) {
                 // Scan blueprints
                 $event = new Event();
-                $event->types = self::$types;
+                $event->types = $types;
                 $grav->fireEvent('onGetPageBlueprints', $event);
 
-                self::$types->scanBlueprints('theme://blueprints/');
+                $types->init();
+
+                // Try new location first.
+                $lookup = 'theme://blueprints/pages/';
+                if (!is_dir($lookup)) {
+                    $lookup = 'theme://blueprints/';
+                }
+                $types->scanBlueprints($lookup);
 
                 // Scan templates
                 $event = new Event();
-                $event->types = self::$types;
+                $event->types = $types;
                 $grav->fireEvent('onGetPageTemplates', $event);
 
-                self::$types->scanTemplates('theme://templates/');
+                $types->scanTemplates('theme://templates/');
             };
 
             if ($grav['config']->get('system.cache.enabled')) {
@@ -765,22 +1316,21 @@ public static function getTypes()
 
                 // Use cached types if possible.
                 $types_cache_id = md5('types');
-                self::$types = $cache->fetch($types_cache_id);
+                $types = $cache->fetch($types_cache_id);
 
-                if (!self::$types) {
-                    self::$types = new Types();
-                    $scanBlueprintsAndTemplates();
-                    $cache->save($types_cache_id, self::$types);
+                if (!$types instanceof Types) {
+                    $types = new Types();
+                    $scanBlueprintsAndTemplates($types);
+                    $cache->save($types_cache_id, $types);
                 }
-
             } else {
-                self::$types = new Types();
-                $scanBlueprintsAndTemplates();
+                $types = new Types();
+                $scanBlueprintsAndTemplates($types);
             }
 
             // Register custom paths to the locator.
             $locator = $grav['locator'];
-            foreach (self::$types as $type => $paths) {
+            foreach ($types as $type => $paths) {
                 foreach ($paths as $k => $path) {
                     if (strpos($path, 'blueprints://') === 0) {
                         unset($paths[$k]);
@@ -790,6 +1340,8 @@ public static function getTypes()
                     $locator->addPath('blueprints', "pages/$type.yaml", $paths);
                 }
             }
+
+            self::$types = $types;
         }
 
         return self::$types;
@@ -822,22 +1374,26 @@ public static function modularTypes()
     /**
      * Get template types based on page type (standard or modular)
      *
+     * @param string|null $type
      * @return array
      */
-    public static function pageTypes()
+    public static function pageTypes($type = null)
     {
-        if (isset(Grav::instance()['admin'])) {
+        if (null === $type && isset(Grav::instance()['admin'])) {
             /** @var Admin $admin */
             $admin = Grav::instance()['admin'];
 
-            /** @var PageInterface $page */
-            $page = $admin->getPage($admin->route);
+            /** @var PageInterface|null $page */
+            $page = $admin->page();
 
-            if ($page && $page->modular()) {
-                return static::modularTypes();
-            }
+            $type = $page && $page->isModule() ? 'modular' : 'standard';
+        }
 
-            return static::types();
+        switch ($type) {
+            case 'standard':
+                return static::types();
+            case 'modular':
+                return static::modularTypes();
         }
 
         return [];
@@ -852,10 +1408,10 @@ public function accessLevels()
     {
         $accessLevels = [];
         foreach ($this->all() as $page) {
-            if (isset($page->header()->access)) {
-                if (\is_array($page->header()->access)) {
+            if ($page instanceof PageInterface && isset($page->header()->access)) {
+                if (is_array($page->header()->access)) {
                     foreach ($page->header()->access as $index => $accessLevel) {
-                        if (\is_array($accessLevel)) {
+                        if (is_array($accessLevel)) {
                             foreach ($accessLevel as $innerIndex => $innerAccessLevel) {
                                 $accessLevels[] = $innerIndex;
                             }
@@ -884,8 +1440,6 @@ public static function parents()
         return self::getParents($rawRoutes);
     }
 
-
-
     /**
      * Gets the home route
      *
@@ -919,7 +1473,6 @@ public static function getHomeRoute()
                     } catch (ErrorException $e) {
                         $home = $home_aliases[$default];
                     }
-
                 }
             }
 
@@ -931,38 +1484,245 @@ public static function getHomeRoute()
 
     /**
      * Needed for testing where we change the home route via config
+     *
+     * @return string|null
      */
     public static function resetHomeRoute()
     {
         self::$home_route = null;
+
         return self::getHomeRoute();
     }
 
+    protected function initFlexPages(): void
+    {
+        /** @var Debugger $debugger */
+        $debugger = $this->grav['debugger'];
+        $debugger->addMessage('Pages: Flex Directory');
+
+        /** @var Flex $flex */
+        $flex = $this->grav['flex'];
+        $directory = $flex->getDirectory('pages');
+
+        /** @var EventDispatcher $dispatcher */
+        $dispatcher = $this->grav['events'];
+
+        // Stop /admin/pages from working, display error instead.
+        $dispatcher->addListener(
+            'onAdminPage',
+            static function (Event $event) use ($directory) {
+                $grav = Grav::instance();
+                $admin = $grav['admin'];
+                [$base,$location,] = $admin->getRouteDetails();
+                if ($location !== 'pages' || isset($grav['flex_objects'])) {
+                    return;
+                }
+
+                /** @var PageInterface $page */
+                $page = $event['page'];
+                $page->init(new SplFileInfo('plugin://admin/pages/admin/error.md'));
+                $page->routable(true);
+                $header = $page->header();
+                $header->title = 'Please install missing plugin';
+                $page->content("## Please install and enable **[Flex Objects]({$base}/plugins/flex-objects)** plugin. It is required to edit **Flex Pages**.");
+
+                /** @var Header $header */
+                $header = $page->header();
+                $menu = $directory->getConfig('admin.menu.list');
+                $header->access = $menu['authorize'] ?? ['admin.super'];
+            },
+            100000
+        );
+
+        $this->directory = $directory;
+    }
+
     /**
      * Builds pages.
      *
      * @internal
      */
-    protected function buildPages()
+    protected function buildPages(): void
     {
-        $this->sort = [];
+        /** @var Debugger $debugger */
+        $debugger = $this->grav['debugger'];
+        $debugger->startTimer('build-pages', 'Init frontend routes');
 
+        if ($this->directory) {
+            $this->buildFlexPages($this->directory);
+        } else {
+            $this->buildRegularPages();
+        }
+        $debugger->stopTimer('build-pages');
+    }
+
+    protected function buildFlexPages(FlexDirectory $directory): void
+    {
         /** @var Config $config */
         $config = $this->grav['config'];
 
+        // TODO: right now we are just emulating normal pages, it is inefficient and bad... but works!
+        /** @var PageCollection|PageIndex $collection */
+        $collection = $directory->getIndex(null, 'storage_key');
+        $cache = $directory->getCache('index');
+
         /** @var Language $language */
         $language = $this->grav['language'];
 
+        $this->pages_cache_id = 'pages-' . md5($collection->getCacheChecksum() . $language->getActive() . $config->checksum());
+
+        $cached = $cache->get($this->pages_cache_id);
+
+        if ($cached && $this->getVersion() === $cached[0]) {
+            [, $this->index, $this->routes, $this->children, $taxonomy_map, $this->sort] = $cached;
+
+            /** @var Taxonomy $taxonomy */
+            $taxonomy = $this->grav['taxonomy'];
+            $taxonomy->taxonomy($taxonomy_map);
+
+            return;
+        }
+
+        /** @var Debugger $debugger */
+        $debugger = $this->grav['debugger'];
+        $debugger->addMessage('Page cache missed, rebuilding Flex Pages..');
+
+        $root = $collection->getRoot();
+        $root_path = $root->path();
+        $this->routes = [];
+        $this->instances = [$root_path => $root];
+        $this->index = [$root_path => $root];
+        $this->children = [];
+        $this->sort = [];
+
+        if ($this->fire_events) {
+            $this->grav->fireEvent('onBuildPagesInitialized');
+        }
+
+        /** @var PageInterface $page */
+        foreach ($collection as $page) {
+            $path = $page->path();
+            if (null === $path) {
+                throw new RuntimeException('Internal error');
+            }
+
+            if ($page instanceof FlexTranslateInterface) {
+                $page = $page->hasTranslation() ? $page->getTranslation() : null;
+            }
+
+            if (!$page instanceof FlexPageObject || $path === $root_path) {
+                continue;
+            }
+
+            if ($this->fire_events) {
+                if (method_exists($page, 'initialize')) {
+                    $page->initialize();
+                } else {
+                    // TODO: Deprecated, only used in 1.7 betas.
+                    $this->grav->fireEvent('onPageProcessed', new Event(['page' => $page]));
+                }
+            }
+
+            $parent = dirname($path);
+
+            $route = $page->rawRoute();
+
+            // Skip duplicated empty folders (git revert does not remove those).
+            // TODO: still not perfect, will only work if the page has been translated.
+            if (isset($this->routes[$route])) {
+                $oldPath = $this->routes[$route];
+                if ($page->isPage()) {
+                    unset($this->index[$oldPath], $this->children[dirname($oldPath)][$oldPath]);
+                } else {
+                    continue;
+                }
+            }
+
+            $this->routes[$route] = $path;
+            $this->instances[$path] = $page;
+            $this->index[$path] = $page->getFlexKey();
+            // FIXME: ... better...
+            $this->children[$parent][$path] = ['slug' => $page->slug()];
+            if (!isset($this->children[$path])) {
+                $this->children[$path] = [];
+            }
+        }
+
+        foreach ($this->children as $path => $list) {
+            $page = $this->instances[$path] ?? null;
+            if (null === $page) {
+                continue;
+            }
+            // Call onFolderProcessed event.
+            if ($this->fire_events) {
+                $this->grav->fireEvent('onFolderProcessed', new Event(['page' => $page]));
+            }
+            // Sort the children.
+            $this->children[$path] = $this->sort($page);
+        }
+
+        $this->routes = [];
+        $this->buildRoutes();
+
+        // cache if needed
+        if (null !== $cache) {
+            /** @var Taxonomy $taxonomy */
+            $taxonomy = $this->grav['taxonomy'];
+            $taxonomy_map = $taxonomy->taxonomy();
+
+            // save pages, routes, taxonomy, and sort to cache
+            $cache->set($this->pages_cache_id, [$this->getVersion(), $this->index, $this->routes, $this->children, $taxonomy_map, $this->sort]);
+        }
+    }
+
+    /**
+     * @return Page
+     */
+    protected function buildRootPage()
+    {
+        $grav = Grav::instance();
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $grav['locator'];
+        $path = $locator->findResource('page://');
+        if (!is_string($path)) {
+            throw new RuntimeException('Internal Error');
+        }
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
+        $page = new Page();
+        $page->path($path);
+        $page->orderDir($config->get('system.pages.order.dir'));
+        $page->orderBy($config->get('system.pages.order.by'));
+        $page->modified(0);
+        $page->routable(false);
+        $page->template('default');
+        $page->extension('.md');
+
+        return $page;
+    }
+
+    protected function buildRegularPages(): void
+    {
+        /** @var Config $config */
+        $config = $this->grav['config'];
+
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
 
-        $pages_dir = $locator->findResource('page://');
+        /** @var Language $language */
+        $language = $this->grav['language'];
+
+        $pages_dirs = $this->getPagesPaths();
+
+        // Set active language
+        $this->active_lang = $language->getActive();
 
         if ($config->get('system.cache.enabled')) {
-            /** @var Cache $cache */
-            $cache = $this->grav['cache'];
-            /** @var Taxonomy $taxonomy */
-            $taxonomy = $this->grav['taxonomy'];
+            /** @var Language $language */
+            $language = $this->grav['language'];
 
             // how should we check for last modified? Default is by file
             switch ($this->check_method) {
@@ -971,43 +1731,69 @@ protected function buildPages()
                     $hash = 0;
                     break;
                 case 'folder':
-                    $hash = Folder::lastModifiedFolder($pages_dir);
+                    $hash = Folder::lastModifiedFolder($pages_dirs);
                     break;
                 case 'hash':
-                    $hash = Folder::hashAllFiles($pages_dir);
+                    $hash = Folder::hashAllFiles($pages_dirs);
                     break;
                 default:
-                    $hash = Folder::lastModifiedFile($pages_dir);
+                    $hash = Folder::lastModifiedFile($pages_dirs);
             }
 
-            $this->pages_cache_id = md5($pages_dir . $hash . $language->getActive() . $config->checksum());
-
-            list($this->instances, $this->routes, $this->children, $taxonomy_map, $this->sort) = $cache->fetch($this->pages_cache_id);
-            if (!$this->instances) {
-                $this->grav['debugger']->addMessage('Page cache missed, rebuilding pages..');
+            $this->simple_pages_hash = json_encode($pages_dirs) . $hash . $config->checksum();
+            $this->pages_cache_id = md5($this->simple_pages_hash . $language->getActive());
 
-                // recurse pages and cache result
-                $this->resetPages($pages_dir);
+            /** @var Cache $cache */
+            $cache = $this->grav['cache'];
+            $cached = $cache->fetch($this->pages_cache_id);
+            if ($cached && $this->getVersion() === $cached[0]) {
+                [, $this->index, $this->routes, $this->children, $taxonomy_map, $this->sort] = $cached;
 
-            } else {
-                // If pages was found in cache, set the taxonomy
-                $this->grav['debugger']->addMessage('Page cache hit.');
+                /** @var Taxonomy $taxonomy */
+                $taxonomy = $this->grav['taxonomy'];
                 $taxonomy->taxonomy($taxonomy_map);
+
+                return;
             }
+
+            $this->grav['debugger']->addMessage('Page cache missed, rebuilding pages..');
         } else {
-            $this->recurse($pages_dir);
-            $this->buildRoutes();
+            $this->grav['debugger']->addMessage('Page cache disabled, rebuilding pages..');
+        }
+
+        $this->resetPages($pages_dirs);
+    }
+
+    protected function getPagesPaths(): array
+    {
+        $grav = Grav::instance();
+        $locator = $grav['locator'];
+        $paths = [];
+
+        $dirs = (array) $grav['config']->get('system.pages.dirs', ['page://']);
+        foreach ($dirs as $dir) {
+            $path = $locator->findResource($dir);
+            if (file_exists($path)) {
+                $paths[] = $path;
+            }
         }
+
+        return $paths;
     }
 
     /**
      * Accessible method to manually reset the pages cache
      *
-     * @param string $pages_dir
+     * @param array $pages_dirs
      */
-    public function resetPages($pages_dir)
+    public function resetPages(array $pages_dirs): void
     {
-        $this->recurse($pages_dir);
+        $this->sort = [];
+
+        foreach ($pages_dirs as $dir) {
+            $this->recurse($dir);
+        }
+
         $this->buildRoutes();
 
         // cache if needed
@@ -1018,7 +1804,7 @@ public function resetPages($pages_dir)
             $taxonomy = $this->grav['taxonomy'];
 
             // save pages, routes, taxonomy, and sort to cache
-            $cache->save($this->pages_cache_id, [$this->instances, $this->routes, $this->children, $taxonomy->taxonomy(), $this->sort]);
+            $cache->save($this->pages_cache_id, [$this->getVersion(), $this->index, $this->routes, $this->children, $taxonomy->taxonomy(), $this->sort]);
         }
     }
 
@@ -1027,12 +1813,11 @@ public function resetPages($pages_dir)
      *
      * @param string    $directory
      * @param PageInterface|null $parent
-     *
      * @return PageInterface
-     * @throws \RuntimeException
+     * @throws RuntimeException
      * @internal
      */
-    protected function recurse($directory, PageInterface $parent = null)
+    protected function recurse(string $directory, PageInterface $parent = null)
     {
         $directory = rtrim($directory, DS);
         $page = new Page;
@@ -1045,7 +1830,7 @@ protected function recurse($directory, PageInterface $parent = null)
 
         // Stuff to do at root page
         // Fire event for memory and time consuming plugins...
-        if ($parent === null && $config->get('system.pages.events.page')) {
+        if ($parent === null && $this->fire_events) {
             $this->grav->fireEvent('onBuildPagesInitialized');
         }
 
@@ -1058,19 +1843,20 @@ protected function recurse($directory, PageInterface $parent = null)
         $page->orderBy($config->get('system.pages.order.by'));
 
         // Add into instances
-        if (!isset($this->instances[$page->path()])) {
+        if (!isset($this->index[$page->path()])) {
+            $this->index[$page->path()] = $page;
             $this->instances[$page->path()] = $page;
             if ($parent && $page->path()) {
                 $this->children[$parent->path()][$page->path()] = ['slug' => $page->slug()];
             }
-        } else {
-            throw new \RuntimeException('Fatal error when creating page instances.');
+        } elseif ($parent !== null) {
+            throw new RuntimeException('Fatal error when creating page instances.');
         }
 
         // Build regular expression for all the allowed page extensions.
         $page_extensions = $language->getFallbackPageExtensions();
         $regex = '/^[^\.]*(' . implode('|', array_map(
-            function ($str) {
+            static function ($str) {
                 return preg_quote($str, '/');
             },
             $page_extensions
@@ -1081,8 +1867,7 @@ function ($str) {
         $page_extension = '.md';
         $last_modified = 0;
 
-        $iterator = new \FilesystemIterator($directory);
-        /** @var \FilesystemIterator $file */
+        $iterator = new FilesystemIterator($directory);
         foreach ($iterator as $file) {
             $filename = $file->getFilename();
 
@@ -1094,14 +1879,14 @@ function ($str) {
             // Handle folders later.
             if ($file->isDir()) {
                 // But ignore all folders in ignore list.
-                if (!\in_array($filename, $this->ignore_folders, true)) {
+                if (!in_array($filename, $this->ignore_folders, true)) {
                     $folders[] = $file;
                 }
                 continue;
             }
 
             // Ignore all files in ignore list.
-            if (\in_array($filename, $this->ignore_files, true)) {
+            if (in_array($filename, $this->ignore_files, true)) {
                 continue;
             }
 
@@ -1128,13 +1913,13 @@ function ($str) {
 
             $content_exists = true;
 
-            if ($config->get('system.pages.events.page')) {
+            if ($this->fire_events) {
                 $this->grav->fireEvent('onPageProcessed', new Event(['page' => $page]));
             }
         }
 
         // Now handle all the folders under the page.
-        /** @var \FilesystemIterator $file */
+        /** @var FilesystemIterator $file */
         foreach ($folders as $file) {
             $filename = $file->getFilename();
 
@@ -1150,20 +1935,20 @@ function ($str) {
             $path = $directory . DS . $filename;
             $child = $this->recurse($path, $page);
 
-            if (Utils::startsWith($filename, '_')) {
+            if (preg_match('/^(\d+\.)_/', $filename)) {
                 $child->routable(false);
+                $child->modularTwig(true);
             }
 
             $this->children[$page->path()][$child->path()] = ['slug' => $child->slug()];
 
-            if ($config->get('system.pages.events.page')) {
+            if ($this->fire_events) {
                 $this->grav->fireEvent('onFolderProcessed', new Event(['page' => $page]));
             }
         }
 
-
         if (!$content_exists) {
-            // Set routability to false if no page found
+            // Set routable to false if no page found
             $page->routable(false);
 
             // Hide empty folders if option set
@@ -1185,7 +1970,7 @@ function ($str) {
 
         // Override the modified and ID so that it takes the latest change into account
         $page->modified($last_modified);
-        $page->id($last_modified . md5($page->filePath()));
+        $page->id($last_modified . md5($page->filePath() ?? ''));
 
         // Sort based on Defaults or Page Overridden sort order
         $this->children[$page->path()] = $this->sort($page);
@@ -1196,54 +1981,68 @@ function ($str) {
     /**
      * @internal
      */
-    protected function buildRoutes()
+    protected function buildRoutes(): void
     {
         /** @var Taxonomy $taxonomy */
         $taxonomy = $this->grav['taxonomy'];
 
         // Get the home route
         $home = self::resetHomeRoute();
-
         // Build routes and taxonomy map.
-        /** @var PageInterface $page */
-        foreach ($this->instances as $page) {
-            if (!$page->root()) {
-                // process taxonomy
-                $taxonomy->addTaxonomy($page);
+        /** @var PageInterface|string $page */
+        foreach ($this->index as $path => $page) {
+            if (is_string($page)) {
+                $page = $this->get($path);
+            }
 
-                $route = $page->route();
-                $raw_route = $page->rawRoute();
-                $page_path = $page->path();
+            if (!$page || $page->root()) {
+                continue;
+            }
 
-                // add regular route
+            // process taxonomy
+            $taxonomy->addTaxonomy($page);
+
+            $page_path = $page->path();
+            if (null === $page_path) {
+                throw new RuntimeException('Internal Error');
+            }
+
+            $route = $page->route();
+            $raw_route = $page->rawRoute();
+
+            // add regular route
+            if ($route) {
                 $this->routes[$route] = $page_path;
+            }
 
-                // add raw route
-                if ($raw_route !== $route) {
-                    $this->routes[$raw_route] = $page_path;
-                }
+            // add raw route
+            if ($raw_route && $raw_route !== $route) {
+                $this->routes[$raw_route] = $page_path;
+            }
 
-                // add canonical route
-                $route_canonical = $page->routeCanonical();
-                if ($route_canonical && ($route !== $route_canonical)) {
-                    $this->routes[$route_canonical] = $page_path;
-                }
+            // add canonical route
+            $route_canonical = $page->routeCanonical();
+            if ($route_canonical && $route !== $route_canonical) {
+                $this->routes[$route_canonical] = $page_path;
+            }
 
-                // add aliases to routes list if they are provided
-                $route_aliases = $page->routeAliases();
-                if ($route_aliases) {
-                    foreach ($route_aliases as $alias) {
-                        $this->routes[$alias] = $page_path;
-                    }
+            // add aliases to routes list if they are provided
+            $route_aliases = $page->routeAliases();
+            if ($route_aliases) {
+                foreach ($route_aliases as $alias) {
+                    $this->routes[$alias] = $page_path;
                 }
             }
         }
 
         // Alias and set default route to home page.
-        $homeRoute = '/' . $home;
+        $homeRoute = "/{$home}";
         if ($home && isset($this->routes[$homeRoute])) {
-            $this->routes['/'] = $this->routes[$homeRoute];
-            $this->get($this->routes[$homeRoute])->route('/');
+            $home = $this->get($this->routes[$homeRoute]);
+            if ($home) {
+                $this->routes['/'] = $this->routes[$homeRoute];
+                $home->route('/');
+            }
         }
     }
 
@@ -1253,28 +2052,26 @@ protected function buildRoutes()
      * @param string $order_by
      * @param array|null  $manual
      * @param int|null    $sort_flags
-     *
-     * @throws \RuntimeException
+     * @throws RuntimeException
      * @internal
      */
-    protected function buildSort($path, array $pages, $order_by = 'default', $manual = null, $sort_flags = null)
+    protected function buildSort($path, array $pages, $order_by = 'default', $manual = null, $sort_flags = null): void
     {
         $list = [];
-        $header_default = null;
         $header_query = null;
+        $header_default = null;
 
         // do this header query work only once
         if (strpos($order_by, 'header.') === 0) {
-            $header_query = explode('|', str_replace('header.', '', $order_by));
-            if (isset($header_query[1])) {
-                $header_default = $header_query[1];
-            }
+            $query = explode('|', str_replace('header.', '', $order_by), 2);
+            $header_query = array_shift($query) ?? '';
+            $header_default = array_shift($query);
         }
 
         foreach ($pages as $key => $info) {
-            $child = $this->instances[$key] ?? null;
+            $child = $this->get($key);
             if (!$child) {
-                throw new \RuntimeException("Page does not exist: {$key}");
+                throw new RuntimeException("Page does not exist: {$key}");
             }
 
             switch ($order_by) {
@@ -1301,26 +2098,30 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
                     $list[$key] = $child->slug();
                     break;
                 case 'basename':
-                    $list[$key] = basename($key);
+                    $list[$key] = Utils::basename($key);
                     break;
                 case 'folder':
                     $list[$key] = $child->folder();
                     break;
-                case (is_string($header_query[0])):
-                    $child_header = new Header((array)$child->header());
-                    $header_value = $child_header->get($header_query[0]);
-                    if (is_array($header_value)) {
-                        $list[$key] = implode(',',$header_value);
-                    } elseif ($header_value) {
-                        $list[$key] = $header_value;
-                    } else {
-                        $list[$key] = $header_default ?: $key;
-                    }
-                    $sort_flags = $sort_flags ?: SORT_REGULAR;
-                    break;
                 case 'manual':
                 case 'default':
                 default:
+                    if (is_string($header_query)) {
+                        $child_header = $child->header();
+                        if (!$child_header instanceof Header) {
+                            $child_header = new Header((array)$child_header);
+                        }
+                        $header_value = $child_header->get($header_query);
+                        if (is_array($header_value)) {
+                            $list[$key] = implode(',', $header_value);
+                        } elseif ($header_value) {
+                            $list[$key] = $header_value;
+                        } else {
+                            $list[$key] = $header_default ?: $key;
+                        }
+                        $sort_flags = $sort_flags ?: SORT_REGULAR;
+                        break;
+                    }
                     $list[$key] = $key;
                     $sort_flags = $sort_flags ?: SORT_REGULAR;
             }
@@ -1336,13 +2137,17 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
         } else {
             // else just sort the list according to specified key
             if (extension_loaded('intl') && $this->grav['config']->get('system.intl_enabled')) {
-                $locale = setlocale(LC_COLLATE, 0); //`setlocale` with a 0 param returns the current locale set
+                $locale = setlocale(LC_COLLATE, '0'); //`setlocale` with a '0' param returns the current locale set
                 $col = Collator::create($locale);
                 if ($col) {
+                    $col->setAttribute(Collator::NUMERIC_COLLATION, Collator::ON);
                     if (($sort_flags & SORT_NATURAL) === SORT_NATURAL) {
-                        $list = preg_replace_callback('~([0-9]+)\.~', function($number) {
+                        $list = preg_replace_callback('~([0-9]+)\.~', static function ($number) {
                             return sprintf('%032d.', $number[0]);
                         }, $list);
+                        if (!is_array($list)) {
+                            throw new RuntimeException('Internal Error');
+                        }
 
                         $list_vals = array_values($list);
                         if (is_numeric(array_shift($list_vals))) {
@@ -1369,7 +2174,7 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
 
             foreach ($list as $key => $dummy) {
                 $info = $pages[$key];
-                $order = \array_search($info['slug'], $manual, true);
+                $order = array_search($info['slug'], $manual, true);
                 if ($order === false) {
                     $order = $i++;
                 }
@@ -1379,7 +2184,7 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
             $list = $new_list;
 
             // Apply manual ordering to the list.
-            asort($list);
+            asort($list, SORT_NUMERIC);
         }
 
         foreach ($list as $key => $sort) {
@@ -1392,10 +2197,9 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
      * Shuffles an associative array
      *
      * @param array $list
-     *
      * @return array
      */
-    protected function arrayShuffle($list)
+    protected function arrayShuffle(array $list): array
     {
         $keys = array_keys($list);
         shuffle($keys);
@@ -1408,16 +2212,34 @@ protected function arrayShuffle($list)
         return $new;
     }
 
+    /**
+     * @return string
+     */
+    protected function getVersion(): string
+    {
+        return $this->directory ? 'flex' : 'regular';
+    }
+
     /**
      * Get the Pages cache ID
      *
      * this is particularly useful to know if pages have changed and you want
      * to sync another cache with pages cache - works best in `onPagesInitialized()`
      *
-     * @return mixed
+     * @return null|string
      */
-    public function getPagesCacheId()
+    public function getPagesCacheId(): ?string
     {
         return $this->pages_cache_id;
     }
+
+    /**
+     * Get the simple pages hash that is not md5 encoded, and isn't specific to language
+     *
+     * @return null|string
+     */
+    public function getSimplePagesHash(): ?string
+    {
+        return $this->simple_pages_hash;
+    }
 }
diff --git a/system/src/Grav/Common/Page/Traits/PageFormTrait.php b/system/src/Grav/Common/Page/Traits/PageFormTrait.php
new file mode 100644
index 0000000000..b99e7b75c4
--- /dev/null
+++ b/system/src/Grav/Common/Page/Traits/PageFormTrait.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Grav\Common\Page\Traits;
+
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\Event\Event;
+use function is_array;
+
+/**
+ * Trait PageFormTrait
+ * @package Grav\Common\Page\Traits
+ */
+trait PageFormTrait
+{
+    /** @var array|null */
+    private $_forms;
+
+    /**
+     * Return all the forms which are associated to this page.
+     *
+     * Forms are returned as [name => blueprint, ...], where blueprint follows the regular form blueprint format.
+     *
+     * @return array
+     */
+    public function getForms(): array
+    {
+        if (null === $this->_forms) {
+            $header = $this->header();
+
+            // Call event to allow filling the page header form dynamically (e.g. use case: Comments plugin)
+            $grav = Grav::instance();
+            $grav->fireEvent('onFormPageHeaderProcessed', new Event(['page' => $this, 'header' => $header]));
+
+            $rules = $header->rules ?? null;
+            if (!is_array($rules)) {
+                $rules = [];
+            }
+
+            $forms = [];
+
+            // First grab page.header.form
+            $form = $this->normalizeForm($header->form ?? null, null, $rules);
+            if ($form) {
+                $forms[$form['name']] = $form;
+            }
+
+            // Append page.header.forms (override singular form if it clashes)
+            $headerForms = $header->forms ?? null;
+            if (is_array($headerForms)) {
+                foreach ($headerForms as $name => $form) {
+                    $form = $this->normalizeForm($form, $name, $rules);
+                    if ($form) {
+                        $forms[$form['name']] = $form;
+                    }
+                }
+            }
+
+            $this->_forms = $forms;
+        }
+
+        return $this->_forms;
+    }
+
+    /**
+     * Add forms to this page.
+     *
+     * @param array $new
+     * @param bool $override
+     * @return $this
+     */
+    public function addForms(array $new, $override = true)
+    {
+        // Initialize forms.
+        $this->forms();
+
+        foreach ($new as $name => $form) {
+            $form = $this->normalizeForm($form, $name);
+            $name = $form['name'] ?? null;
+            if ($name && ($override || !isset($this->_forms[$name]))) {
+                $this->_forms[$name] = $form;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Alias of $this->getForms();
+     *
+     * @return array
+     */
+    public function forms(): array
+    {
+        return $this->getForms();
+    }
+
+    /**
+     * @param array|null $form
+     * @param string|null $name
+     * @param array $rules
+     * @return array|null
+     */
+    protected function normalizeForm($form, $name = null, array $rules = []): ?array
+    {
+        if (!is_array($form)) {
+            return null;
+        }
+
+        // Ignore numeric indexes on name.
+        if (!$name || (string)(int)$name === (string)$name) {
+            $name = null;
+        }
+
+        $name = $name ?? $form['name'] ?? $this->slug();
+
+        $formRules = $form['rules'] ?? null;
+        if (!is_array($formRules)) {
+            $formRules = [];
+        }
+
+        return ['name' => $name, 'rules' => $rules + $formRules] + $form;
+    }
+
+    abstract public function header($var = null);
+    abstract public function slug($var = null);
+}
diff --git a/system/src/Grav/Common/Page/Types.php b/system/src/Grav/Common/Page/Types.php
index 03e3f6eb03..420c588607 100644
--- a/system/src/Grav/Common/Page/Types.php
+++ b/system/src/Grav/Common/Page/Types.php
@@ -3,38 +3,53 @@
 /**
  * @package    Grav\Common\Page
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Page;
 
+use Grav\Common\Data\Blueprint;
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
+use Grav\Common\Utils;
+use InvalidArgumentException;
 use RocketTheme\Toolbox\ArrayTraits\ArrayAccess;
 use RocketTheme\Toolbox\ArrayTraits\Constructor;
 use RocketTheme\Toolbox\ArrayTraits\Countable;
 use RocketTheme\Toolbox\ArrayTraits\Export;
 use RocketTheme\Toolbox\ArrayTraits\Iterator;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function is_string;
 
+/**
+ * Class Types
+ * @package Grav\Common\Page
+ */
 class Types implements \ArrayAccess, \Iterator, \Countable
 {
     use ArrayAccess, Constructor, Iterator, Countable, Export;
 
+    /** @var array */
     protected $items;
-    protected $systemBlueprints;
-
+    /** @var array */
+    protected $systemBlueprints = [];
+
+    /**
+     * @param string $type
+     * @param Blueprint|null $blueprint
+     * @return void
+     */
     public function register($type, $blueprint = null)
     {
         if (!isset($this->items[$type])) {
             $this->items[$type] = [];
-        } elseif (!$blueprint) {
+        } elseif (null === $blueprint) {
             return;
         }
 
-        if (!$blueprint && $this->systemBlueprints) {
-            $blueprint = $this->systemBlueprints[$type] ?? $this->systemBlueprints['default'];
+        if (null === $blueprint) {
+            $blueprint = $this->systemBlueprints[$type] ?? $this->systemBlueprints['default'] ?? null;
         }
 
         if ($blueprint) {
@@ -42,19 +57,28 @@ public function register($type, $blueprint = null)
         }
     }
 
-    public function scanBlueprints($uri)
+    /**
+     * @return void
+     */
+    public function init()
     {
-        if (!\is_string($uri)) {
-            throw new \InvalidArgumentException('First parameter must be URI');
-        }
-
-        if (!$this->systemBlueprints) {
+        if (empty($this->systemBlueprints)) {
+            // Register all blueprints from the blueprints stream.
             $this->systemBlueprints = $this->findBlueprints('blueprints://pages');
+            foreach ($this->systemBlueprints as $type => $blueprint) {
+                $this->register($type);
+            }
+        }
+    }
 
-            // Register default by default.
-            $this->register('default');
-
-            $this->register('external');
+    /**
+     * @param string $uri
+     * @return void
+     */
+    public function scanBlueprints($uri)
+    {
+        if (!is_string($uri)) {
+            throw new InvalidArgumentException('First parameter must be URI');
         }
 
         foreach ($this->findBlueprints($uri) as $type => $blueprint) {
@@ -62,10 +86,14 @@ public function scanBlueprints($uri)
         }
     }
 
+    /**
+     * @param string $uri
+     * @return void
+     */
     public function scanTemplates($uri)
     {
-        if (!\is_string($uri)) {
-            throw new \InvalidArgumentException('First parameter must be URI');
+        if (!is_string($uri)) {
+            throw new InvalidArgumentException('First parameter must be URI');
         }
 
         $options = [
@@ -90,6 +118,9 @@ public function scanTemplates($uri)
         }
     }
 
+    /**
+     * @return array
+     */
     public function pageSelect()
     {
         $list = [];
@@ -104,6 +135,9 @@ public function pageSelect()
         return $list;
     }
 
+    /**
+     * @return array
+     */
     public function modularSelect()
     {
         $list = [];
@@ -111,13 +145,17 @@ public function modularSelect()
             if (strpos($name, 'modular/') !== 0) {
                 continue;
             }
-            $list[$name] = ucfirst(trim(str_replace('_', ' ', basename($name))));
+            $list[$name] = ucfirst(trim(str_replace('_', ' ', Utils::basename($name))));
         }
         ksort($list);
 
         return $list;
     }
 
+    /**
+     * @param string $uri
+     * @return array
+     */
     private function findBlueprints($uri)
     {
         $options = [
diff --git a/system/src/Grav/Common/Plugin.php b/system/src/Grav/Common/Plugin.php
index 8729a519ff..30e5344f6a 100644
--- a/system/src/Grav/Common/Plugin.php
+++ b/system/src/Grav/Common/Plugin.php
@@ -3,44 +3,48 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use ArrayAccess;
+use Composer\Autoload\ClassLoader;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\Data;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Config\Config;
-use RocketTheme\Toolbox\Event\EventDispatcher;
-use RocketTheme\Toolbox\Event\EventSubscriberInterface;
+use LogicException;
 use RocketTheme\Toolbox\File\YamlFile;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use function defined;
+use function is_bool;
+use function is_string;
 
-class Plugin implements EventSubscriberInterface, \ArrayAccess
+/**
+ * Class Plugin
+ * @package Grav\Common
+ */
+class Plugin implements EventSubscriberInterface, ArrayAccess
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     public $name;
-
-    /**
-     * @var array
-     */
+    /** @var array */
     public $features = [];
 
-    /**
-     * @var Grav
-     */
+    /** @var Grav */
     protected $grav;
-
-    /**
-     * @var Config
-     */
+    /** @var Config|null */
     protected $config;
-
+    /** @var bool */
     protected $active = true;
+    /** @var Blueprint|null */
     protected $blueprint;
+    /** @var ClassLoader|null */
+    protected $loader;
 
     /**
      * By default assign all methods as listeners using the default priority.
@@ -49,7 +53,7 @@ class Plugin implements EventSubscriberInterface, \ArrayAccess
      */
     public static function getSubscribedEvents()
     {
-        $methods = get_class_methods(get_called_class());
+        $methods = get_class_methods(static::class);
 
         $list = [];
         foreach ($methods as $method) {
@@ -66,17 +70,36 @@ public static function getSubscribedEvents()
      *
      * @param string $name
      * @param Grav   $grav
-     * @param Config $config
+     * @param Config|null $config
      */
     public function __construct($name, Grav $grav, Config $config = null)
     {
         $this->name = $name;
         $this->grav = $grav;
+
         if ($config) {
             $this->setConfig($config);
         }
     }
 
+    /**
+     * @return ClassLoader|null
+     * @internal
+     */
+    final public function getAutoloader(): ?ClassLoader
+    {
+        return $this->loader;
+    }
+
+    /**
+     * @param ClassLoader|null $loader
+     * @internal
+     */
+    final public function setAutoloader(?ClassLoader $loader): void
+    {
+        $this->loader = $loader;
+    }
+
     /**
      * @param Config $config
      * @return $this
@@ -95,7 +118,7 @@ public function setConfig(Config $config)
      */
     public function config()
     {
-        return $this->config["plugins.{$this->name}"];
+        return $this->config["plugins.{$this->name}"] ?? [];
     }
 
     /**
@@ -115,7 +138,7 @@ public function isAdmin()
      */
     public function isCli()
     {
-        return \defined('GRAV_CLI');
+        return defined('GRAV_CLI');
     }
 
     /**
@@ -126,21 +149,25 @@ public function isCli()
      */
     protected function isPluginActiveAdmin($plugin_route)
     {
-        $should_run = false;
+        $active = false;
 
+        /** @var Uri $uri */
         $uri = $this->grav['uri'];
+        /** @var Config $config */
+        $config = $this->config ?? $this->grav['config'];
 
-        if (strpos($uri->path(), $this->config->get('plugins.admin.route') . '/' . $plugin_route) === false) {
-            $should_run = false;
+        if (strpos($uri->path(), $config->get('plugins.admin.route') . '/' . $plugin_route) === false) {
+            $active = false;
         } elseif (isset($uri->paths()[1]) && $uri->paths()[1] === $plugin_route) {
-            $should_run = true;
+            $active = true;
         }
 
-        return $should_run;
+        return $active;
     }
 
     /**
      * @param array $events
+     * @return void
      */
     protected function enable(array $events)
     {
@@ -148,9 +175,9 @@ protected function enable(array $events)
         $dispatcher = $this->grav['events'];
 
         foreach ($events as $eventName => $params) {
-            if (\is_string($params)) {
+            if (is_string($params)) {
                 $dispatcher->addListener($eventName, [$this, $params]);
-            } elseif (\is_string($params[0])) {
+            } elseif (is_string($params[0])) {
                 $dispatcher->addListener($eventName, [$this, $params[0]], $this->getPriority($params, $eventName));
             } else {
                 foreach ($params as $listener) {
@@ -163,22 +190,18 @@ protected function enable(array $events)
     /**
      * @param array  $params
      * @param string $eventName
+     * @return int
      */
     private function getPriority($params, $eventName)
     {
-        $grav = Grav::instance();
-        $override = implode('.', ["priorities", $this->name, $eventName, $params[0]]);
-        if ($grav['config']->get($override) !== null)
-        {
-            return $grav['config']->get($override);
-        } elseif (isset($params[1])) {
-            return $params[1];
-        }
-        return 0;
+        $override = implode('.', ['priorities', $this->name, $eventName, $params[0]]);
+
+        return $this->grav['config']->get($override) ?? $params[1] ?? 0;
     }
 
     /**
      * @param array $events
+     * @return void
      */
     protected function disable(array $events)
     {
@@ -186,9 +209,9 @@ protected function disable(array $events)
         $dispatcher = $this->grav['events'];
 
         foreach ($events as $eventName => $params) {
-            if (\is_string($params)) {
+            if (is_string($params)) {
                 $dispatcher->removeListener($eventName, [$this, $params]);
-            } elseif (\is_string($params[0])) {
+            } elseif (is_string($params[0])) {
                 $dispatcher->removeListener($eventName, [$this, $params[0]]);
             } else {
                 foreach ($params as $listener) {
@@ -204,14 +227,16 @@ protected function disable(array $events)
      * @param string $offset  An offset to check for.
      * @return bool          Returns TRUE on success or FALSE on failure.
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
-        $this->loadBlueprint();
-
         if ($offset === 'title') {
             $offset = 'name';
         }
-        return isset($this->blueprint[$offset]);
+
+        $blueprint = $this->getBlueprint();
+
+        return isset($blueprint[$offset]);
     }
 
     /**
@@ -220,14 +245,16 @@ public function offsetExists($offset)
      * @param string $offset  The offset to retrieve.
      * @return mixed         Can return all value types.
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
-        $this->loadBlueprint();
-
         if ($offset === 'title') {
             $offset = 'name';
         }
-        return $this->blueprint[$offset] ?? null;
+
+        $blueprint = $this->getBlueprint();
+
+        return $blueprint[$offset] ?? null;
     }
 
     /**
@@ -235,22 +262,37 @@ public function offsetGet($offset)
      *
      * @param string $offset  The offset to assign the value to.
      * @param mixed $value   The value to set.
-     * @throws \LogicException
+     * @throws LogicException
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
-        throw new \LogicException(__CLASS__ . ' blueprints cannot be modified.');
+        throw new LogicException(__CLASS__ . ' blueprints cannot be modified.');
     }
 
     /**
      * Unsets an offset.
      *
      * @param string $offset  The offset to unset.
-     * @throws \LogicException
+     * @throws LogicException
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
-        throw new \LogicException(__CLASS__ . ' blueprints cannot be modified.');
+        throw new LogicException(__CLASS__ . ' blueprints cannot be modified.');
+    }
+
+    /**
+     * @return array
+     */
+    public function __debugInfo(): array
+    {
+        $array = (array)$this;
+
+        unset($array["\0*\0grav"]);
+        $array["\0*\0config"] = $this->config();
+
+        return $array;
     }
 
     /**
@@ -263,40 +305,46 @@ public function offsetUnset($offset)
      * @param string   $content        The string to perform operations upon
      * @param callable $function       The anonymous callback function
      * @param string   $internal_regex Optional internal regex to extra data from
-     *
      * @return string
      */
     protected function parseLinks($content, $function, $internal_regex = '(.*)')
     {
-        $regex = '/\[plugin:(?:' . $this->name . ')\]\(' . $internal_regex . '\)/i';
+        $regex = '/\[plugin:(?:' . preg_quote($this->name, '/') . ')\]\(' . $internal_regex . '\)/i';
 
-        return preg_replace_callback($regex, $function, $content);
+        $result = preg_replace_callback($regex, $function, $content);
+        \assert($result !== null);
+
+        return $result;
     }
 
     /**
      * Merge global and page configurations.
      *
+     * WARNING: This method modifies page header!
+     *
      * @param PageInterface $page The page to merge the configurations with the
      *                       plugin settings.
      * @param mixed $deep false = shallow|true = recursive|merge = recursive+unique
      * @param array $params Array of additional configuration options to
      *                       merge with the plugin settings.
      * @param string $type Is this 'plugins' or 'themes'
-     *
      * @return Data
      */
     protected function mergeConfig(PageInterface $page, $deep = false, $params = [], $type = 'plugins')
     {
+        /** @var Config $config */
+        $config = $this->config ?? $this->grav['config'];
+
         $class_name = $this->name;
         $class_name_merged = $class_name . '.merged';
-        $defaults = $this->config->get($type . '.' . $class_name, []);
+        $defaults = $config->get($type . '.' . $class_name, []);
         $page_header = $page->header();
         $header = [];
 
         if (!isset($page_header->{$class_name_merged}) && isset($page_header->{$class_name})) {
             // Get default plugin configurations and retrieve page header configuration
             $config = $page_header->{$class_name};
-            if (\is_bool($config)) {
+            if (is_bool($config)) {
                 // Overwrite enabled option with boolean value in page header
                 $config = ['enabled' => $config];
             }
@@ -305,7 +353,7 @@ protected function mergeConfig(PageInterface $page, $deep = false, $params = [],
 
             // Create new config object and set it on the page object so it's cached for next time
             $page->modifyHeader($class_name_merged, new Data($header));
-        } else if (isset($page_header->{$class_name_merged})) {
+        } elseif (isset($page_header->{$class_name_merged})) {
             $merged = $page_header->{$class_name_merged};
             $header = $merged->toArray();
         }
@@ -342,27 +390,54 @@ private function mergeArrays($deep, $array1, $array2)
     /**
      * Persists to disk the plugin parameters currently stored in the Grav Config object
      *
-     * @param string $plugin_name The name of the plugin whose config it should store.
-     *
+     * @param string $name The name of the plugin whose config it should store.
      * @return bool
      */
-    public static function saveConfig($plugin_name)
+    public static function saveConfig($name)
     {
-        if (!$plugin_name) {
+        if (!$name) {
             return false;
         }
 
         $grav = Grav::instance();
+
+        /** @var UniformResourceLocator $locator */
         $locator = $grav['locator'];
-        $filename = 'config://plugins/' . $plugin_name . '.yaml';
-        $file = YamlFile::instance($locator->findResource($filename, true, true));
-        $content = $grav['config']->get('plugins.' . $plugin_name);
+
+        $filename = 'config://plugins/' . $name . '.yaml';
+        $file = YamlFile::instance((string)$locator->findResource($filename, true, true));
+        $content = $grav['config']->get('plugins.' . $name);
         $file->save($content);
         $file->free();
+        unset($file);
 
         return true;
     }
 
+    public static function inheritedConfigOption(string $plugin, string $var, PageInterface $page = null, $default = null)
+    {
+        if (Utils::isAdminPlugin()) {
+            $page = Grav::instance()['admin']->page() ?? null;
+        } else {
+            $page = $page ?? Grav::instance()['page'] ?? null;
+        }
+
+        // Try to find var in the page headers
+        if ($page instanceof PageInterface && $page->exists()) {
+            // Loop over pages and look for header vars
+            while ($page && !$page->root()) {
+                $header = new Data((array)$page->header());
+                $value = $header->get("$plugin.$var");
+                if (isset($value)) {
+                    return $value;
+                }
+                $page = $page->parent();
+            }
+        }
+
+        return Grav::instance()['config']->get("plugins.$plugin.$var", $default);
+    }
+
     /**
      * Simpler getter for the plugin blueprint
      *
@@ -370,21 +445,28 @@ public static function saveConfig($plugin_name)
      */
     public function getBlueprint()
     {
-        if (!$this->blueprint) {
+        if (null === $this->blueprint) {
             $this->loadBlueprint();
+            \assert($this->blueprint instanceof Blueprint);
         }
+
         return $this->blueprint;
     }
 
     /**
      * Load blueprints.
+     *
+     * @return void
      */
     protected function loadBlueprint()
     {
-        if (!$this->blueprint) {
+        if (null === $this->blueprint) {
             $grav = Grav::instance();
+            /** @var Plugins $plugins */
             $plugins = $grav['plugins'];
-            $this->blueprint = $plugins->get($this->name)->blueprints();
+            $data = $plugins->get($this->name);
+            \assert($data !== null);
+            $this->blueprint = $data->blueprints();
         }
     }
 }
diff --git a/system/src/Grav/Common/Plugins.php b/system/src/Grav/Common/Plugins.php
index 358727f33f..42b1593c2d 100644
--- a/system/src/Grav/Common/Plugins.php
+++ b/system/src/Grav/Common/Plugins.php
@@ -3,23 +3,40 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use Exception;
 use Grav\Common\Config\Config;
 use Grav\Common\Data\Blueprints;
 use Grav\Common\Data\Data;
 use Grav\Common\File\CompiledYamlFile;
-use RocketTheme\Toolbox\Event\EventDispatcher;
+use Grav\Events\PluginsLoadedEvent;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use SplFileInfo;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use function get_class;
+use function is_object;
 
+/**
+ * Class Plugins
+ * @package Grav\Common
+ */
 class Plugins extends Iterator
 {
+    /** @var array|null */
     public $formFieldTypes;
 
+    /** @var bool */
+    private $plugins_initialized = false;
+
+    /**
+     * Plugins constructor.
+     */
     public function __construct()
     {
         parent::__construct();
@@ -30,17 +47,21 @@ public function __construct()
         $iterator = $locator->getIterator('plugins://');
 
         $plugins = [];
-        foreach($iterator as $directory) {
+        /** @var SplFileInfo $directory */
+        foreach ($iterator as $directory) {
             if (!$directory->isDir()) {
                 continue;
             }
             $plugins[] = $directory->getFilename();
         }
 
-        natsort($plugins);
+        sort($plugins, SORT_NATURAL | SORT_FLAG_CASE);
 
         foreach ($plugins as $plugin) {
-            $this->add($this->loadPlugin($plugin));
+            $object = $this->loadPlugin($plugin);
+            if ($object) {
+                $this->add($object);
+            }
         }
     }
 
@@ -52,28 +73,36 @@ public function setup()
         $blueprints = [];
         $formFields = [];
 
+        $grav = Grav::instance();
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
         /** @var Plugin $plugin */
         foreach ($this->items as $plugin) {
-            if (isset($plugin->features['blueprints'])) {
-                $blueprints["plugin://{$plugin->name}/blueprints"] = $plugin->features['blueprints'];
-            }
-            if (method_exists($plugin, 'getFormFieldTypes')) {
-                $formFields[get_class($plugin)] = isset($plugin->features['formfields']) ? $plugin->features['formfields'] : 0;
+            // Setup only enabled plugins.
+            if ($config["plugins.{$plugin->name}.enabled"] && $plugin instanceof Plugin) {
+                if (isset($plugin->features['blueprints'])) {
+                    $blueprints["plugin://{$plugin->name}/blueprints"] = $plugin->features['blueprints'];
+                }
+                if (method_exists($plugin, 'getFormFieldTypes')) {
+                    $formFields[get_class($plugin)] = $plugin->features['formfields'] ?? 0;
+                }
             }
         }
 
         if ($blueprints) {
             // Order by priority.
-            arsort($blueprints);
+            arsort($blueprints, SORT_NUMERIC);
 
             /** @var UniformResourceLocator $locator */
-            $locator = Grav::instance()['locator'];
-            $locator->addPath('blueprints', '', array_keys($blueprints), 'system/blueprints');
+            $locator = $grav['locator'];
+            $locator->addPath('blueprints', '', array_keys($blueprints), ['system', 'blueprints']);
         }
 
         if ($formFields) {
             // Order by priority.
-            arsort($formFields);
+            arsort($formFields, SORT_NUMERIC);
 
             $list = [];
             foreach ($formFields as $className => $priority) {
@@ -91,10 +120,14 @@ public function setup()
      * Registers all plugins.
      *
      * @return Plugin[] array of Plugin objects
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function init()
     {
+        if ($this->plugins_initialized)  {
+            return $this->items;
+        }
+
         $grav = Grav::instance();
 
         /** @var Config $config */
@@ -106,11 +139,23 @@ public function init()
         foreach ($this->items as $instance) {
             // Register only enabled plugins.
             if ($config["plugins.{$instance->name}.enabled"] && $instance instanceof Plugin) {
+                // Set plugin configuration.
                 $instance->setConfig($config);
+                // Register autoloader.
+                if (method_exists($instance, 'autoload')) {
+                    $instance->setAutoloader($instance->autoload());
+                }
+                // Register event listeners.
                 $events->addSubscriber($instance);
             }
         }
 
+        // Plugins Loaded Event
+        $event = new PluginsLoadedEvent($grav, $this);
+        $grav->dispatchEvent($event);
+
+        $this->plugins_initialized = true;
+
         return $this->items;
     }
 
@@ -118,6 +163,7 @@ public function init()
      * Add a plugin
      *
      * @param Plugin $plugin
+     * @return void
      */
     public function add($plugin)
     {
@@ -126,14 +172,55 @@ public function add($plugin)
         }
     }
 
+    /**
+     * @return array
+     */
+    public function __debugInfo(): array
+    {
+        $array = (array)$this;
+
+        unset($array["\0Grav\Common\Iterator\0iteratorUnset"]);
+
+        return $array;
+    }
+
+    /**
+     * @return Plugin[] Index of all plugins by plugin name.
+     */
+    public static function getPlugins(): array
+    {
+        /** @var Plugins $plugins */
+        $plugins = Grav::instance()['plugins'];
+
+        $list = [];
+        foreach ($plugins as $instance) {
+            $list[$instance->name] = $instance;
+        }
+
+        return $list;
+    }
+
+    /**
+     * @param string $name Plugin name
+     * @return Plugin|null Plugin object or null if plugin cannot be found.
+     */
+    public static function getPlugin(string $name)
+    {
+        $list = static::getPlugins();
+
+        return $list[$name] ?? null;
+    }
+
     /**
      * Return list of all plugin data with their blueprints.
      *
-     * @return array
+     * @return Data[]
      */
     public static function all()
     {
         $grav = Grav::instance();
+
+        /** @var Plugins $plugins */
         $plugins = $grav['plugins'];
         $list = [];
 
@@ -142,8 +229,8 @@ public static function all()
 
             try {
                 $result = self::get($name);
-            } catch (\Exception $e) {
-                $exception = new \RuntimeException(sprintf('Plugin %s: %s', $name, $e->getMessage()), $e->getCode(), $e);
+            } catch (Exception $e) {
+                $exception = new RuntimeException(sprintf('Plugin %s: %s', $name, $e->getMessage()), $e->getCode(), $e);
 
                 /** @var Debugger $debugger */
                 $debugger = $grav['debugger'];
@@ -165,7 +252,6 @@ public static function all()
      * Get a plugin by name
      *
      * @param string $name
-     *
      * @return Data|null
      */
     public static function get($name)
@@ -193,36 +279,52 @@ public static function get($name)
         return $obj;
     }
 
+    /**
+     * @param string $name
+     * @return Plugin|null
+     */
     protected function loadPlugin($name)
     {
+        // NOTE: ALL THE LOCAL VARIABLES ARE USED INSIDE INCLUDED FILE, DO NOT REMOVE THEM!
         $grav = Grav::instance();
+        /** @var UniformResourceLocator $locator */
         $locator = $grav['locator'];
+        $class = null;
 
+        // Start by attempting to load the plugin_name.php file.
         $file = $locator->findResource('plugins://' . $name . DS . $name . PLUGIN_EXT);
-
         if (is_file($file)) {
-            // Local variables available in the file: $grav, $config, $name, $file
+            // Local variables available in the file: $grav, $name, $file
             $class = include_once $file;
+            if (!is_object($class) || !is_subclass_of($class, Plugin::class, true)) {
+                $class = null;
+            }
+        }
 
+        // If the class hasn't been initialized yet, guess the class name and create a new instance.
+        if (null === $class) {
+            $className = Inflector::camelize($name);
             $pluginClassFormat = [
                 'Grav\\Plugin\\' . ucfirst($name). 'Plugin',
-                'Grav\\Plugin\\' . Inflector::camelize($name) . 'Plugin'
+                'Grav\\Plugin\\' . $className . 'Plugin',
+                'Grav\\Plugin\\' . $className
             ];
 
             foreach ($pluginClassFormat as $pluginClass) {
-                if (class_exists($pluginClass)) {
+                if (is_subclass_of($pluginClass, Plugin::class, true)) {
                     $class = new $pluginClass($name, $grav);
                     break;
                 }
             }
-        } else {
+        }
+
+        // Log a warning if plugin cannot be found.
+        if (null === $class) {
             $grav['log']->addWarning(
-                sprintf("Plugin '%s' enabled but not found! Try clearing cache with `bin/grav clear-cache`", $name)
+                sprintf("Plugin '%s' enabled but not found! Try clearing cache with `bin/grav clearcache`", $name)
             );
-            return null;
         }
 
         return $class;
     }
-
 }
diff --git a/system/src/Grav/Common/Processors/AssetsProcessor.php b/system/src/Grav/Common/Processors/AssetsProcessor.php
index 8b4640138e..e460fb0023 100644
--- a/system/src/Grav/Common/Processors/AssetsProcessor.php
+++ b/system/src/Grav/Common/Processors/AssetsProcessor.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,12 +13,23 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+/**
+ * Class AssetsProcessor
+ * @package Grav\Common\Processors
+ */
 class AssetsProcessor extends ProcessorBase
 {
+    /** @var string */
     public $id = '_assets';
+    /** @var string */
     public $title = 'Assets';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $this->container['assets']->init();
diff --git a/system/src/Grav/Common/Processors/BackupsProcessor.php b/system/src/Grav/Common/Processors/BackupsProcessor.php
index d2a822c913..83e8a0c212 100644
--- a/system/src/Grav/Common/Processors/BackupsProcessor.php
+++ b/system/src/Grav/Common/Processors/BackupsProcessor.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,12 +13,23 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+/**
+ * Class BackupsProcessor
+ * @package Grav\Common\Processors
+ */
 class BackupsProcessor extends ProcessorBase
 {
+    /** @var string */
     public $id = '_backups';
+    /** @var string */
     public $title = 'Backups';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $backups = $this->container['backups'];
diff --git a/system/src/Grav/Common/Processors/ConfigurationProcessor.php b/system/src/Grav/Common/Processors/ConfigurationProcessor.php
deleted file mode 100644
index 83ceb8421d..0000000000
--- a/system/src/Grav/Common/Processors/ConfigurationProcessor.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\Processors
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\Processors;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class ConfigurationProcessor extends ProcessorBase
-{
-    public $id = '_config';
-    public $title = 'Configuration';
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
-    {
-        $this->startTimer();
-        $this->container['config']->init();
-        $this->container['plugins']->setup();
-        $this->stopTimer();
-
-        return $handler->handle($request);
-    }
-}
diff --git a/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php b/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php
index 11a39e894f..a3d5a51521 100644
--- a/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php
+++ b/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php
@@ -3,29 +3,38 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Processors;
 
-use Grav\Framework\Psr7\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+/**
+ * Class DebuggerAssetsProcessor
+ * @package Grav\Common\Processors
+ */
 class DebuggerAssetsProcessor extends ProcessorBase
 {
+    /** @var string */
     public $id = 'debugger_assets';
+    /** @var string */
     public $title = 'Debugger Assets';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $this->container['debugger']->addAssets();
         $this->stopTimer();
 
         return $handler->handle($request);
-
     }
 }
diff --git a/system/src/Grav/Common/Processors/DebuggerProcessor.php b/system/src/Grav/Common/Processors/DebuggerProcessor.php
deleted file mode 100644
index 892af55c0b..0000000000
--- a/system/src/Grav/Common/Processors/DebuggerProcessor.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\Processors
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\Processors;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class DebuggerProcessor extends ProcessorBase
-{
-    public $id = '_debugger';
-    public $title = 'Init Debugger';
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
-    {
-        $this->startTimer();
-        $this->container['debugger']->init();
-        $this->stopTimer();
-
-        return $handler->handle($request);
-    }
-}
diff --git a/system/src/Grav/Common/Processors/ErrorsProcessor.php b/system/src/Grav/Common/Processors/ErrorsProcessor.php
deleted file mode 100644
index b0ef6cae87..0000000000
--- a/system/src/Grav/Common/Processors/ErrorsProcessor.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\Processors
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\Processors;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class ErrorsProcessor extends ProcessorBase
-{
-    public $id = '_errors';
-    public $title = 'Error Handlers Reset';
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
-    {
-        $this->startTimer();
-        $this->container['errors']->resetHandlers();
-        $this->stopTimer();
-
-        return $handler->handle($request);
-    }
-}
diff --git a/system/src/Grav/Common/Processors/Events/RequestHandlerEvent.php b/system/src/Grav/Common/Processors/Events/RequestHandlerEvent.php
index fd97e9e451..30f6195b6f 100644
--- a/system/src/Grav/Common/Processors/Events/RequestHandlerEvent.php
+++ b/system/src/Grav/Common/Processors/Events/RequestHandlerEvent.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -16,6 +16,10 @@
 use Psr\Http\Server\MiddlewareInterface;
 use RocketTheme\Toolbox\Event\Event;
 
+/**
+ * Class RequestHandlerEvent
+ * @package Grav\Common\Processors\Events
+ */
 class RequestHandlerEvent extends Event
 {
     /**
diff --git a/system/src/Grav/Common/Processors/InitializeProcessor.php b/system/src/Grav/Common/Processors/InitializeProcessor.php
index fe2869ce7a..24f4cf960d 100644
--- a/system/src/Grav/Common/Processors/InitializeProcessor.php
+++ b/system/src/Grav/Common/Processors/InitializeProcessor.php
@@ -3,32 +3,341 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Processors;
 
 use Grav\Common\Config\Config;
+use Grav\Common\Debugger;
+use Grav\Common\Errors\Errors;
+use Grav\Common\Grav;
+use Grav\Common\Page\Pages;
+use Grav\Common\Plugins;
+use Grav\Common\Session;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
+use Grav\Framework\File\Formatter\YamlFormatter;
+use Grav\Framework\File\YamlFile;
+use Grav\Framework\Psr7\Response;
 use Grav\Framework\Session\Exceptions\SessionException;
+use Monolog\Formatter\LineFormatter;
+use Monolog\Handler\SyslogHandler;
+use Monolog\Logger;
+use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use function defined;
+use function in_array;
 
+/**
+ * Class InitializeProcessor
+ * @package Grav\Common\Processors
+ */
 class InitializeProcessor extends ProcessorBase
 {
-    public $id = 'init';
+    /** @var string */
+    public $id = '_init';
+    /** @var string */
     public $title = 'Initialize';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /** @var bool */
+    protected static $cli_initialized = false;
+
+    /**
+     * @param Grav $grav
+     * @return void
+     */
+    public static function initializeCli(Grav $grav)
+    {
+        if (!static::$cli_initialized) {
+            static::$cli_initialized = true;
+
+            $instance = new static($grav);
+            $instance->processCli();
+        }
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $this->startTimer('_init', 'Initialize');
+
+        // Load configuration.
+        $config = $this->initializeConfig();
+
+        // Initialize logger.
+        $this->initializeLogger($config);
+
+        // Initialize error handlers.
+        $this->initializeErrors();
+
+        // Initialize debugger.
+        $debugger = $this->initializeDebugger();
+
+        // Debugger can return response right away.
+        $response = $this->handleDebuggerRequest($debugger, $request);
+        if ($response) {
+            $this->stopTimer('_init');
+
+            return $response;
+        }
+
+        // Initialize output buffering.
+        $this->initializeOutputBuffering($config);
+
+        // Set timezone, locale.
+        $this->initializeLocale($config);
+
+        // Load plugins.
+        $this->initializePlugins();
+
+        // Load pages.
+        $this->initializePages($config);
+
+        // Load accounts (decides class to be used).
+        // TODO: remove in 2.0.
+        $this->container['accounts'];
+
+        // Initialize session (used by URI, see issue #3269).
+        $this->initializeSession($config);
+
+        // Initialize URI (uses session, see issue #3269).
+        $this->initializeUri($config);
+
+        // Grav may return redirect response right away.
+        $redirectCode = (int)$config->get('system.pages.redirect_trailing_slash', 1);
+        if ($redirectCode) {
+            $response = $this->handleRedirectRequest($request, $redirectCode > 300 ? $redirectCode : null);
+            if ($response) {
+                $this->stopTimer('_init');
+
+                return $response;
+            }
+        }
+
+        $this->stopTimer('_init');
+
+        // Wrap call to next handler so that debugger can profile it.
+        /** @var Response $response */
+        $response = $debugger->profile(static function () use ($handler, $request) {
+            return $handler->handle($request);
+        });
+
+        // Log both request and response and return the response.
+        return $debugger->logRequest($request, $response);
+    }
+
+    public function processCli(): void
     {
-        $this->startTimer();
+        // Load configuration.
+        $config = $this->initializeConfig();
+
+        // Initialize logger.
+        $this->initializeLogger($config);
+
+        // Disable debugger.
+        $this->container['debugger']->enabled(false);
+
+        // Set timezone, locale.
+        $this->initializeLocale($config);
+
+        // Load plugins.
+        $this->initializePlugins();
+
+        // Load pages.
+        $this->initializePages($config);
+
+        // Initialize URI.
+        $this->initializeUri($config);
+
+        // Load accounts (decides class to be used).
+        // TODO: remove in 2.0.
+        $this->container['accounts'];
+    }
+
+    /**
+     * @return Config
+     */
+    protected function initializeConfig(): Config
+    {
+        $this->startTimer('_init_config', 'Configuration');
+
+        // Initialize Configuration
+        $grav = $this->container;
 
         /** @var Config $config */
-        $config = $this->container['config'];
-        $config->debug();
+        $config = $grav['config'];
+        $config->init();
+        $grav['plugins']->setup();
+
+        if (defined('GRAV_SCHEMA') && $config->get('versions') === null) {
+            $filename = USER_DIR . 'config/versions.yaml';
+            if (!is_file($filename)) {
+                $versions = [
+                    'core' => [
+                        'grav' => [
+                            'version' => GRAV_VERSION,
+                            'schema' => GRAV_SCHEMA
+                        ]
+                    ]
+                ];
+                $config->set('versions', $versions);
+
+                $file = new YamlFile($filename, new YamlFormatter(['inline' => 4]));
+                $file->save($versions);
+            }
+        }
+
+        // Override configuration using the environment.
+        $prefix = 'GRAV_CONFIG';
+        $env = getenv($prefix);
+        if ($env) {
+            $cPrefix = $prefix . '__';
+            $aPrefix = $prefix . '_ALIAS__';
+            $cLen = strlen($cPrefix);
+            $aLen = strlen($aPrefix);
+
+            $keys = $aliases = [];
+            $env = $_ENV + $_SERVER;
+            foreach ($env as $key => $value) {
+                if (!str_starts_with($key, $prefix)) {
+                    continue;
+                }
+                if (str_starts_with($key, $cPrefix)) {
+                    $key = str_replace('__', '.', substr($key, $cLen));
+                    $keys[$key] = $value;
+                } elseif (str_starts_with($key, $aPrefix)) {
+                    $key = substr($key, $aLen);
+                    $aliases[$key] = $value;
+                }
+            }
+            $list = [];
+            foreach ($keys as $key => $value) {
+                foreach ($aliases as $alias => $real) {
+                    $key = str_replace($alias, $real, $key);
+                }
+                $list[$key] = $value;
+                $config->set($key, $value);
+            }
+        }
+
+        $this->stopTimer('_init_config');
+
+        return $config;
+    }
+
+    /**
+     * @param Config $config
+     * @return Logger
+     */
+    protected function initializeLogger(Config $config): Logger
+    {
+        $this->startTimer('_init_logger', 'Logger');
+
+        $grav = $this->container;
+
+        // Initialize Logging
+        /** @var Logger $log */
+        $log = $grav['log'];
+
+        if ($config->get('system.log.handler', 'file') === 'syslog') {
+            $log->popHandler();
+
+            $facility = $config->get('system.log.syslog.facility', 'local6');
+            $tag = $config->get('system.log.syslog.tag', 'grav');
+            $logHandler = new SyslogHandler($tag, $facility);
+            $formatter = new LineFormatter("%channel%.%level_name%: %message% %extra%");
+            $logHandler->setFormatter($formatter);
+
+            $log->pushHandler($logHandler);
+        }
+
+        $this->stopTimer('_init_logger');
+
+        return $log;
+    }
+
+    /**
+     * @return Errors
+     */
+    protected function initializeErrors(): Errors
+    {
+        $this->startTimer('_init_errors', 'Error Handlers Reset');
+
+        $grav = $this->container;
+
+        // Initialize Error Handlers
+        /** @var Errors $errors */
+        $errors = $grav['errors'];
+        $errors->resetHandlers();
+
+        $this->stopTimer('_init_errors');
+
+        return $errors;
+    }
+
+    /**
+     * @return Debugger
+     */
+    protected function initializeDebugger(): Debugger
+    {
+        $this->startTimer('_init_debugger', 'Init Debugger');
+
+        $grav = $this->container;
+
+        /** @var Debugger $debugger */
+        $debugger = $grav['debugger'];
+        $debugger->init();
+
+        $this->stopTimer('_init_debugger');
+
+        return $debugger;
+    }
+
+    /**
+     * @param Debugger $debugger
+     * @param ServerRequestInterface $request
+     * @return ResponseInterface|null
+     */
+    protected function handleDebuggerRequest(Debugger $debugger, ServerRequestInterface $request): ?ResponseInterface
+    {
+        // Clockwork integration.
+        $clockwork = $debugger->getClockwork();
+        if ($clockwork) {
+            $server = $request->getServerParams();
+//            $baseUri = str_replace('\\', '/', dirname(parse_url($server['SCRIPT_NAME'], PHP_URL_PATH)));
+//            if ($baseUri === '/') {
+//                $baseUri = '';
+//            }
+            $requestTime = $server['REQUEST_TIME_FLOAT'] ?? GRAV_REQUEST_TIME;
+
+            $request = $request->withAttribute('request_time', $requestTime);
+
+            // Handle clockwork API calls.
+            $uri = $request->getUri();
+            if (Utils::contains($uri->getPath(), '/__clockwork/')) {
+                return $debugger->debuggerRequest($request);
+            }
+
+            $this->container['clockwork'] = $clockwork;
+        }
+
+        return null;
+    }
+
+    /**
+     * @param Config $config
+     */
+    protected function initializeOutputBuffering(Config $config): void
+    {
+        $this->startTimer('_init_ob', 'Initialize Output Buffering');
 
         // Use output buffering to prevent headers from being sent too early.
         ob_start();
@@ -37,44 +346,116 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             ob_start();
         }
 
+        $this->stopTimer('_init_ob');
+    }
+
+    /**
+     * @param Config $config
+     */
+    protected function initializeLocale(Config $config): void
+    {
+        $this->startTimer('_init_locale', 'Initialize Locale');
+
         // Initialize the timezone.
         $timezone = $config->get('system.timezone');
         if ($timezone) {
             date_default_timezone_set($timezone);
         }
 
-        // FIXME: Initialize session should happen later after plugins have been loaded. This is a workaround to fix session issues in AWS.
-        if (isset($this->container['session']) && $config->get('system.session.initialize', true)) {
-            // TODO: remove in 2.0.
-            $this->container['accounts'];
+        $grav = $this->container;
+        $grav->setLocale();
 
-            try {
-                $this->container['session']->init();
-            } catch (SessionException $e) {
-                $this->container['session']->init();
-                $message = 'Session corruption detected, restarting session...';
-                $this->addMessage($message);
-                $this->container['messages']->add($message, 'error');
-            }
+        $this->stopTimer('_init_locale');
+    }
+
+    protected function initializePlugins(): Plugins
+    {
+        $this->startTimer('_init_plugins_load', 'Load Plugins');
+
+        $grav = $this->container;
+
+        /** @var Plugins $plugins */
+        $plugins = $grav['plugins'];
+        $plugins->init();
+
+        $this->stopTimer('_init_plugins_load');
+
+        return $plugins;
+    }
+
+    protected function initializePages(Config $config): Pages
+    {
+        $this->startTimer('_init_pages_register', 'Load Pages');
+
+        $grav = $this->container;
+
+        /** @var Pages $pages */
+        $pages = $grav['pages'];
+        // Upgrading from older Grav versions won't work without checking if the method exists.
+        if (method_exists($pages, 'register')) {
+            $pages->register();
         }
 
+        $this->stopTimer('_init_pages_register');
+
+        return $pages;
+    }
+
+
+    protected function initializeUri(Config $config): void
+    {
+        $this->startTimer('_init_uri', 'Initialize URI');
+
+        $grav = $this->container;
+
         /** @var Uri $uri */
-        $uri = $this->container['uri'];
+        $uri = $grav['uri'];
         $uri->init();
 
+        $this->stopTimer('_init_uri');
+    }
+
+    protected function handleRedirectRequest(RequestInterface $request, int $code = null): ?ResponseInterface
+    {
+        if (!in_array($request->getMethod(), ['GET', 'HEAD'])) {
+            return null;
+        }
+
         // Redirect pages with trailing slash if configured to do so.
-        $path = $uri->path() ?: '/';
-        if ($path !== '/'
-            && $config->get('system.pages.redirect_trailing_slash', false)
-            && Utils::endsWith($path, '/')) {
+        $uri = $request->getUri();
+        $path = $uri->getPath() ?: '/';
+        $root = $this->container['uri']->rootUrl();
 
-            $redirect = (string) $uri::getCurrentRoute()->toString();
-            $this->container->redirect($redirect);
+        if ($path !== $root && $path !== $root . '/' && Utils::endsWith($path, '/')) {
+            // Use permanent redirect for SEO reasons.
+            return $this->container->getRedirectResponse((string)$uri->withPath(rtrim($path, '/')), $code);
         }
 
-        $this->container->setLocale();
-        $this->stopTimer();
+        return null;
+    }
+
+    /**
+     * @param Config $config
+     */
+    protected function initializeSession(Config $config): void
+    {
+        // FIXME: Initialize session should happen later after plugins have been loaded. This is a workaround to fix session issues in AWS.
+        if (isset($this->container['session']) && $config->get('system.session.initialize', true)) {
+            $this->startTimer('_init_session', 'Start Session');
+
+            /** @var Session $session */
+            $session = $this->container['session'];
 
-        return $handler->handle($request);
+            try {
+                $session->init();
+            } catch (SessionException $e) {
+                $session->init();
+                $message = 'Session corruption detected, restarting session...';
+                $this->addMessage($message);
+                $this->container['messages']->add($message, 'error');
+            }
+
+            $this->stopTimer('_init_session');
+        }
     }
 }
diff --git a/system/src/Grav/Common/Processors/LoggerProcessor.php b/system/src/Grav/Common/Processors/LoggerProcessor.php
deleted file mode 100644
index af3c169990..0000000000
--- a/system/src/Grav/Common/Processors/LoggerProcessor.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\Processors
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\Processors;
-
-use Grav\Common\Config\Config;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Handler\SyslogHandler;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class LoggerProcessor extends ProcessorBase
-{
-    public $id = '_logger';
-    public $title = 'Logger';
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
-    {
-        $this->startTimer();
-
-        $grav = $this->container;
-
-        /** @var Config $config */
-        $config = $grav['config'];
-
-        switch ($config->get('system.log.handler', 'file')) {
-            case 'syslog':
-                $log = $grav['log'];
-                $log->popHandler();
-
-                $facility = $config->get('system.log.syslog.facility', 'local6');
-                $logHandler = new SyslogHandler('grav', $facility);
-                $formatter = new LineFormatter("%channel%.%level_name%: %message% %extra%");
-                $logHandler->setFormatter($formatter);
-
-                $log->pushHandler($logHandler);
-                break;
-        }
-        $this->stopTimer();
-
-        return $handler->handle($request);
-    }
-}
diff --git a/system/src/Grav/Common/Processors/PagesProcessor.php b/system/src/Grav/Common/Processors/PagesProcessor.php
index ede22e5c4d..3338e0c632 100644
--- a/system/src/Grav/Common/Processors/PagesProcessor.php
+++ b/system/src/Grav/Common/Processors/PagesProcessor.php
@@ -3,24 +3,38 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Processors;
 
 use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Framework\RequestHandler\Exception\RequestException;
+use Grav\Plugin\Form\Forms;
 use RocketTheme\Toolbox\Event\Event;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use RuntimeException;
 
+/**
+ * Class PagesProcessor
+ * @package Grav\Common\Processors
+ */
 class PagesProcessor extends ProcessorBase
 {
+    /** @var string */
     public $id = 'pages';
+    /** @var string */
     public $title = 'Pages';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
 
@@ -28,23 +42,46 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $this->container['debugger']->addMessage($this->container['cache']->getCacheStatus());
 
         $this->container['pages']->init();
-        $this->container->fireEvent('onPagesInitialized', new Event(['pages' => $this->container['pages']]));
-        $this->container->fireEvent('onPageInitialized', new Event(['page' => $this->container['page']]));
+
+        $route = $this->container['route'];
+
+        $this->container->fireEvent('onPagesInitialized', new Event(
+            [
+                'pages' => $this->container['pages'],
+                'route' => $route,
+                'request' => $request
+            ]
+        ));
+        $this->container->fireEvent('onPageInitialized', new Event(
+            [
+                'page' => $this->container['page'],
+                'route' => $route,
+                'request' => $request
+            ]
+        ));
 
         /** @var PageInterface $page */
         $page = $this->container['page'];
 
         if (!$page->routable()) {
+            $exception = new RequestException($request, 'Page Not Found', 404);
             // If no page found, fire event
-            $event = new Event(['page' => $page]);
+            $event = new Event([
+                'page' => $page,
+                'code' => $exception->getCode(),
+                'message' => $exception->getMessage(),
+                'exception' => $exception,
+                'route' => $route,
+                'request' => $request
+            ]);
             $event->page = null;
             $event = $this->container->fireEvent('onPageNotFound', $event);
 
             if (isset($event->page)) {
-                unset ($this->container['page']);
+                unset($this->container['page']);
                 $this->container['page'] = $page = $event->page;
             } else {
-                throw new \RuntimeException('Page Not Found', 404);
+                throw new RuntimeException('Page Not Found', 404);
             }
 
             $this->addMessage("Routed to page {$page->rawRoute()} (type: {$page->template()}) [Not Found fallback]");
@@ -53,12 +90,18 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
             $task = $this->container['task'];
             $action = $this->container['action'];
+
+            /** @var Forms $forms */
+            $forms = $this->container['forms'] ?? null;
+            $form = $forms ? $forms->getActiveForm() : null;
+
+            $options = ['page' => $page, 'form' => $form, 'request' => $request];
             if ($task) {
-                $event = new Event(['task' => $task, 'page' => $page]);
+                $event = new Event(['task' => $task] + $options);
                 $this->container->fireEvent('onPageTask', $event);
                 $this->container->fireEvent('onPageTask.' . $task, $event);
             } elseif ($action) {
-                $event = new Event(['action' => $action, 'page' => $page]);
+                $event = new Event(['action' => $action] + $options);
                 $this->container->fireEvent('onPageAction', $event);
                 $this->container->fireEvent('onPageAction.' . $action, $event);
             }
diff --git a/system/src/Grav/Common/Processors/PluginsProcessor.php b/system/src/Grav/Common/Processors/PluginsProcessor.php
index 9d2943b67e..ae8790104c 100644
--- a/system/src/Grav/Common/Processors/PluginsProcessor.php
+++ b/system/src/Grav/Common/Processors/PluginsProcessor.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,18 +13,27 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+/**
+ * Class PluginsProcessor
+ * @package Grav\Common\Processors
+ */
 class PluginsProcessor extends ProcessorBase
 {
+    /** @var string */
     public $id = 'plugins';
-    public $title = 'Plugins';
+    /** @var string */
+    public $title = 'Initialize Plugins';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
-        // TODO: remove in 2.0.
-        $this->container['accounts'];
-        $this->container['plugins']->init();
-        $this->container->fireEvent('onPluginsInitialized');
+        $grav = $this->container;
+        $grav->fireEvent('onPluginsInitialized');
         $this->stopTimer();
 
         return $handler->handle($request);
diff --git a/system/src/Grav/Common/Processors/ProcessorBase.php b/system/src/Grav/Common/Processors/ProcessorBase.php
index 5ce7bfd299..9353391448 100644
--- a/system/src/Grav/Common/Processors/ProcessorBase.php
+++ b/system/src/Grav/Common/Processors/ProcessorBase.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,34 +12,56 @@
 use Grav\Common\Debugger;
 use Grav\Common\Grav;
 
+/**
+ * Class ProcessorBase
+ * @package Grav\Common\Processors
+ */
 abstract class ProcessorBase implements ProcessorInterface
 {
     /** @var Grav */
     protected $container;
 
+    /** @var string */
     public $id = 'processorbase';
+    /** @var string */
     public $title = 'ProcessorBase';
 
+    /**
+     * ProcessorBase constructor.
+     * @param Grav $container
+     */
     public function __construct(Grav $container)
     {
         $this->container = $container;
     }
 
-    protected function startTimer($id = null, $title = null)
+    /**
+     * @param string|null $id
+     * @param string|null $title
+     */
+    protected function startTimer($id = null, $title = null): void
     {
         /** @var Debugger $debugger */
         $debugger = $this->container['debugger'];
         $debugger->startTimer($id ?? $this->id, $title ?? $this->title);
     }
 
-    protected function stopTimer($id = null)
+    /**
+     * @param string|null $id
+     */
+    protected function stopTimer($id = null): void
     {
         /** @var Debugger $debugger */
         $debugger = $this->container['debugger'];
         $debugger->stopTimer($id ?? $this->id);
     }
 
-    protected function addMessage($message, $label = 'info', $isString = true)
+    /**
+     * @param string $message
+     * @param string $label
+     * @param bool $isString
+     */
+    protected function addMessage($message, $label = 'info', $isString = true): void
     {
         /** @var Debugger $debugger */
         $debugger = $this->container['debugger'];
diff --git a/system/src/Grav/Common/Processors/ProcessorInterface.php b/system/src/Grav/Common/Processors/ProcessorInterface.php
index a8e4aaaef8..0aed195044 100644
--- a/system/src/Grav/Common/Processors/ProcessorInterface.php
+++ b/system/src/Grav/Common/Processors/ProcessorInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,6 +11,10 @@
 
 use Psr\Http\Server\MiddlewareInterface;
 
+/**
+ * Interface ProcessorInterface
+ * @package Grav\Common\Processors
+ */
 interface ProcessorInterface extends MiddlewareInterface
 {
 }
diff --git a/system/src/Grav/Common/Processors/RenderProcessor.php b/system/src/Grav/Common/Processors/RenderProcessor.php
index 06a6c79f36..e12cc45a37 100644
--- a/system/src/Grav/Common/Processors/RenderProcessor.php
+++ b/system/src/Grav/Common/Processors/RenderProcessor.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,13 +14,25 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use RocketTheme\Toolbox\Event\Event;
 
+/**
+ * Class RenderProcessor
+ * @package Grav\Common\Processors
+ */
 class RenderProcessor extends ProcessorBase
 {
+    /** @var string */
     public $id = 'render';
+    /** @var string */
     public $title = 'Render';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
 
@@ -31,23 +43,27 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             return $output;
         }
 
-        ob_start();
+        /** @var PageInterface $page */
+        $page = $this->container['page'];
 
         // Use internal Grav output.
         $container->output = $output;
-        $container->fireEvent('onOutputGenerated');
+
+        ob_start();
+
+        $event = new Event(['page' => $page, 'output' => &$container->output]);
+        $container->fireEvent('onOutputGenerated', $event);
 
         echo $container->output;
 
+        $html = ob_get_clean();
+
         // remove any output
         $container->output = '';
 
-        $this->container->fireEvent('onOutputRendered');
+        $event = new Event(['page' => $page, 'output' => $html]);
+        $this->container->fireEvent('onOutputRendered', $event);
 
-        $html = ob_get_clean();
-
-        /** @var PageInterface $page */
-        $page = $this->container['page'];
         $this->stopTimer();
 
         return new Response($page->httpResponseCode(), $page->httpHeaders(), $html);
diff --git a/system/src/Grav/Common/Processors/RequestProcessor.php b/system/src/Grav/Common/Processors/RequestProcessor.php
index 97564e69bc..bad410c110 100644
--- a/system/src/Grav/Common/Processors/RequestProcessor.php
+++ b/system/src/Grav/Common/Processors/RequestProcessor.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,16 +11,28 @@
 
 use Grav\Common\Processors\Events\RequestHandlerEvent;
 use Grav\Common\Uri;
+use Grav\Common\Utils;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+/**
+ * Class RequestProcessor
+ * @package Grav\Common\Processors
+ */
 class RequestProcessor extends ProcessorBase
 {
+    /** @var string */
     public $id = 'request';
+    /** @var string */
     public $title = 'Request';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
 
@@ -31,7 +43,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         }
 
         $uri = $request->getUri();
-        $ext = mb_strtolower(pathinfo($uri->getPath(), PATHINFO_EXTENSION));
+        $ext = mb_strtolower(Utils::pathinfo($uri->getPath(), PATHINFO_EXTENSION));
 
         $request = $request
             ->withAttribute('grav', $this->container)
diff --git a/system/src/Grav/Common/Processors/SchedulerProcessor.php b/system/src/Grav/Common/Processors/SchedulerProcessor.php
index 64f3fba8f7..722bfcc92e 100644
--- a/system/src/Grav/Common/Processors/SchedulerProcessor.php
+++ b/system/src/Grav/Common/Processors/SchedulerProcessor.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,12 +14,23 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+/**
+ * Class SchedulerProcessor
+ * @package Grav\Common\Processors
+ */
 class SchedulerProcessor extends ProcessorBase
 {
+    /** @var string */
     public $id = '_scheduler';
+    /** @var string */
     public $title = 'Scheduler';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $scheduler = $this->container['scheduler'];
diff --git a/system/src/Grav/Common/Processors/TasksProcessor.php b/system/src/Grav/Common/Processors/TasksProcessor.php
index aaf5cdf33a..29f3458eec 100644
--- a/system/src/Grav/Common/Processors/TasksProcessor.php
+++ b/system/src/Grav/Common/Processors/TasksProcessor.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,12 +14,23 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+/**
+ * Class TasksProcessor
+ * @package Grav\Common\Processors
+ */
 class TasksProcessor extends ProcessorBase
 {
+    /** @var string */
     public $id = 'tasks';
+    /** @var string */
     public $title = 'Tasks';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
 
@@ -42,7 +53,6 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                     $this->stopTimer();
 
                     return $response;
-
                 } catch (NotFoundException $e) {
                     // Task not found: Let it pass through.
                 }
diff --git a/system/src/Grav/Common/Processors/ThemesProcessor.php b/system/src/Grav/Common/Processors/ThemesProcessor.php
index d1c6ae5644..60d089e8be 100644
--- a/system/src/Grav/Common/Processors/ThemesProcessor.php
+++ b/system/src/Grav/Common/Processors/ThemesProcessor.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,12 +13,23 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+/**
+ * Class ThemesProcessor
+ * @package Grav\Common\Processors
+ */
 class ThemesProcessor extends ProcessorBase
 {
+    /** @var string */
     public $id = 'themes';
+    /** @var string */
     public $title = 'Themes';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $this->container['themes']->init();
diff --git a/system/src/Grav/Common/Processors/TwigProcessor.php b/system/src/Grav/Common/Processors/TwigProcessor.php
index 4ed247d013..ffc1032eac 100644
--- a/system/src/Grav/Common/Processors/TwigProcessor.php
+++ b/system/src/Grav/Common/Processors/TwigProcessor.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Processors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,12 +13,23 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+/**
+ * Class TwigProcessor
+ * @package Grav\Common\Processors
+ */
 class TwigProcessor extends ProcessorBase
 {
+    /** @var string */
     public $id = 'twig';
+    /** @var string */
     public $title = 'Twig';
 
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $this->startTimer();
         $this->container['twig']->init();
diff --git a/system/src/Grav/Common/Scheduler/Cron.php b/system/src/Grav/Common/Scheduler/Cron.php
index 3a42b29ea3..0103839d35 100644
--- a/system/src/Grav/Common/Scheduler/Cron.php
+++ b/system/src/Grav/Common/Scheduler/Cron.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Scheduler
  * @author     Originally based on jqCron by Arnaud Buathier <arnaud@arnapou.net> modified for Grav integration
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -45,6 +45,15 @@
  * var_dump($cron->matchWithMargin(new \DateTime('2012-07-01 12:32:50'), -3, 5));
  * //  bool(true)
  */
+
+use DateInterval;
+use DateTime;
+use RuntimeException;
+use function count;
+use function in_array;
+use function is_array;
+use function is_string;
+
 class Cron
 {
     public const TYPE_UNDEFINED = '';
@@ -69,7 +78,7 @@ class Cron
             'name_year' => 'année',
             'text_period' => 'Chaque %s',
             'text_mins' => 'à %s minutes',
-            'text_time' => 'à %s:%s',
+            'text_time' => 'à %02s:%02s',
             'text_dow' => 'le %s',
             'text_month' => 'de %s',
             'text_dom' => 'le %s',
@@ -86,7 +95,7 @@ class Cron
             'name_year' => 'year',
             'text_period' => 'Every %s',
             'text_mins' => 'at %s minutes past the hour',
-            'text_time' => 'at %s:%s',
+            'text_time' => 'at %02s:%02s',
             'text_dow' => 'on %s',
             'text_month' => 'of %s',
             'text_dom' => 'on the %s',
@@ -127,7 +136,6 @@ class Cron
     protected $dom = [];
 
     /**
-     *
      * @param string|null $cron
      */
     public function __construct($cron = null)
@@ -138,7 +146,6 @@ public function __construct($cron = null)
     }
 
     /**
-     *
      * @return string
      */
     public function getCron()
@@ -153,7 +160,6 @@ public function getCron()
     }
 
     /**
-     *
      * @param string $lang 'fr' or 'en'
      * @return string
      */
@@ -191,7 +197,7 @@ public function getText($lang)
         }
 
         // month + year
-        if (\in_array($type, [self::TYPE_MONTH, self::TYPE_YEAR], true)) {
+        if (in_array($type, [self::TYPE_MONTH, self::TYPE_YEAR], true)) {
             $elements[] = sprintf($texts['text_dom'], $this->getCronDaysOfMonth());
         }
 
@@ -205,7 +211,7 @@ public function getText($lang)
         }
 
         // day + week + month + year
-        if (\in_array($type, [self::TYPE_DAY, self::TYPE_WEEK, self::TYPE_MONTH, self::TYPE_YEAR], true)) {
+        if (in_array($type, [self::TYPE_DAY, self::TYPE_WEEK, self::TYPE_MONTH, self::TYPE_YEAR], true)) {
             $elements[] = sprintf($texts['text_time'], $this->getCronHours(), $this->getCronMinutes());
         }
 
@@ -213,7 +219,6 @@ public function getText($lang)
     }
 
     /**
-     *
      * @return string
      */
     public function getType()
@@ -250,9 +255,8 @@ public function getType()
     }
 
     /**
-     *
      * @param string $cron
-     * @return Cron
+     * @return $this
      */
     public function setCron($cron)
     {
@@ -261,8 +265,8 @@ public function setCron($cron)
         $cron = preg_replace('/\s+/', ' ', $cron);
         // explode
         $elements = explode(' ', $cron);
-        if (\count($elements) !== 5) {
-            throw new \RuntimeException('Bad number of elements');
+        if (count($elements) !== 5) {
+            throw new RuntimeException('Bad number of elements');
         }
 
         $this->cron = $cron;
@@ -276,7 +280,6 @@ public function setCron($cron)
     }
 
     /**
-     *
      * @return string
      */
     public function getCronMinutes()
@@ -285,7 +288,6 @@ public function getCronMinutes()
     }
 
     /**
-     *
      * @return string
      */
     public function getCronHours()
@@ -294,7 +296,6 @@ public function getCronHours()
     }
 
     /**
-     *
      * @return string
      */
     public function getCronDaysOfMonth()
@@ -303,7 +304,6 @@ public function getCronDaysOfMonth()
     }
 
     /**
-     *
      * @return string
      */
     public function getCronMonths()
@@ -312,7 +312,6 @@ public function getCronMonths()
     }
 
     /**
-     *
      * @return string
      */
     public function getCronDaysOfWeek()
@@ -321,7 +320,6 @@ public function getCronDaysOfWeek()
     }
 
     /**
-     *
      * @return array
      */
     public function getMinutes()
@@ -330,7 +328,6 @@ public function getMinutes()
     }
 
     /**
-     *
      * @return array
      */
     public function getHours()
@@ -339,7 +336,6 @@ public function getHours()
     }
 
     /**
-     *
      * @return array
      */
     public function getDaysOfMonth()
@@ -348,7 +344,6 @@ public function getDaysOfMonth()
     }
 
     /**
-     *
      * @return array
      */
     public function getMonths()
@@ -357,7 +352,6 @@ public function getMonths()
     }
 
     /**
-     *
      * @return array
      */
     public function getDaysOfWeek()
@@ -366,9 +360,8 @@ public function getDaysOfWeek()
     }
 
     /**
-     *
-     * @param string|array $minutes
-     * @return Cron
+     * @param string|string[] $minutes
+     * @return $this
      */
     public function setMinutes($minutes)
     {
@@ -378,9 +371,8 @@ public function setMinutes($minutes)
     }
 
     /**
-     *
-     * @param string|array $hours
-     * @return Cron
+     * @param string|string[] $hours
+     * @return $this
      */
     public function setHours($hours)
     {
@@ -390,9 +382,8 @@ public function setHours($hours)
     }
 
     /**
-     *
-     * @param string|array $months
-     * @return Cron
+     * @param string|string[] $months
+     * @return $this
      */
     public function setMonths($months)
     {
@@ -402,9 +393,8 @@ public function setMonths($months)
     }
 
     /**
-     *
-     * @param string|array $dow
-     * @return Cron
+     * @param string|string[] $dow
+     * @return $this
      */
     public function setDaysOfWeek($dow)
     {
@@ -414,9 +404,8 @@ public function setDaysOfWeek($dow)
     }
 
     /**
-     *
-     * @param string|array $dom
-     * @return Cron
+     * @param string|string[] $dom
+     * @return $this
      */
     public function setDaysOfMonth($dom)
     {
@@ -426,73 +415,68 @@ public function setDaysOfMonth($dom)
     }
 
     /**
-     *
      * @param mixed $date
      * @param int $min
      * @param int $hour
      * @param int $day
      * @param int $month
      * @param int $weekday
-     * @return \DateTime
+     * @return DateTime
      */
     protected function parseDate($date, &$min, &$hour, &$day, &$month, &$weekday)
     {
         if (is_numeric($date) && (int)$date == $date) {
-            $date = new \DateTime('@' . $date);
-        }
-        elseif (is_string($date)) {
-            $date = new \DateTime('@' . strtotime($date));
+            $date = new DateTime('@' . $date);
+        } elseif (is_string($date)) {
+            $date = new DateTime('@' . strtotime($date));
         }
-        if ($date instanceof \DateTime) {
+        if ($date instanceof DateTime) {
             $min = (int)$date->format('i');
             $hour = (int)$date->format('H');
             $day = (int)$date->format('d');
             $month = (int)$date->format('m');
             $weekday = (int)$date->format('w'); // 0-6
-        }
-        else {
-            throw new \RuntimeException('Date format not supported');
+        } else {
+            throw new RuntimeException('Date format not supported');
         }
 
-        return new \DateTime($date->format('Y-m-d H:i:sP'));
+        return new DateTime($date->format('Y-m-d H:i:sP'));
     }
 
     /**
-     *
-     * @param int|string|\DateTime $date
+     * @param int|string|DateTime $date
      */
     public function matchExact($date)
     {
         $date = $this->parseDate($date, $min, $hour, $day, $month, $weekday);
 
         return
-            (empty($this->minutes) || \in_array($min, $this->minutes, true)) &&
-            (empty($this->hours) || \in_array($hour, $this->hours, true)) &&
-            (empty($this->dom) || \in_array($day, $this->dom, true)) &&
-            (empty($this->months) || \in_array($month, $this->months, true)) &&
-            (empty($this->dow) || \in_array($weekday, $this->dow, true) || ($weekday == 0 && \in_array(7, $this->dow, true)) || ($weekday == 7 && \in_array(0, $this->dow, true))
+            (empty($this->minutes) || in_array($min, $this->minutes, true)) &&
+            (empty($this->hours) || in_array($hour, $this->hours, true)) &&
+            (empty($this->dom) || in_array($day, $this->dom, true)) &&
+            (empty($this->months) || in_array($month, $this->months, true)) &&
+            (empty($this->dow) || in_array($weekday, $this->dow, true) || ($weekday == 0 && in_array(7, $this->dow, true)) || ($weekday == 7 && in_array(0, $this->dow, true))
             );
     }
 
     /**
-     *
-     * @param int|string|\DateTime $date
+     * @param int|string|DateTime $date
      * @param int $minuteBefore
      * @param int $minuteAfter
      */
     public function matchWithMargin($date, $minuteBefore = 0, $minuteAfter = 0)
     {
         if ($minuteBefore > 0) {
-            throw new \RuntimeException('MinuteBefore parameter cannot be positive !');
+            throw new RuntimeException('MinuteBefore parameter cannot be positive !');
         }
         if ($minuteAfter < 0) {
-            throw new \RuntimeException('MinuteAfter parameter cannot be negative !');
+            throw new RuntimeException('MinuteAfter parameter cannot be negative !');
         }
 
         $date = $this->parseDate($date, $min, $hour, $day, $month, $weekday);
-        $interval = new \DateInterval('PT1M'); // 1 min
+        $interval = new DateInterval('PT1M'); // 1 min
         if ($minuteBefore !== 0) {
-            $date->sub(new \DateInterval('PT' . abs($minuteBefore) . 'M'));
+            $date->sub(new DateInterval('PT' . abs($minuteBefore) . 'M'));
         }
         $n = $minuteAfter - $minuteBefore + 1;
         for ($i = 0; $i < $n; $i++) {
@@ -506,14 +490,13 @@ public function matchWithMargin($date, $minuteBefore = 0, $minuteAfter = 0)
     }
 
     /**
-     *
      * @param array $array
      * @return string
      */
     protected function arrayToCron($array)
     {
-        $n = \count($array);
-        if (!\is_array($array) || $n === 0) {
+        $n = count($array);
+        if (!is_array($array) || $n === 0) {
             return '*';
         }
 
@@ -522,9 +505,8 @@ protected function arrayToCron($array)
         for ($i = 1; $i < $n; $i++) {
             if ($array[$i] == $c + 1) {
                 $c = $array[$i];
-                $cron[\count($cron) - 1] = $s . '-' . $c;
-            }
-            else {
+                $cron[count($cron) - 1] = $s . '-' . $c;
+            } else {
                 $s = $c = $array[$i];
                 $cron[] = $c;
             }
@@ -543,7 +525,7 @@ protected function arrayToCron($array)
     protected function cronToArray($string, $min, $max)
     {
         $array = [];
-        if (\is_array($string)) {
+        if (is_array($string)) {
             foreach ($string as $val) {
                 if (is_numeric($val) && (int)$val == $val && $val >= $min && $val <= $max) {
                     $array[] = (int)$val;
@@ -588,7 +570,7 @@ protected function cronToArray($string, $min, $max)
                 return [];
             }
         }
-        sort($array);
+        sort($array, SORT_NUMERIC);
 
         return $array;
     }
diff --git a/system/src/Grav/Common/Scheduler/IntervalTrait.php b/system/src/Grav/Common/Scheduler/IntervalTrait.php
index b382c9d729..5f7406b8e6 100644
--- a/system/src/Grav/Common/Scheduler/IntervalTrait.php
+++ b/system/src/Grav/Common/Scheduler/IntervalTrait.php
@@ -3,14 +3,20 @@
 /**
  * @package    Grav\Common\Scheduler
  * @author     Originally based on peppeocchi/php-cron-scheduler modified for Grav integration
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Scheduler;
 
 use Cron\CronExpression;
+use InvalidArgumentException;
+use function is_string;
 
+/**
+ * Trait IntervalTrait
+ * @package Grav\Common\Scheduler
+ */
 trait IntervalTrait
 {
     /**
@@ -59,7 +65,7 @@ public function hourly($minute = 0)
      */
     public function daily($hour = 0, $minute = 0)
     {
-        if (\is_string($hour)) {
+        if (is_string($hour)) {
             $parts = explode(':', $hour);
             $hour = $parts[0];
             $minute = $parts[1] ?? '0';
@@ -79,7 +85,7 @@ public function daily($hour = 0, $minute = 0)
      */
     public function weekly($weekday = 0, $hour = 0, $minute = 0)
     {
-        if (\is_string($hour)) {
+        if (is_string($hour)) {
             $parts = explode(':', $hour);
             $hour = $parts[0];
             $minute = $parts[1] ?? '0';
@@ -100,7 +106,7 @@ public function weekly($weekday = 0, $hour = 0, $minute = 0)
      */
     public function monthly($month = '*', $day = 1, $hour = 0, $minute = 0)
     {
-        if (\is_string($hour)) {
+        if (is_string($hour)) {
             $parts = explode(':', $hour);
             $hour = $parts[0];
             $minute = $parts[1] ?? '0';
@@ -353,11 +359,11 @@ public function december($day = 1, $hour = 0, $minute = 0)
     /**
      * Validate sequence of cron expression.
      *
-     * @param  int|string  $minute
-     * @param  int|string  $hour
-     * @param  int|string  $day
-     * @param  int|string  $month
-     * @param  int|string  $weekday
+     * @param  int|string|null  $minute
+     * @param  int|string|null  $hour
+     * @param  int|string|null  $day
+     * @param  int|string|null  $month
+     * @param  int|string|null  $weekday
      * @return array
      */
     private function validateCronSequence($minute = null, $hour = null, $day = null, $month = null, $weekday = null)
@@ -374,7 +380,7 @@ private function validateCronSequence($minute = null, $hour = null, $day = null,
     /**
      * Validate sequence of cron expression.
      *
-     * @param  int|string  $value
+     * @param  int|string|null  $value
      * @param  int         $min
      * @param  int         $max
      * @return mixed
@@ -388,7 +394,7 @@ private function validateCronRange($value, $min, $max)
         if (! is_numeric($value) ||
             ! ($value >= $min && $value <= $max)
         ) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 "Invalid value: it should be '*' or between {$min} and {$max}."
             );
         }
@@ -396,4 +402,3 @@ private function validateCronRange($value, $min, $max)
         return $value;
     }
 }
-
diff --git a/system/src/Grav/Common/Scheduler/Job.php b/system/src/Grav/Common/Scheduler/Job.php
index 6250f1d62d..41561192ec 100644
--- a/system/src/Grav/Common/Scheduler/Job.php
+++ b/system/src/Grav/Common/Scheduler/Job.php
@@ -3,42 +3,79 @@
 /**
  * @package    Grav\Common\Scheduler
  * @author     Originally based on peppeocchi/php-cron-scheduler modified for Grav integration
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Scheduler;
 
+use Closure;
 use Cron\CronExpression;
+use DateTime;
 use Grav\Common\Grav;
+use InvalidArgumentException;
+use RuntimeException;
 use Symfony\Component\Process\Process;
+use function call_user_func;
+use function call_user_func_array;
+use function count;
+use function is_array;
+use function is_callable;
+use function is_string;
 
+/**
+ * Class Job
+ * @package Grav\Common\Scheduler
+ */
 class Job
 {
     use IntervalTrait;
 
+    /** @var string */
     private $id;
-    private $enabled = true;
+    /** @var bool */
+    private $enabled;
+    /** @var callable|string */
     private $command;
+    /** @var string */
     private $at;
+    /** @var array */
     private $args = [];
+    /** @var bool */
     private $runInBackground = true;
+    /** @var DateTime */
     private $creationTime;
+    /** @var CronExpression */
     private $executionTime;
+    /** @var string */
     private $tempDir;
+    /** @var string */
     private $lockFile;
+    /** @var bool */
     private $truthTest = true;
+    /** @var string */
     private $output;
+    /** @var int */
     private $returnCode = 0;
+    /** @var array */
     private $outputTo = [];
+    /** @var array */
     private $emailTo = [];
+    /** @var array */
     private $emailConfig = [];
+    /** @var callable|null */
     private $before;
+    /** @var callable|null */
     private $after;
+    /** @var callable */
     private $whenOverlapping;
+    /** @var string */
     private $outputMode;
+    /** @var Process|null $process */
     private $process;
+    /** @var bool */
     private $successful = false;
+    /** @var string|null */
     private $backlink;
 
     /**
@@ -46,7 +83,7 @@ class Job
      *
      * @param  string|callable $command
      * @param  array $args
-     * @param  string $id
+     * @param  string|null $id
      */
     public function __construct($command, $args = [], $id = null)
     {
@@ -60,7 +97,7 @@ public function __construct($command, $args = [], $id = null)
                 $this->id = spl_object_hash($command);
             }
         }
-        $this->creationTime = new \DateTime('now');
+        $this->creationTime = new DateTime('now');
         // initialize the directory path for lock files
         $this->tempDir = sys_get_temp_dir();
         $this->command = $command;
@@ -73,7 +110,7 @@ public function __construct($command, $args = [], $id = null)
     /**
      * Get the command
      *
-     * @return string
+     * @return Closure|string
      */
     public function getCommand()
     {
@@ -107,13 +144,16 @@ public function getEnabled()
      */
     public function getArguments()
     {
-        if (\is_string($this->args)) {
+        if (is_string($this->args)) {
             return $this->args;
         }
 
         return null;
     }
 
+    /**
+     * @return CronExpression
+     */
     public function getCronExpression()
     {
         return CronExpression::factory($this->at);
@@ -145,10 +185,10 @@ public function getId()
      * the job is due. Defaults to job creation time.
      * It also default the execution time if not previously defined.
      *
-     * @param  \DateTime $date
+     * @param  DateTime|null $date
      * @return bool
      */
-    public function isDue(\DateTime $date = null)
+    public function isDue(DateTime $date = null)
     {
         // The execution time is being defaulted if not defined
         if (!$this->executionTime) {
@@ -187,9 +227,8 @@ public function inForeground()
     /**
      * Sets/Gets an option backlink
      *
-     * @param string $link
-     *
-     * @return null|string
+     * @param string|null $link
+     * @return string|null
      */
     public function backlink($link = null)
     {
@@ -216,8 +255,8 @@ public function runInBackground()
      * being executed if the previous is still running.
      * The job id is used as a filename for the lock file.
      *
-     * @param  string $tempDir The directory path for the lock files
-     * @param  callable $whenOverlapping A callback to ignore job overlapping
+     * @param  string|null $tempDir The directory path for the lock files
+     * @param  callable|null $whenOverlapping A callback to ignore job overlapping
      * @return self
      */
     public function onlyOne($tempDir = null, callable $whenOverlapping = null)
@@ -232,7 +271,7 @@ public function onlyOne($tempDir = null, callable $whenOverlapping = null)
         if ($whenOverlapping) {
             $this->whenOverlapping = $whenOverlapping;
         } else {
-            $this->whenOverlapping = function () {
+            $this->whenOverlapping = static function () {
                 return false;
             };
         }
@@ -298,8 +337,8 @@ public function run()
         if (is_callable($this->command)) {
             $this->output = $this->exec();
         } else {
-            $args = \is_string($this->args) ? $this->args : implode(' ', $this->args);
-            $command = $this->command . ' ' . $args;
+            $args = is_string($this->args) ? explode(' ', $this->args) : $this->args;
+            $command = array_merge([$this->command], $args);
             $process = new Process($command);
 
             $this->process = $process;
@@ -322,7 +361,6 @@ public function run()
      */
     public function finalize()
     {
-        /** @var Process $process */
         $process = $this->process;
 
         if ($process) {
@@ -344,13 +382,17 @@ public function finalize()
 
     /**
      * Things to run after job has run
+     *
+     * @return void
      */
     private function postRun()
     {
         if (count($this->outputTo) > 0) {
             foreach ($this->outputTo as $file) {
                 $output_mode = $this->outputMode === 'append' ? FILE_APPEND | LOCK_EX : LOCK_EX;
-                file_put_contents($file, $this->output, $output_mode);
+                $timestamp = (new DateTime('now'))->format('c');
+                $output = $timestamp . "\n" . str_pad('', strlen($timestamp), '>') . "\n" . $this->output;
+                file_put_contents($file, $output, $output_mode);
             }
         }
 
@@ -374,7 +416,7 @@ private function postRun()
     private function createLockFile($content = null)
     {
         if ($this->lockFile) {
-            if ($content === null || !\is_string($content)) {
+            if ($content === null || !is_string($content)) {
                 $content = $this->getId();
             }
             file_put_contents($this->lockFile, $content);
@@ -396,8 +438,8 @@ private function removeLockFile()
     /**
      * Execute a callable job.
      *
-     * @throws \RuntimeException
      * @return string
+     * @throws RuntimeException
      */
     private function exec()
     {
@@ -406,12 +448,15 @@ private function exec()
         try {
             $return_data = call_user_func_array($this->command, $this->args);
             $this->successful = true;
-        } catch (\RuntimeException $e) {
+        } catch (RuntimeException $e) {
+            $return_data = $e->getMessage();
             $this->successful = false;
         }
         $this->output = ob_get_clean() . (is_string($return_data) ? $return_data : '');
 
         $this->postRun();
+
+        return $this->output;
     }
 
     /**
@@ -450,7 +495,7 @@ public function getOutput()
     public function email($email)
     {
         if (!is_string($email) && !is_array($email)) {
-            throw new \InvalidArgumentException('The email can be only string or array');
+            throw new InvalidArgumentException('The email can be only string or array');
         }
 
         $this->emailTo = is_array($email) ? $email : [$email];
@@ -519,4 +564,3 @@ public function then(callable $fn, $runInBackground = false)
         return $this;
     }
 }
-
diff --git a/system/src/Grav/Common/Scheduler/Scheduler.php b/system/src/Grav/Common/Scheduler/Scheduler.php
index df5602ea1d..19eb9eac38 100644
--- a/system/src/Grav/Common/Scheduler/Scheduler.php
+++ b/system/src/Grav/Common/Scheduler/Scheduler.php
@@ -3,33 +3,51 @@
 /**
  * @package    Grav\Common\Scheduler
  * @author     Originally based on peppeocchi/php-cron-scheduler modified for Grav integration
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Scheduler;
 
+use DateTime;
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
 use Grav\Common\Utils;
+use InvalidArgumentException;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
 use RocketTheme\Toolbox\File\YamlFile;
+use function is_callable;
+use function is_string;
 
+/**
+ * Class Scheduler
+ * @package Grav\Common\Scheduler
+ */
 class Scheduler
 {
-    /**
-     * The queued jobs.
-     *
-     * @var array
-     */
+    /** @var Job[] The queued jobs. */
     private $jobs = [];
+
+    /** @var Job[] */
     private $saved_jobs = [];
+
+    /** @var Job[] */
     private $executed_jobs = [];
+
+    /** @var Job[] */
     private $failed_jobs = [];
+
+    /** @var Job[] */
     private $jobs_run = [];
+
+    /** @var array */
     private $output_schedule = [];
+
+    /** @var array */
     private $config;
+
+    /** @var string */
     private $status_path;
 
     /**
@@ -44,11 +62,12 @@ public function __construct()
         if (!file_exists($this->status_path)) {
             Folder::create($this->status_path);
         }
-
     }
 
     /**
      * Load saved jobs from config/scheduler.yaml file
+     *
+     * @return $this
      */
     public function loadSavedJobs()
     {
@@ -65,7 +84,7 @@ public function loadSavedJobs()
             }
 
             if (isset($j['output'])) {
-                $mode = isset($j['output_mode']) && $j['output_mode'] === 'append' ? true : false;
+                $mode = isset($j['output_mode']) && $j['output_mode'] === 'append';
                 $job->output($j['output'], $mode);
             }
 
@@ -98,7 +117,6 @@ public function getQueuedJobs($all = false)
                     $foreground[] = $job;
                 }
             }
-
         }
         return [$background, $foreground];
     }
@@ -106,21 +124,38 @@ public function getQueuedJobs($all = false)
     /**
      * Get all jobs if they are disabled or not as one array
      *
-     * @return array
+     * @return Job[]
      */
     public function getAllJobs()
     {
-        list($background, $foreground) = $this->loadSavedJobs()->getQueuedJobs(true);
+        [$background, $foreground] = $this->loadSavedJobs()->getQueuedJobs(true);
 
         return array_merge($background, $foreground);
     }
 
+    /**
+     * Get a specific Job based on id
+     *
+     * @param string $jobid
+     * @return Job|null
+     */
+    public function getJob($jobid)
+    {
+        $all = $this->getAllJobs();
+        foreach ($all as $job) {
+            if ($jobid == $job->getId()) {
+                return $job;
+            }
+        }
+        return null;
+    }
+
     /**
      * Queues a PHP function execution.
      *
      * @param  callable  $fn  The function to execute
      * @param  array  $args  Optional arguments to pass to the php script
-     * @param  string  $id   Optional custom identifier
+     * @param  string|null  $id   Optional custom identifier
      * @return Job
      */
     public function addFunction(callable $fn, $args = [], $id = null)
@@ -136,7 +171,7 @@ public function addFunction(callable $fn, $args = [], $id = null)
      *
      * @param  string  $command  The command to execute
      * @param  array  $args      Optional arguments to pass to the command
-     * @param  string  $id       Optional custom identifier
+     * @param  string|null  $id       Optional custom identifier
      * @return Job
      */
     public function addCommand($command, $args = [], $id = null)
@@ -150,29 +185,30 @@ public function addCommand($command, $args = [], $id = null)
     /**
      * Run the scheduler.
      *
-     * @param  \DateTime|null  $runTime  Optional, run at specific moment
+     * @param DateTime|null $runTime Optional, run at specific moment
+     * @param bool $force force run even if not due
      */
-    public function run(\DateTime $runTime = null)
+    public function run(DateTime $runTime = null, $force = false)
     {
         $this->loadSavedJobs();
 
-        list($background, $foreground) = $this->getQueuedJobs(false);
+        [$background, $foreground] = $this->getQueuedJobs(false);
         $alljobs = array_merge($background, $foreground);
 
         if (null === $runTime) {
-            $runTime = new \DateTime('now');
+            $runTime = new DateTime('now');
         }
 
         // Star processing jobs
         foreach ($alljobs as $job) {
-            if ($job->isDue($runTime)) {
+            if ($job->isDue($runTime) || $force) {
                 $job->run();
                 $this->jobs_run[] = $job;
             }
         }
 
         // Finish handling any background jobs
-        foreach($background as $job) {
+        foreach ($background as $job) {
             $job->finalize();
         }
 
@@ -184,6 +220,8 @@ public function run(\DateTime $runTime = null)
      * Reset all collected data of last run.
      *
      * Call before run() if you call run() multiple times.
+     *
+     * @return $this
      */
     public function resetRun()
     {
@@ -199,7 +237,7 @@ public function resetRun()
      * Get the scheduler verbose output.
      *
      * @param  string  $type  Allowed: text, html, array
-     * @return mixed  The return depends on the requested $type
+     * @return string|array  The return depends on the requested $type
      */
     public function getVerboseOutput($type = 'text')
     {
@@ -211,12 +249,14 @@ public function getVerboseOutput($type = 'text')
             case 'array':
                 return $this->output_schedule;
             default:
-                throw new \InvalidArgumentException('Invalid output type');
+                throw new InvalidArgumentException('Invalid output type');
         }
     }
 
     /**
      * Remove all queued Jobs.
+     *
+     * @return $this
      */
     public function clearJobs()
     {
@@ -231,28 +271,44 @@ public function clearJobs()
      * @return string
      */
     public function getCronCommand()
+    {
+        $command = $this->getSchedulerCommand();
+
+        return "(crontab -l; echo \"* * * * * {$command} 1>> /dev/null 2>&1\") | crontab -";
+    }
+
+    /**
+     * @param string|null $php
+     * @return string
+     */
+    public function getSchedulerCommand($php = null)
     {
         $phpBinaryFinder = new PhpExecutableFinder();
-        $php = $phpBinaryFinder->find();
+        $php = $php ?? $phpBinaryFinder->find();
         $command = 'cd ' . str_replace(' ', '\ ', GRAV_ROOT) . ';' . $php . ' bin/grav scheduler';
 
-        return "(crontab -l; echo \"* * * * * {$command} 1>> /dev/null 2>&1\") | crontab -";
+        return $command;
     }
 
     /**
      * Helper to determine if cron job is setup
+     * 0 - Crontab Not found
+     * 1 - Crontab Found
+     * 2 - Error
      *
      * @return int
      */
     public function isCrontabSetup()
     {
-        $process = new Process('crontab -l');
+        $process = new Process(['crontab', '-l']);
         $process->run();
 
         if ($process->isSuccessful()) {
             $output = $process->getOutput();
+            $command = str_replace('/', '\/', $this->getSchedulerCommand('.*'));
+            $full_command = '/^(?!#).* .* .* .* .* ' . $command . '/m';
 
-            return preg_match('$bin\/grav schedule$', $output) ? 1 : 0;
+            return  preg_match($full_command, $output) ? 1 : 0;
         }
 
         $error = $process->getErrorOutput();
@@ -263,7 +319,7 @@ public function isCrontabSetup()
     /**
      * Get the Job states file
      *
-     * @return \RocketTheme\Toolbox\File\FileInterface|YamlFile
+     * @return YamlFile
      */
     public function getJobStates()
     {
@@ -272,6 +328,8 @@ public function getJobStates()
 
     /**
      * Save job states to statys file
+     *
+     * @return void
      */
     private function saveJobStates()
     {
@@ -292,6 +350,24 @@ private function saveJobStates()
         $saved_states->save(array_merge($saved_states->content(), $new_states));
     }
 
+    /**
+     * Try to determine who's running the process
+     *
+     * @return false|string
+     */
+    public function whoami()
+    {
+        $process = new Process('whoami');
+        $process->run();
+
+        if ($process->isSuccessful()) {
+            return trim($process->getOutput());
+        }
+
+        return $process->getErrorOutput();
+    }
+
+
     /**
      * Queue a job for execution in the correct queue.
      *
@@ -313,7 +389,7 @@ private function queueJob(Job $job)
      */
     private function addSchedulerVerboseOutput($string)
     {
-        $now = '[' . (new \DateTime('now'))->format('c') . '] ';
+        $now = '[' . (new DateTime('now'))->format('c') . '] ';
         $this->output_schedule[] = $now . $string;
         // Print to stdoutput in light gray
         // echo "\033[37m{$string}\033[0m\n";
@@ -332,7 +408,7 @@ private function pushExecutedJob(Job $job)
         $args = $job->getArguments();
         // If callable, log the string Closure
         if (is_callable($command)) {
-            $command = \is_string($command) ? $command : 'Closure';
+            $command = is_string($command) ? $command : 'Closure';
         }
         $this->addSchedulerVerboseOutput("<green>Success</green>: <white>{$command} {$args}</white>");
 
@@ -351,7 +427,7 @@ private function pushFailedJob(Job $job)
         $command = $job->getCommand();
         // If callable, log the string Closure
         if (is_callable($command)) {
-            $command = \is_string($command) ? $command : 'Closure';
+            $command = is_string($command) ? $command : 'Closure';
         }
         $output = trim($job->getOutput());
         $this->addSchedulerVerboseOutput("<red>Error</red>:   <white>{$command}</white> → <normal>{$output}</normal>");
diff --git a/system/src/Grav/Common/Security.php b/system/src/Grav/Common/Security.php
index 0f61097956..982618544f 100644
--- a/system/src/Grav/Common/Security.php
+++ b/system/src/Grav/Common/Security.php
@@ -3,20 +3,101 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use Exception;
+use Grav\Common\Config\Config;
+use Grav\Common\Filesystem\Folder;
 use Grav\Common\Page\Pages;
+use Rhukster\DomSanitizer\DOMSanitizer;
+use function chr;
+use function count;
+use function is_array;
+use function is_string;
 
+/**
+ * Class Security
+ * @package Grav\Common
+ */
 class Security
 {
+    /**
+     * @param string $filepath
+     * @param array|null $options
+     * @return string|null
+     */
+    public static function detectXssFromSvgFile(string $filepath, array $options = null): ?string
+    {
+        if (file_exists($filepath) && Grav::instance()['config']->get('security.sanitize_svg')) {
+            $content = file_get_contents($filepath);
+
+            return static::detectXss($content, $options);
+        }
 
+        return null;
+    }
+
+    /**
+     * Sanitize SVG string for XSS code
+     *
+     * @param string $svg
+     * @return string
+     */
+    public static function sanitizeSvgString(string $svg): string
+    {
+        if (Grav::instance()['config']->get('security.sanitize_svg')) {
+            $sanitizer = new DOMSanitizer(DOMSanitizer::SVG);
+            $sanitized = $sanitizer->sanitize($svg);
+            if (is_string($sanitized)) {
+                $svg = $sanitized;
+            }
+        }
+
+        return $svg;
+    }
+
+    /**
+     * Sanitize SVG for XSS code
+     *
+     * @param string $file
+     * @return void
+     */
+    public static function sanitizeSVG(string $file): void
+    {
+        if (file_exists($file) && Grav::instance()['config']->get('security.sanitize_svg')) {
+            $sanitizer = new DOMSanitizer(DOMSanitizer::SVG);
+            $original_svg = file_get_contents($file);
+            $clean_svg = $sanitizer->sanitize($original_svg);
+
+            // Quarantine bad SVG files and throw exception
+            if ($clean_svg !== false ) {
+                file_put_contents($file, $clean_svg);
+            } else {
+                $quarantine_file = Utils::basename($file);
+                $quarantine_dir = 'log://quarantine';
+                Folder::mkdir($quarantine_dir);
+                file_put_contents("$quarantine_dir/$quarantine_file", $original_svg);
+                unlink($file);
+                throw new Exception('SVG could not be sanitized, it has been moved to the logs/quarantine folder');
+            }
+        }
+    }
+
+    /**
+     * Detect XSS code in Grav pages
+     *
+     * @param Pages $pages
+     * @param bool $route
+     * @param callable|null $status
+     * @return array
+     */
     public static function detectXssFromPages(Pages $pages, $route = true, callable $status = null)
     {
-        $routes = $pages->routes();
+        $routes = $pages->getList(null, 0, true);
 
         // Remove duplicate for homepage
         unset($routes['/']);
@@ -29,32 +110,26 @@ public static function detectXssFromPages(Pages $pages, $route = true, callable
             'steps' => count($routes),
         ]);
 
-        foreach ($routes as $path) {
-
+        foreach (array_keys($routes) as $route) {
             $status && $status([
                 'type' => 'progress',
             ]);
 
             try {
-                $page = $pages->get($path);
-
-                // call the content to load/cache it
-                $header = (array) $page->header();
-                $content = $page->value('content');
+                $page = $pages->find($route);
+                if ($page->exists()) {
+                    // call the content to load/cache it
+                    $header = (array) $page->header();
+                    $content = $page->value('content');
 
-                $data = ['header' => $header, 'content' => $content];
-                $results = Security::detectXssFromArray($data);
+                    $data = ['header' => $header, 'content' => $content];
+                    $results = static::detectXssFromArray($data);
 
-                if (!empty($results)) {
-                    if ($route) {
-                        $list[$page->route()] = $results;
-                    } else {
-                        $list[$page->filePathClean()] = $results;
+                    if (!empty($results)) {
+                        $list[$page->rawRoute()] = $results;
                     }
-
                 }
-
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 continue;
             }
         }
@@ -63,45 +138,67 @@ public static function detectXssFromPages(Pages $pages, $route = true, callable
     }
 
     /**
+     * Detect XSS in an array or strings such as $_POST or $_GET
+     *
      * @param array $array      Array such as $_POST or $_GET
+     * @param array|null $options Extra options to be passed.
      * @param string $prefix    Prefix for returned values.
      * @return array            Returns flatten list of potentially dangerous input values, such as 'data.content'.
      */
-    public static function detectXssFromArray(array $array, $prefix = '')
+    public static function detectXssFromArray(array $array, string $prefix = '', array $options = null)
     {
-        $list = [];
+        if (null === $options) {
+            $options = static::getXssDefaults();
+        }
 
+        $list = [[]];
         foreach ($array as $key => $value) {
-            if (\is_array($value)) {
-                $list[] = static::detectXssFromArray($value, $prefix . $key . '.');
+            if (is_array($value)) {
+                $list[] = static::detectXssFromArray($value, $prefix . $key . '.', $options);
             }
-            if ($result = static::detectXss($value)) {
+            if ($result = static::detectXss($value, $options)) {
                 $list[] = [$prefix . $key => $result];
             }
         }
 
-        if (!empty($list)) {
-            return array_merge(...$list);
-        }
-
-        return $list;
+        return array_merge(...$list);
     }
 
     /**
      * Determine if string potentially has a XSS attack. This simple function does not catch all XSS and it is likely to
+     *
      * return false positives because of it tags all potentially dangerous HTML tags and attributes without looking into
      * their content.
      *
-     * @param string $string The string to run XSS detection logic on
-     * @return bool|string       Type of XSS vector if the given `$string` may contain XSS, false otherwise.
+     * @param string|null $string The string to run XSS detection logic on
+     * @param array|null $options
+     * @return string|null       Type of XSS vector if the given `$string` may contain XSS, false otherwise.
      *
      * Copies the code from: https://github.com/symphonycms/xssfilter/blob/master/extension.driver.php#L138
      */
-    public static function detectXss($string)
+    public static function detectXss($string, array $options = null): ?string
     {
         // Skip any null or non string values
-        if (null === $string || !\is_string($string) || empty($string)) {
-            return false;
+        if (null === $string || !is_string($string) || empty($string)) {
+            return null;
+        }
+
+        if (null === $options) {
+            $options = static::getXssDefaults();
+        }
+
+        $enabled_rules = (array)($options['enabled_rules'] ?? null);
+        $dangerous_tags = (array)($options['dangerous_tags'] ?? null);
+        if (!$dangerous_tags) {
+            $enabled_rules['dangerous_tags'] = false;
+        }
+        $invalid_protocols = (array)($options['invalid_protocols'] ?? null);
+        if (!$invalid_protocols) {
+            $enabled_rules['invalid_protocols'] = false;
+        }
+        $enabled_rules = array_filter($enabled_rules, static function ($val) { return !empty($val); });
+        if (!$enabled_rules) {
+            return null;
         }
 
         // Keep a copy of the original string before cleaning up
@@ -111,32 +208,27 @@ public static function detectXss($string)
         $string = urldecode($string);
 
         // Convert Hexadecimals
-        $string = (string)preg_replace_callback('!(&#|\\\)[xX]([0-9a-fA-F]+);?!u', function($m) {
-            return \chr(hexdec($m[2]));
+        $string = (string)preg_replace_callback('!(&#|\\\)[xX]([0-9a-fA-F]+);?!u', static function ($m) {
+            return chr(hexdec($m[2]));
         }, $string);
 
         // Clean up entities
-        $string = preg_replace('!(&#0+[0-9]+)!u','$1;', $string);
+        $string = preg_replace('!(&#[0-9]+);?!u', '$1;', $string);
 
         // Decode entities
-        $string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8');
+        $string = html_entity_decode($string, ENT_NOQUOTES | ENT_HTML5, 'UTF-8');
 
         // Strip whitespace characters
-        $string = preg_replace('!\s!u','', $string);
-
-        $config = Grav::instance()['config'];
-
-        $dangerous_tags = array_map('preg_quote', array_map("trim", $config->get('security.xss_dangerous_tags')));
-        $invalid_protocols =  array_map('preg_quote', array_map("trim", $config->get('security.xss_invalid_protocols')));
-        $enabled_rules = $config->get('security.xss_enabled');
+        $string = preg_replace('!\s!u', ' ', $string);
+        $stripped = preg_replace('!\s!u', '', $string);
 
         // Set the patterns we'll test against
         $patterns = [
             // Match any attribute starting with "on" or xmlns
-            'on_events' => '#(<[^>]+[[a-z\x00-\x20\"\'\/])(\son|\sxmlns)[a-z].*=>?#iUu',
+            'on_events' => '#(<[^>]+[[a-z\x00-\x20\"\'\/])([\s\/]on|\sxmlns)[a-z].*=>?#iUu',
 
             // Match javascript:, livescript:, vbscript:, mocha:, feed: and data: protocols
-            'invalid_protocols' => '#(' . implode('|', $invalid_protocols) . '):.*?#iUu',
+            'invalid_protocols' => '#(' . implode('|', array_map('preg_quote', $invalid_protocols, ['#'])) . ')(:|\&\#58)\S.*?#iUu',
 
             // Match -moz-bindings
             'moz_binding' => '#-moz-binding[a-z\x00-\x20]*:#u',
@@ -145,21 +237,30 @@ public static function detectXss($string)
             'html_inline_styles' => '#(<[^>]+[a-z\x00-\x20\"\'\/])(style=[^>]*(url\:|x\:expression).*)>?#iUu',
 
             // Match potentially dangerous tags
-            'dangerous_tags' => '#</*(' . implode('|', $dangerous_tags) . ')[^>]*>?#ui'
+            'dangerous_tags' => '#</*(' . implode('|', array_map('preg_quote', $dangerous_tags, ['#'])) . ')[^>]*>?#ui'
         ];
 
-
         // Iterate over rules and return label if fail
-        foreach ((array) $patterns as $name => $regex) {
-            if ($enabled_rules[$name] === true) {
-
-                if (preg_match($regex, $string) || preg_match($regex, $orig)) {
+        foreach ($patterns as $name => $regex) {
+            if (!empty($enabled_rules[$name])) {
+                if (preg_match($regex, $string) || preg_match($regex, $stripped) || preg_match($regex, $orig)) {
                     return $name;
                 }
-
             }
         }
 
-        return false;
+        return null;
+    }
+
+    public static function getXssDefaults(): array
+    {
+        /** @var Config $config */
+        $config = Grav::instance()['config'];
+
+        return [
+            'enabled_rules' => $config->get('security.xss_enabled'),
+            'dangerous_tags' => array_map('trim', $config->get('security.xss_dangerous_tags')),
+            'invalid_protocols' => array_map('trim', $config->get('security.xss_invalid_protocols')),
+        ];
     }
 }
diff --git a/system/src/Grav/Common/Service/AccountsServiceProvider.php b/system/src/Grav/Common/Service/AccountsServiceProvider.php
index e0778bebe9..60f26e5b02 100644
--- a/system/src/Grav/Common/Service/AccountsServiceProvider.php
+++ b/system/src/Grav/Common/Service/AccountsServiceProvider.php
@@ -3,127 +3,155 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Service;
 
 use Grav\Common\Config\Config;
-use Grav\Common\Debugger;
+use Grav\Common\Grav;
+use Grav\Common\Page\Header;
+use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\User\DataUser;
-use Grav\Common\User\FlexUser;
 use Grav\Common\User\User;
-use Grav\Framework\File\Formatter\YamlFormatter;
+use Grav\Events\PermissionsRegisterEvent;
+use Grav\Framework\Acl\Permissions;
+use Grav\Framework\Acl\PermissionsReader;
 use Grav\Framework\Flex\Flex;
-use Grav\Framework\Flex\FlexDirectory;
+use Grav\Framework\Flex\Interfaces\FlexIndexInterface;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use RocketTheme\Toolbox\Event\Event;
-use RocketTheme\Toolbox\Event\EventDispatcher;
+use SplFileInfo;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use function define;
+use function defined;
+use function is_array;
 
+/**
+ * Class AccountsServiceProvider
+ * @package Grav\Common\Service
+ */
 class AccountsServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
-        $container['accounts'] = function (Container $container) {
-            $type = strtolower(defined('GRAV_USER_INSTANCE') ? GRAV_USER_INSTANCE : $container['config']->get('system.accounts.type', 'data'));
-            if ($type === 'flex') {
-                /** @var Debugger $debugger */
-                $debugger = $container['debugger'];
-                $debugger->addMessage('User Accounts: Flex Directory');
-                return $this->flexAccounts($container);
+        $container['permissions'] = static function (Grav $container) {
+            /** @var Config $config */
+            $config = $container['config'];
+
+            $permissions = new Permissions();
+            $permissions->addTypes($config->get('permissions.types', []));
+
+            $array = $config->get('permissions.actions');
+            if (is_array($array)) {
+                $actions = PermissionsReader::fromArray($array, $permissions->getTypes());
+                $permissions->addActions($actions);
             }
 
-            return $this->dataAccounts($container);
+            $event = new PermissionsRegisterEvent($permissions);
+            $container->dispatchEvent($event);
+
+            return $permissions;
+        };
+
+        $container['accounts'] = function (Container $container) {
+            $type = $this->initialize($container);
+
+            return $type === 'flex' ? $this->flexAccounts($container) : $this->regularAccounts($container);
+        };
+
+        $container['user_groups'] = static function (Container $container) {
+            /** @var Flex $flex */
+            $flex = $container['flex'];
+            $directory = $flex->getDirectory('user-groups');
+
+            return $directory ? $directory->getIndex() : null;
         };
 
-        $container['users'] = $container->factory(function (Container $container) {
+        $container['users'] = $container->factory(static function (Container $container) {
             user_error('Grav::instance()[\'users\'] is deprecated since Grav 1.6, use Grav::instance()[\'accounts\'] instead', E_USER_DEPRECATED);
 
             return $container['accounts'];
         });
     }
 
-    protected function dataAccounts(Container $container)
+    /**
+     * @param Container $container
+     * @return string
+     */
+    protected function initialize(Container $container): string
     {
-        if (!defined('GRAV_USER_INSTANCE')) {
-            define('GRAV_USER_INSTANCE', 'DATA');
-        }
+        $isDefined = defined('GRAV_USER_INSTANCE');
+        $type = strtolower($isDefined ? GRAV_USER_INSTANCE : $container['config']->get('system.accounts.type', 'regular'));
 
-        // Use User class for backwards compatibility.
-        return new DataUser\UserCollection(User::class);
-    }
+        if ($type === 'flex') {
+            if (!$isDefined) {
+                define('GRAV_USER_INSTANCE', 'FLEX');
+            }
 
-    protected function flexAccounts(Container $container)
-    {
-        if (!defined('GRAV_USER_INSTANCE')) {
-            define('GRAV_USER_INSTANCE', 'FLEX');
+            /** @var EventDispatcher $dispatcher */
+            $dispatcher = $container['events'];
+
+            // Stop /admin/user from working, display error instead.
+            $dispatcher->addListener(
+                'onAdminPage',
+                static function (Event $event) {
+                    $grav = Grav::instance();
+                    $admin = $grav['admin'];
+                    [$base,$location,] = $admin->getRouteDetails();
+                    if ($location !== 'user' || isset($grav['flex_objects'])) {
+                        return;
+                    }
+
+                    /** @var PageInterface $page */
+                    $page = $event['page'];
+                    $page->init(new SplFileInfo('plugin://admin/pages/admin/error.md'));
+                    $page->routable(true);
+                    $header = $page->header();
+                    $header->title = 'Please install missing plugin';
+                    $page->content("## Please install and enable **[Flex Objects]({$base}/plugins/flex-objects)** plugin. It is required to edit **Flex User Accounts**.");
+
+                    /** @var Header $header */
+                    $header = $page->header();
+                    $directory = $grav['accounts']->getFlexDirectory();
+                    $menu = $directory->getConfig('admin.menu.list');
+                    $header->access = $menu['authorize'] ?? ['admin.super'];
+                },
+                100000
+            );
+        } elseif (!$isDefined) {
+            define('GRAV_USER_INSTANCE', 'REGULAR');
         }
 
-        /** @var Config $config */
-        $config = $container['config'];
-
-        $options = [
-            'enabled' => true,
-            'data' => [
-                'object' => User::class, // Use User class for backwards compatibility.
-                'collection' => FlexUser\UserCollection::class,
-                'index' => FlexUser\UserIndex::class,
-                'storage' => $this->getFlexStorage($config->get('system.accounts.storage', 'file')),
-                'search' => [
-                    'options' => [
-                        'contains' => 1
-                    ],
-                    'fields' => [
-                        'key',
-                        'email'
-                    ]
-                ]
-            ]
-        ] + ($config->get('plugins.flex-objects.object') ?: []);
-
-        $directory = new FlexDirectory('accounts', 'blueprints://user/accounts.yaml', $options);
-
-        /** @var EventDispatcher $dispatcher */
-        $dispatcher = $container['events'];
-        $dispatcher->addListener('onFlexInit', function (Event $event) use ($directory) {
-            /** @var Flex $flex */
-            $flex = $event['flex'];
-            $flex->addDirectory($directory);
-        });
-
-        return $directory->getIndex();
+        return $type;
     }
 
-    protected function getFlexStorage($config)
+    /**
+     * @param Container $container
+     * @return DataUser\UserCollection
+     */
+    protected function regularAccounts(Container $container)
     {
-        if (\is_array($config)) {
-            return $config;
-        }
+        // Use User class for backwards compatibility.
+        return new DataUser\UserCollection(User::class);
+    }
 
-        if ($config === 'folder') {
-            return [
-                'class' => FlexUser\Storage\UserFolderStorage::class,
-                'options' => [
-                    'formatter' => ['class' => YamlFormatter::class],
-                    'folder' => 'account://',
-                    'pattern' => '{FOLDER}/{KEY:2}/{KEY}/user.yaml',
-                    'key' => 'username',
-                    'indexed' => true
-                ],
-            ];
-        }
+    /**
+     * @param Container $container
+     * @return FlexIndexInterface|null
+     */
+    protected function flexAccounts(Container $container)
+    {
+        /** @var Flex $flex */
+        $flex = $container['flex'];
+        $directory = $flex->getDirectory('user-accounts');
 
-        return [
-            'class' => FlexUser\Storage\UserFileStorage::class,
-            'options' => [
-                'formatter' => ['class' => YamlFormatter::class],
-                'folder' => 'account://',
-                'pattern' => '{FOLDER}/{KEY}.yaml',
-                'key' => 'storage_key',
-                'indexed' => true
-            ],
-        ];
+        return $directory ? $directory->getIndex() : null;
     }
 }
diff --git a/system/src/Grav/Common/Service/AssetsServiceProvider.php b/system/src/Grav/Common/Service/AssetsServiceProvider.php
index 004da9cac6..54a44a1c83 100644
--- a/system/src/Grav/Common/Service/AssetsServiceProvider.php
+++ b/system/src/Grav/Common/Service/AssetsServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,8 +13,16 @@
 use Pimple\ServiceProviderInterface;
 use Grav\Common\Assets;
 
+/**
+ * Class AssetsServiceProvider
+ * @package Grav\Common\Service
+ */
 class AssetsServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         $container['assets'] = function () {
diff --git a/system/src/Grav/Common/Service/BackupsServiceProvider.php b/system/src/Grav/Common/Service/BackupsServiceProvider.php
index 2c01036e81..58f5021a3a 100644
--- a/system/src/Grav/Common/Service/BackupsServiceProvider.php
+++ b/system/src/Grav/Common/Service/BackupsServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,8 +13,16 @@
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 
+/**
+ * Class BackupsServiceProvider
+ * @package Grav\Common\Service
+ */
 class BackupsServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         $container['backups'] = function () {
diff --git a/system/src/Grav/Common/Service/ConfigServiceProvider.php b/system/src/Grav/Common/Service/ConfigServiceProvider.php
index c874441f1c..e65e228509 100644
--- a/system/src/Grav/Common/Service/ConfigServiceProvider.php
+++ b/system/src/Grav/Common/Service/ConfigServiceProvider.php
@@ -3,12 +3,13 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Service;
 
+use DirectoryIterator;
 use Grav\Common\Config\CompiledBlueprints;
 use Grav\Common\Config\CompiledConfig;
 use Grav\Common\Config\CompiledLanguages;
@@ -16,13 +17,22 @@
 use Grav\Common\Config\ConfigFileFinder;
 use Grav\Common\Config\Setup;
 use Grav\Common\Language\Language;
+use Grav\Framework\Mime\MimeTypes;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use RocketTheme\Toolbox\File\YamlFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
+/**
+ * Class ConfigServiceProvider
+ * @package Grav\Common\Service
+ */
 class ConfigServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         $container['setup'] = function ($c) {
@@ -47,6 +57,19 @@ public function register(Container $container)
             return $config;
         };
 
+        $container['mime'] = function ($c) {
+            /** @var Config $config */
+            $config = $c['config'];
+            $mimes = $config->get('mime.types', []);
+            foreach ($config->get('media.types', []) as $ext => $media) {
+                if (!empty($media['mime'])) {
+                    $mimes[$ext] = array_unique(array_merge([$media['mime']], $mimes[$ext] ?? []));
+                }
+            }
+
+            return MimeTypes::createFromMimes($mimes);
+        };
+
         $container['languages'] = function ($c) {
             return static::languages($c);
         };
@@ -56,6 +79,10 @@ public function register(Container $container)
         };
     }
 
+    /**
+     * @param Container $container
+     * @return mixed
+     */
     public static function blueprints(Container $container)
     {
         /** Setup $setup */
@@ -71,6 +98,8 @@ public static function blueprints(Container $container)
         $files += (new ConfigFileFinder)->locateFiles($paths);
         $paths = $locator->findResources('plugins://');
         $files += (new ConfigFileFinder)->setBase('plugins')->locateInFolders($paths, 'blueprints');
+        $paths = $locator->findResources('themes://');
+        $files += (new ConfigFileFinder)->setBase('themes')->locateInFolders($paths, 'blueprints');
 
         $blueprints = new CompiledBlueprints($cache, $files, GRAV_ROOT);
 
@@ -96,9 +125,11 @@ public static function load(Container $container)
         $files += (new ConfigFileFinder)->locateFiles($paths);
         $paths = $locator->findResources('plugins://');
         $files += (new ConfigFileFinder)->setBase('plugins')->locateInFolders($paths);
+        $paths = $locator->findResources('themes://');
+        $files += (new ConfigFileFinder)->setBase('themes')->locateInFolders($paths);
 
         $compiled = new CompiledConfig($cache, $files, GRAV_ROOT);
-        $compiled->setBlueprints(function() use ($container) {
+        $compiled->setBlueprints(function () use ($container) {
             return $container['blueprints'];
         });
 
@@ -108,6 +139,10 @@ public static function load(Container $container)
         return $config;
     }
 
+    /**
+     * @param Container $container
+     * @return mixed
+     */
     public static function languages(Container $container)
     {
         /** @var Setup $setup */
@@ -144,14 +179,14 @@ public static function languages(Container $container)
      * @param string $folder_path
      * @return array
      */
-    private static function pluginFolderPaths($plugins, $folder_path)
+    protected static function pluginFolderPaths($plugins, $folder_path)
     {
         $paths = [];
 
         foreach ($plugins as $path) {
-            $iterator = new \DirectoryIterator($path);
+            $iterator = new DirectoryIterator($path);
 
-            /** @var \DirectoryIterator $directory */
+            /** @var DirectoryIterator $directory */
             foreach ($iterator as $directory) {
                 if (!$directory->isDir() || $directory->isDot()) {
                     continue;
@@ -168,5 +203,4 @@ private static function pluginFolderPaths($plugins, $folder_path)
         }
         return $paths;
     }
-
 }
diff --git a/system/src/Grav/Common/Service/ErrorServiceProvider.php b/system/src/Grav/Common/Service/ErrorServiceProvider.php
index fce69ff52f..02d38c9306 100644
--- a/system/src/Grav/Common/Service/ErrorServiceProvider.php
+++ b/system/src/Grav/Common/Service/ErrorServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,8 +13,16 @@
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 
+/**
+ * Class ErrorServiceProvider
+ * @package Grav\Common\Service
+ */
 class ErrorServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         $container['errors'] = new Errors;
diff --git a/system/src/Grav/Common/Service/FilesystemServiceProvider.php b/system/src/Grav/Common/Service/FilesystemServiceProvider.php
index f5547cb23f..1dde5b3e5f 100644
--- a/system/src/Grav/Common/Service/FilesystemServiceProvider.php
+++ b/system/src/Grav/Common/Service/FilesystemServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,8 +13,16 @@
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 
+/**
+ * Class FilesystemServiceProvider
+ * @package Grav\Common\Service
+ */
 class FilesystemServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         $container['filesystem'] = function () {
diff --git a/system/src/Grav/Common/Service/FlexServiceProvider.php b/system/src/Grav/Common/Service/FlexServiceProvider.php
new file mode 100644
index 0000000000..21192926f9
--- /dev/null
+++ b/system/src/Grav/Common/Service/FlexServiceProvider.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * @package    Grav\Common\Service
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Service;
+
+use Grav\Common\Config\Config;
+use Grav\Common\Flex\Types\Users\Storage\UserFileStorage;
+use Grav\Common\Flex\Types\Users\Storage\UserFolderStorage;
+use Grav\Common\Grav;
+use Grav\Events\FlexRegisterEvent;
+use Grav\Framework\Flex\Flex;
+use Grav\Framework\Flex\FlexFormFlash;
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+use function is_array;
+
+/**
+ * Class FlexServiceProvider
+ * @package Grav\Common\Service
+ */
+class FlexServiceProvider implements ServiceProviderInterface
+{
+    /**
+     * @param Container $container
+     * @return void
+     */
+    public function register(Container $container)
+    {
+        $container['flex'] = function (Grav $container) {
+            /** @var Config $config */
+            $config = $container['config'];
+
+            $flex = new Flex([], ['object' => $config->get('system.flex', [])]);
+            FlexFormFlash::setFlex($flex);
+
+            $accountsEnabled = $config->get('system.accounts.type', 'regular') === 'flex';
+            $pagesEnabled = $config->get('system.pages.type', 'regular') === 'flex';
+
+            // Add built-in types from Grav.
+            if ($pagesEnabled) {
+                $flex->addDirectoryType(
+                    'pages',
+                    'blueprints://flex/pages.yaml',
+                    [
+                        'enabled' => $pagesEnabled
+                    ]
+                );
+            }
+            if ($accountsEnabled) {
+                $flex->addDirectoryType(
+                    'user-accounts',
+                    'blueprints://flex/user-accounts.yaml',
+                    [
+                        'enabled' => $accountsEnabled,
+                        'data' => [
+                            'storage' => $this->getFlexAccountsStorage($config),
+                        ]
+                    ]
+                );
+                $flex->addDirectoryType(
+                    'user-groups',
+                    'blueprints://flex/user-groups.yaml',
+                    [
+                        'enabled' => $accountsEnabled
+                    ]
+                );
+            }
+
+            // Call event to register Flex Directories.
+            $event = new FlexRegisterEvent($flex);
+            $container->dispatchEvent($event);
+
+            return $flex;
+        };
+    }
+
+    /**
+     * @param Config $config
+     * @return array
+     */
+    private function getFlexAccountsStorage(Config $config): array
+    {
+        $value = $config->get('system.accounts.storage', 'file');
+        if (is_array($value)) {
+            return $value;
+        }
+
+        if ($value === 'folder') {
+            return [
+                'class' => UserFolderStorage::class,
+                'options' => [
+                    'file' => 'user',
+                    'pattern' => '{FOLDER}/{KEY:2}/{KEY}/{FILE}{EXT}',
+                    'key' => 'storage_key',
+                    'indexed' => true,
+                    'case_sensitive' => false
+                ],
+            ];
+        }
+
+        if ($value === 'file') {
+            return [
+                'class' => UserFileStorage::class,
+                'options' => [
+                    'pattern' => '{FOLDER}/{KEY}{EXT}',
+                    'key' => 'username',
+                    'indexed' => true,
+                    'case_sensitive' => false
+                ],
+            ];
+        }
+
+        return [];
+    }
+}
diff --git a/system/src/Grav/Common/Service/InflectorServiceProvider.php b/system/src/Grav/Common/Service/InflectorServiceProvider.php
index fd695474a4..f43a4461d1 100644
--- a/system/src/Grav/Common/Service/InflectorServiceProvider.php
+++ b/system/src/Grav/Common/Service/InflectorServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,8 +13,16 @@
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 
+/**
+ * Class InflectorServiceProvider
+ * @package Grav\Common\Service
+ */
 class InflectorServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         $container['inflector'] = function () {
diff --git a/system/src/Grav/Common/Service/LoggerServiceProvider.php b/system/src/Grav/Common/Service/LoggerServiceProvider.php
index 85830dee61..43a67cadfb 100644
--- a/system/src/Grav/Common/Service/LoggerServiceProvider.php
+++ b/system/src/Grav/Common/Service/LoggerServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,8 +15,16 @@
 use Pimple\ServiceProviderInterface;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
+/**
+ * Class LoggerServiceProvider
+ * @package Grav\Common\Service
+ */
 class LoggerServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         $container['log'] = function ($c) {
diff --git a/system/src/Grav/Common/Service/OutputServiceProvider.php b/system/src/Grav/Common/Service/OutputServiceProvider.php
index a9b2877e96..2dbd3436f1 100644
--- a/system/src/Grav/Common/Service/OutputServiceProvider.php
+++ b/system/src/Grav/Common/Service/OutputServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,8 +14,16 @@
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 
+/**
+ * Class OutputServiceProvider
+ * @package Grav\Common\Service
+ */
 class OutputServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         $container['output'] = function ($c) {
diff --git a/system/src/Grav/Common/Service/PagesServiceProvider.php b/system/src/Grav/Common/Service/PagesServiceProvider.php
index 0a37e831d7..fa6631eeec 100644
--- a/system/src/Grav/Common/Service/PagesServiceProvider.php
+++ b/system/src/Grav/Common/Service/PagesServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -17,26 +17,47 @@
 use Grav\Common\Uri;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
+use SplFileInfo;
+use function defined;
 
+/**
+ * Class PagesServiceProvider
+ * @package Grav\Common\Service
+ */
 class PagesServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
-        $container['pages'] = function ($c) {
-            return new Pages($c);
+        $container['pages'] = function (Grav $grav) {
+            return new Pages($grav);
         };
 
-        $container['page'] = function ($c) {
-            /** @var Grav $c */
+        if (defined('GRAV_CLI')) {
+            $container['page'] = static function (Grav $grav) {
+                $path = $grav['locator']->findResource('system://pages/notfound.md');
+                $page = new Page();
+                $page->init(new SplFileInfo($path));
+                $page->routable(false);
+
+                return $page;
+            };
+
+            return;
+        }
 
+        $container['page'] = static function (Grav $grav) {
             /** @var Pages $pages */
-            $pages = $c['pages'];
+            $pages = $grav['pages'];
 
             /** @var Config $config */
-            $config = $c['config'];
+            $config = $grav['config'];
 
             /** @var Uri $uri */
-            $uri = $c['uri'];
+            $uri = $grav['uri'];
 
             $path = $uri->path() ?: '/'; // Don't trim to support trailing slash default routes
             $page = $pages->dispatch($path);
@@ -45,55 +66,70 @@ public function register(Container $container)
             if ($page) {
                 // some debugger override logic
                 if ($page->debugger() === false) {
-                    $c['debugger']->enabled(false);
+                    $grav['debugger']->enabled(false);
                 }
 
                 if ($config->get('system.force_ssl')) {
-                    if (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] !== 'on') {
+                    $scheme = $uri->scheme(true);
+                    if ($scheme !== 'https') {
                         $url = 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-                        $c->redirect($url);
+                        $grav->redirect($url);
                     }
                 }
 
-                $url = $pages->route($page->route());
+                $route = $page->route();
+                if ($route && \in_array($uri->method(), ['GET', 'HEAD'], true)) {
+                    $pageExtension = $page->urlExtension();
+                    $url = $pages->route($route) . $pageExtension;
+
+                    if ($uri->params()) {
+                        if ($url === '/') { //Avoid double slash
+                            $url = $uri->params();
+                        } else {
+                            $url .= $uri->params();
+                        }
+                    }
+                    if ($uri->query()) {
+                        $url .= '?' . $uri->query();
+                    }
+                    if ($uri->fragment()) {
+                        $url .= '#' . $uri->fragment();
+                    }
+
+                    /** @var Language $language */
+                    $language = $grav['language'];
 
-                if ($uri->params()) {
-                    if ($url === '/') { //Avoid double slash
-                        $url = $uri->params();
-                    } else {
-                        $url .= $uri->params();
+                    $redirect_default_route = $page->header()->redirect_default_route ?? $config->get('system.pages.redirect_default_route', 0);
+                    $redirectCode = (int) $redirect_default_route;
+
+                    // Language-specific redirection scenarios
+                    if ($language->enabled() && ($language->isLanguageInUrl() xor $language->isIncludeDefaultLanguage())) {
+                        $grav->redirect($url, $redirectCode);
                     }
-                }
-                if ($uri->query()) {
-                    $url .= '?' . $uri->query();
-                }
-                if ($uri->fragment()) {
-                    $url .= '#' . $uri->fragment();
-                }
 
-                /** @var Language $language */
-                $language = $c['language'];
+                    // Default route test and redirect
+                    if ($redirectCode) {
+                        $uriExtension = $uri->extension();
+                        $uriExtension = null !== $uriExtension ? '.' . $uriExtension : '';
 
-                // Language-specific redirection scenarios
-                if ($language->enabled() && ($language->isLanguageInUrl() xor $language->isIncludeDefaultLanguage())) {
-                    $c->redirect($url);
-                }
-                // Default route test and redirect
-                if ($config->get('system.pages.redirect_default_route') && $page->route() !== $path) {
-                    $c->redirect($url);
+                        if ($route !== $path || ($pageExtension !== $uriExtension
+                                && \in_array($pageExtension, ['', '.htm', '.html'], true)
+                                && \in_array($uriExtension, ['', '.htm', '.html'], true))) {
+                            $grav->redirect($url, $redirectCode);
+                        }
+                    }
                 }
             }
 
             // if page is not found, try some fallback stuff
             if (!$page || !$page->routable()) {
-
                 // Try fallback URL stuff...
-                $page = $c->fallbackUrl($path);
+                $page = $grav->fallbackUrl($path);
 
                 if (!$page) {
-                    $path = $c['locator']->findResource('system://pages/notfound.md');
+                    $path = $grav['locator']->findResource('system://pages/notfound.md');
                     $page = new Page();
-                    $page->init(new \SplFileInfo($path));
+                    $page->init(new SplFileInfo($path));
                     $page->routable(false);
                 }
             }
diff --git a/system/src/Grav/Common/Service/RequestServiceProvider.php b/system/src/Grav/Common/Service/RequestServiceProvider.php
index 6410ef7254..a44c735640 100644
--- a/system/src/Grav/Common/Service/RequestServiceProvider.php
+++ b/system/src/Grav/Common/Service/RequestServiceProvider.php
@@ -3,20 +3,36 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Service;
 
 use Grav\Common\Uri;
+use JsonException;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Nyholm\Psr7Server\ServerRequestCreator;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
+use function explode;
+use function fopen;
+use function function_exists;
+use function in_array;
+use function is_array;
+use function strtolower;
+use function trim;
 
+/**
+ * Class RequestServiceProvider
+ * @package Grav\Common\Service
+ */
 class RequestServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         $container['request'] = function () {
@@ -28,10 +44,59 @@ public function register(Container $container)
                 $psr17Factory  // StreamFactory
             );
 
-            return $creator->fromGlobals();
+            $server = $_SERVER;
+            if (false === isset($server['REQUEST_METHOD'])) {
+                $server['REQUEST_METHOD'] = 'GET';
+            }
+            $method = $server['REQUEST_METHOD'];
+
+            $headers = function_exists('getallheaders') ? getallheaders() : $creator::getHeadersFromServer($_SERVER);
+
+            $post = null;
+            if (in_array($method, ['POST', 'PUT', 'PATCH', 'DELETE'])) {
+                foreach ($headers as $headerName => $headerValue) {
+                    if ('content-type' !== strtolower($headerName)) {
+                        continue;
+                    }
+
+                    $contentType = strtolower(trim(explode(';', $headerValue, 2)[0]));
+                    switch ($contentType) {
+                        case 'application/x-www-form-urlencoded':
+                        case 'multipart/form-data':
+                            $post = $_POST;
+                            break 2;
+                        case 'application/json':
+                        case 'application/vnd.api+json':
+                            try {
+                                $json = file_get_contents('php://input');
+                                $post = json_decode($json, true, 512, JSON_THROW_ON_ERROR);
+                                if (!is_array($post)) {
+                                    $post = null;
+                                }
+                            } catch (JsonException $e) {
+                                $post = null;
+                            }
+                            break 2;
+                    }
+                }
+            }
+
+            // Remove _url from ngnix routes.
+            $get = $_GET;
+            unset($get['_url']);
+            if (isset($server['QUERY_STRING'])) {
+                $query = $server['QUERY_STRING'];
+                if (strpos($query, '_url=') !== false) {
+                    parse_str($query, $query);
+                    unset($query['_url']);
+                    $server['QUERY_STRING'] = http_build_query($query);
+                }
+            }
+
+            return $creator->fromArrays($server, $headers, $_COOKIE, $get, $post, $_FILES, fopen('php://input', 'rb') ?: null);
         };
 
-        $container['route'] = $container->factory(function() {
+        $container['route'] = $container->factory(function () {
             return clone Uri::getCurrentRoute();
         });
     }
diff --git a/system/src/Grav/Common/Service/SchedulerServiceProvider.php b/system/src/Grav/Common/Service/SchedulerServiceProvider.php
index 1df4bbcd69..13918fbc2e 100644
--- a/system/src/Grav/Common/Service/SchedulerServiceProvider.php
+++ b/system/src/Grav/Common/Service/SchedulerServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,8 +13,16 @@
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 
+/**
+ * Class SchedulerServiceProvider
+ * @package Grav\Common\Service
+ */
 class SchedulerServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         $container['scheduler'] = function () {
diff --git a/system/src/Grav/Common/Service/SessionServiceProvider.php b/system/src/Grav/Common/Service/SessionServiceProvider.php
index 84d23d3547..80e24b4c78 100644
--- a/system/src/Grav/Common/Service/SessionServiceProvider.php
+++ b/system/src/Grav/Common/Service/SessionServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,16 +14,24 @@
 use Grav\Common\Session;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
+use Grav\Framework\Session\Messages;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
-use RocketTheme\Toolbox\Session\Message;
 
+/**
+ * Class SessionServiceProvider
+ * @package Grav\Common\Service
+ */
 class SessionServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         // Define session service.
-        $container['session'] = function ($c) {
+        $container['session'] = static function ($c) {
             /** @var Config $config */
             $config = $c['config'];
 
@@ -32,21 +40,27 @@ public function register(Container $container)
 
             // Get session options.
             $enabled = (bool)$config->get('system.session.enabled', false);
-            $cookie_secure = (bool)$config->get('system.session.secure', false);
+            $cookie_secure = $config->get('system.session.secure', false)
+                || ($config->get('system.session.secure_https', true) && $uri->scheme(true) === 'https');
             $cookie_httponly = (bool)$config->get('system.session.httponly', true);
             $cookie_lifetime = (int)$config->get('system.session.timeout', 1800);
+            $cookie_domain = $config->get('system.session.domain');
             $cookie_path = $config->get('system.session.path');
+            $cookie_samesite = $config->get('system.session.samesite', 'Lax');
+
+            if (null === $cookie_domain) {
+                $cookie_domain = $uri->host();
+                if ($cookie_domain === 'localhost') {
+                    $cookie_domain = '';
+                }
+            }
+
             if (null === $cookie_path) {
                 $cookie_path = '/' . trim(Uri::filterPath($uri->rootUrl(false)), '/');
             }
             // Session cookie path requires trailing slash.
             $cookie_path = rtrim($cookie_path, '/') . '/';
 
-            $cookie_domain = $uri->host();
-            if ($cookie_domain === 'localhost') {
-                $cookie_domain = '';
-            }
-
             // Activate admin if we're inside the admin path.
             $is_admin = false;
             if ($config->get('plugins.admin.enabled')) {
@@ -87,7 +101,8 @@ public function register(Container $container)
                 'cookie_path' => $cookie_path,
                 'cookie_domain' => $cookie_domain,
                 'cookie_secure' => $cookie_secure,
-                'cookie_httponly' => $cookie_httponly
+                'cookie_httponly' => $cookie_httponly,
+                'cookie_samesite' => $cookie_samesite
             ] + (array) $config->get('system.session.options');
 
             $session = new Session($options);
@@ -103,14 +118,14 @@ public function register(Container $container)
                 $debugger = $c['debugger'];
                 $debugger->addMessage('Inactive session: session messages may disappear', 'warming');
 
-                return new Message;
+                return new Messages();
             }
 
             /** @var Session $session */
             $session = $c['session'];
 
-            if (!isset($session->messages)) {
-                $session->messages = new Message;
+            if (!$session->messages instanceof Messages) {
+                $session->messages = new Messages();
             }
 
             return $session->messages;
diff --git a/system/src/Grav/Common/Service/StreamsServiceProvider.php b/system/src/Grav/Common/Service/StreamsServiceProvider.php
index 3bbbea1d36..f501b49038 100644
--- a/system/src/Grav/Common/Service/StreamsServiceProvider.php
+++ b/system/src/Grav/Common/Service/StreamsServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -17,12 +17,20 @@
 use RocketTheme\Toolbox\StreamWrapper\Stream;
 use RocketTheme\Toolbox\StreamWrapper\StreamBuilder;
 
+/**
+ * Class StreamsServiceProvider
+ * @package Grav\Common\Service
+ */
 class StreamsServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
-        $container['locator'] = function(Container $container) {
-            $locator = new UniformResourceLocator(GRAV_ROOT);
+        $container['locator'] = function (Container $container) {
+            $locator = new UniformResourceLocator(GRAV_WEBROOT);
 
             /** @var Setup $setup */
             $setup = $container['setup'];
@@ -31,7 +39,7 @@ public function register(Container $container)
             return $locator;
         };
 
-        $container['streams'] = function(Container $container) {
+        $container['streams'] = function (Container $container) {
             /** @var Setup $setup */
             $setup = $container['setup'];
 
diff --git a/system/src/Grav/Common/Service/TaskServiceProvider.php b/system/src/Grav/Common/Service/TaskServiceProvider.php
index c22121a960..2989e9d275 100644
--- a/system/src/Grav/Common/Service/TaskServiceProvider.php
+++ b/system/src/Grav/Common/Service/TaskServiceProvider.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Service
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,13 +12,26 @@
 use Grav\Common\Grav;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
+/**
+ * Class TaskServiceProvider
+ * @package Grav\Common\Service
+ */
 class TaskServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @param Container $container
+     * @return void
+     */
     public function register(Container $container)
     {
         $container['task'] = function (Grav $c) {
-            $task = $_POST['task'] ?? $c['uri']->param('task');
+            /** @var ServerRequestInterface $request */
+            $request = $c['request'];
+            $body = $request->getParsedBody();
+
+            $task = $body['task'] ?? $c['uri']->param('task');
             if (null !== $task) {
                 $task = filter_var($task, FILTER_SANITIZE_STRING);
             }
@@ -27,7 +40,11 @@ public function register(Container $container)
         };
 
         $container['action'] = function (Grav $c) {
-            $action = $_POST['action'] ?? $c['uri']->param('action');
+            /** @var ServerRequestInterface $request */
+            $request = $c['request'];
+            $body = $request->getParsedBody();
+
+            $action = $body['action'] ?? $c['uri']->param('action');
             if (null !== $action) {
                 $action = filter_var($action, FILTER_SANITIZE_STRING);
             }
diff --git a/system/src/Grav/Common/Session.php b/system/src/Grav/Common/Session.php
index cd9b2c175b..513143e097 100644
--- a/system/src/Grav/Common/Session.php
+++ b/system/src/Grav/Common/Session.php
@@ -3,14 +3,22 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
 use Grav\Common\Form\FormFlash;
+use Grav\Events\SessionStartEvent;
+use Grav\Plugin\Form\Forms;
+use JsonException;
+use function is_string;
 
+/**
+ * Class Session
+ * @package Grav\Common
+ */
 class Session extends \Grav\Framework\Session\Session
 {
     /** @var bool */
@@ -31,6 +39,8 @@ public static function instance()
      * Initialize session.
      *
      * Code in this function has been moved into SessionServiceProvider class.
+     *
+     * @return void
      */
     public function init()
     {
@@ -68,7 +78,7 @@ public function all()
     /**
      * Checks if the session was started.
      *
-     * @return Boolean
+     * @return bool
      * @deprecated 1.5 Use ->isStarted() method instead.
      */
     public function started()
@@ -102,7 +112,7 @@ public function getFlashObject($name)
     {
         $serialized = $this->__get($name);
 
-        $object = \is_string($serialized) ? unserialize($serialized, ['allowed_classes' => true]) : $serialized;
+        $object = is_string($serialized) ? unserialize($serialized, ['allowed_classes' => true]) : $serialized;
 
         $this->__unset($name);
 
@@ -118,14 +128,14 @@ public function getFlashObject($name)
 
                 /** @var Uri $uri */
                 $uri = $grav['uri'];
-                /** @var Grav\Plugin\Form\Forms $form */
-                $form = $grav['forms']->getActiveForm();
+                /** @var Forms|null $form */
+                $form = $grav['forms']->getActiveForm(); // @phpstan-ignore-line (form plugin)
 
                 $sessionField = base64_encode($uri->url);
 
-                /** @var FormFlash $flash */
-                $flash = $form ? $form->getFlash() : null;
-                $object = $flash ? [$sessionField => $flash->getLegacyFiles()] : null;
+                /** @var FormFlash|null $flash */
+                $flash = $form ? $form->getFlash() : null; // @phpstan-ignore-line (form plugin)
+                $object = $flash && method_exists($flash, 'getLegacyFiles') ? [$sessionField => $flash->getLegacyFiles()] : null;
             }
         }
 
@@ -139,10 +149,11 @@ public function getFlashObject($name)
      * @param mixed $object
      * @param int $time
      * @return $this
+     * @throws JsonException
      */
     public function setFlashCookieObject($name, $object, $time = 60)
     {
-        setcookie($name, json_encode($object), time() + $time, '/');
+        setcookie($name, json_encode($object, JSON_THROW_ON_ERROR), $this->getCookieOptions($time));
 
         return $this;
     }
@@ -152,15 +163,28 @@ public function setFlashCookieObject($name, $object, $time = 60)
      *
      * @param string $name
      * @return mixed|null
+     * @throws JsonException
      */
     public function getFlashCookieObject($name)
     {
         if (isset($_COOKIE[$name])) {
-            $object = json_decode($_COOKIE[$name]);
-            setcookie($name, '', time() - 3600, '/');
-            return $object;
+            $cookie = $_COOKIE[$name];
+            setcookie($name, '', $this->getCookieOptions(-42000));
+
+            return json_decode($cookie, false, 512, JSON_THROW_ON_ERROR);
         }
 
         return null;
     }
+
+    /**
+     * @return void
+     */
+    protected function onSessionStart(): void
+    {
+        $event = new SessionStartEvent($this);
+
+        $grav = Grav::instance();
+        $grav->dispatchEvent($event);
+    }
 }
diff --git a/system/src/Grav/Common/Taxonomy.php b/system/src/Grav/Common/Taxonomy.php
index e3236472b7..5079a2572b 100644
--- a/system/src/Grav/Common/Taxonomy.php
+++ b/system/src/Grav/Common/Taxonomy.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,6 +12,7 @@
 use Grav\Common\Config\Config;
 use Grav\Common\Page\Collection;
 use Grav\Common\Page\Interfaces\PageInterface;
+use function is_string;
 
 /**
  * The Taxonomy object is a singleton that holds a reference to a 'taxonomy map'. This map is
@@ -32,7 +33,9 @@
  */
 class Taxonomy
 {
+    /** @var array */
     protected $taxonomy_map;
+    /** @var Grav */
     protected $grav;
 
     /**
@@ -51,28 +54,60 @@ public function __construct(Grav $grav)
      * then adds those taxonomies to the map
      *
      * @param PageInterface  $page the page to process
-     * @param array $page_taxonomy
+     * @param array|null $page_taxonomy
      */
     public function addTaxonomy(PageInterface $page, $page_taxonomy = null)
     {
+        if (!$page->published()) {
+            return;
+        }
+
         if (!$page_taxonomy) {
             $page_taxonomy = $page->taxonomy();
         }
 
-        if (empty($page_taxonomy) || !$page->published()) {
+        if (empty($page_taxonomy)) {
             return;
         }
 
         /** @var Config $config */
         $config = $this->grav['config'];
-        if ($config->get('site.taxonomies')) {
-            foreach ((array)$config->get('site.taxonomies') as $taxonomy) {
-                if (isset($page_taxonomy[$taxonomy])) {
-                    foreach ((array)$page_taxonomy[$taxonomy] as $item) {
-                        $this->taxonomy_map[$taxonomy][(string)$item][$page->path()] = ['slug' => $page->slug()];
-                    }
-                }
+        $taxonomies = (array)$config->get('site.taxonomies');
+        foreach ($taxonomies as $taxonomy) {
+            // Skip invalid taxonomies.
+            if (!\is_string($taxonomy)) {
+                continue;
+            }
+            $current = $page_taxonomy[$taxonomy] ?? null;
+            foreach ((array)$current as $item) {
+                $this->iterateTaxonomy($page, $taxonomy, '', $item);
+            }
+        }
+    }
+
+    /**
+     * Iterate through taxonomy fields
+     *
+     * Reduces [taxonomy_type] to dot-notation where necessary
+     *
+     * @param PageInterface   $page     The Page to process
+     * @param string          $taxonomy Taxonomy type to add
+     * @param string          $key      Taxonomy type to concatenate
+     * @param iterable|string $value    Taxonomy value to add or iterate
+     * @return void
+     */
+    public function iterateTaxonomy(PageInterface $page, string $taxonomy, string $key, $value)
+    {
+        if (is_iterable($value)) {
+            foreach ($value as $identifier => $item) {
+                $identifier = "{$key}.{$identifier}";
+                $this->iterateTaxonomy($page, $taxonomy, $identifier, $item);
             }
+        } elseif (is_string($value)) {
+            if (!empty($key)) {
+                $taxonomy .= $key;
+            }
+            $this->taxonomy_map[$taxonomy][(string) $value][$page->path()] = ['slug' => $page->slug()];
         }
     }
 
@@ -82,7 +117,6 @@ public function addTaxonomy(PageInterface $page, $page_taxonomy = null)
      *
      * @param  array  $taxonomies taxonomies to search, eg ['tag'=>['animal','cat']]
      * @param  string $operator   can be 'or' or 'and' (defaults to 'and')
-     *
      * @return Collection       Collection object set to contain matches found in the taxonomy map
      */
     public function findTaxonomy($taxonomies, $operator = 'and')
@@ -117,8 +151,7 @@ public function findTaxonomy($taxonomies, $operator = 'and')
     /**
      * Gets and Sets the taxonomy map
      *
-     * @param  array $var the taxonomy map
-     *
+     * @param  array|null $var the taxonomy map
      * @return array      the taxonomy map
      */
     public function taxonomy($var = null)
@@ -134,7 +167,6 @@ public function taxonomy($var = null)
      * Gets item keys per taxonomy
      *
      * @param  string $taxonomy       taxonomy name
-     *
      * @return array                  keys of this taxonomy
      */
     public function getTaxonomyItemKeys($taxonomy)
diff --git a/system/src/Grav/Common/Theme.php b/system/src/Grav/Common/Theme.php
index dbc589f082..60131292a9 100644
--- a/system/src/Grav/Common/Theme.php
+++ b/system/src/Grav/Common/Theme.php
@@ -3,16 +3,20 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
-use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Config\Config;
 use RocketTheme\Toolbox\File\YamlFile;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
+/**
+ * Class Theme
+ * @package Grav\Common
+ */
 class Theme extends Plugin
 {
     /**
@@ -30,67 +34,54 @@ public function __construct(Grav $grav, Config $config, $name)
     /**
      * Get configuration of the plugin.
      *
-     * @return Config
+     * @return array
      */
     public function config()
     {
-        return $this->config["themes.{$this->name}"];
+        return $this->config["themes.{$this->name}"] ?? [];
     }
 
     /**
      * Persists to disk the theme parameters currently stored in the Grav Config object
      *
-     * @param string $theme_name The name of the theme whose config it should store.
-     *
-     * @return true
+     * @param string $name The name of the theme whose config it should store.
+     * @return bool
      */
-    public static function saveConfig($theme_name)
+    public static function saveConfig($name)
     {
-        if (!$theme_name) {
+        if (!$name) {
             return false;
         }
 
         $grav = Grav::instance();
+
+        /** @var UniformResourceLocator $locator */
         $locator = $grav['locator'];
-        $filename = 'config://themes/' . $theme_name . '.yaml';
-        $file = YamlFile::instance($locator->findResource($filename, true, true));
-        $content = $grav['config']->get('themes.' . $theme_name);
+
+        $filename = 'config://themes/' . $name . '.yaml';
+        $file = YamlFile::instance((string)$locator->findResource($filename, true, true));
+        $content = $grav['config']->get('themes.' . $name);
         $file->save($content);
         $file->free();
+        unset($file);
 
         return true;
     }
 
-    /**
-     * Override the mergeConfig method to work for themes
-     */
-    protected function mergeConfig(PageInterface $page, $deep = 'merge', $params = [], $type = 'themes')
-    {
-        return parent::mergeConfig($page, $deep, $params, $type);
-    }
-
-    /**
-     * Simpler getter for the theme blueprint
-     *
-     * @return mixed
-     */
-    public function getBlueprint()
-    {
-        if (!$this->blueprint) {
-            $this->loadBlueprint();
-        }
-        return $this->blueprint;
-    }
-
     /**
      * Load blueprints.
+     *
+     * @return void
      */
     protected function loadBlueprint()
     {
         if (!$this->blueprint) {
             $grav = Grav::instance();
+            /** @var Themes $themes */
             $themes = $grav['themes'];
-            $this->blueprint = $themes->get($this->name)->blueprints();
+            $data = $themes->get($this->name);
+            \assert($data !== null);
+            $this->blueprint = $data->blueprints();
         }
     }
 }
diff --git a/system/src/Grav/Common/Themes.php b/system/src/Grav/Common/Themes.php
index 6720d462dc..3567ccadd6 100644
--- a/system/src/Grav/Common/Themes.php
+++ b/system/src/Grav/Common/Themes.php
@@ -3,28 +3,39 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use DirectoryIterator;
+use Exception;
 use Grav\Common\Config\Config;
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Data\Blueprints;
 use Grav\Common\Data\Data;
-use RocketTheme\Toolbox\Event\EventDispatcher;
-use RocketTheme\Toolbox\Event\EventSubscriberInterface;
+use Grav\Framework\Psr7\Response;
+use InvalidArgumentException;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use function defined;
+use function in_array;
+use function strlen;
 
+/**
+ * Class Themes
+ * @package Grav\Common
+ */
 class Themes extends Iterator
 {
     /** @var Grav */
     protected $grav;
-
     /** @var Config */
     protected $config;
-
+    /** @var bool */
     protected $inited = false;
 
     /**
@@ -43,6 +54,9 @@ public function __construct(Grav $grav)
         spl_autoload_register([$this, 'autoloadTheme']);
     }
 
+    /**
+     * @return void
+     */
     public function init()
     {
         /** @var Themes $themes */
@@ -52,6 +66,9 @@ public function init()
         $this->initTheme();
     }
 
+    /**
+     * @return void
+     */
     public function initTheme()
     {
         if ($this->inited === false) {
@@ -60,17 +77,36 @@ public function initTheme()
 
             try {
                 $instance = $themes->load();
-            } catch (\InvalidArgumentException $e) {
-                throw new \RuntimeException($this->current() . ' theme could not be found');
+            } catch (InvalidArgumentException $e) {
+                throw new RuntimeException($this->current() . ' theme could not be found');
             }
 
+            // Register autoloader.
+            if (method_exists($instance, 'autoload')) {
+                $instance->autoload();
+            }
+
+            // Register event listeners.
             if ($instance instanceof EventSubscriberInterface) {
                 /** @var EventDispatcher $events */
                 $events = $this->grav['events'];
-
                 $events->addSubscriber($instance);
             }
 
+            // Register blueprints.
+            if (is_dir('theme://blueprints/pages')) {
+                /** @var UniformResourceLocator $locator */
+                $locator = $this->grav['locator'];
+                $locator->addPath('blueprints', '', ['theme://blueprints'], ['user', 'blueprints']);
+            }
+
+            // Register form fields.
+            if (method_exists($instance, 'getFormFieldTypes')) {
+                /** @var Plugins $plugins */
+                $plugins = $this->grav['plugins'];
+                $plugins->formFieldTypes = $instance->getFormFieldTypes() + $plugins->formFieldTypes;
+            }
+
             $this->grav['theme'] = $instance;
 
             $this->grav->fireEvent('onThemeInitialized');
@@ -93,7 +129,7 @@ public function all()
 
         $iterator = $locator->getIterator('themes://');
 
-        /** @var \DirectoryIterator $directory */
+        /** @var DirectoryIterator $directory */
         foreach ($iterator as $directory) {
             if (!$directory->isDir() || $directory->isDot()) {
                 continue;
@@ -103,8 +139,8 @@ public function all()
 
             try {
                 $result = $this->get($theme);
-            } catch (\Exception $e) {
-                $exception = new \RuntimeException(sprintf('Theme %s: %s', $theme, $e->getMessage()), $e->getCode(), $e);
+            } catch (Exception $e) {
+                $exception = new RuntimeException(sprintf('Theme %s: %s', $theme, $e->getMessage()), $e->getCode(), $e);
 
                 /** @var Debugger $debugger */
                 $debugger = $this->grav['debugger'];
@@ -118,7 +154,7 @@ public function all()
                 $list[$theme] = $result;
             }
         }
-        ksort($list);
+        ksort($list, SORT_NATURAL | SORT_FLAG_CASE);
 
         return $list;
     }
@@ -127,14 +163,13 @@ public function all()
      * Get theme configuration or throw exception if it cannot be found.
      *
      * @param  string $name
-     *
-     * @return Data
-     * @throws \RuntimeException
+     * @return Data|null
+     * @throws RuntimeException
      */
     public function get($name)
     {
         if (!$name) {
-            throw new \RuntimeException('Theme name not provided.');
+            throw new RuntimeException('Theme name not provided.');
         }
 
         $blueprints = new Blueprints('themes://');
@@ -189,47 +224,55 @@ public function load()
         $grav = $this->grav;
         $config = $this->config;
         $name = $this->current();
+        $class = null;
 
         /** @var UniformResourceLocator $locator */
         $locator = $grav['locator'];
-        $file = $locator('theme://theme.php') ?: $locator("theme://{$name}.php");
-
-        $inflector = $grav['inflector'];
 
+        // Start by attempting to load the theme.php file.
+        $file = $locator('theme://theme.php') ?: $locator("theme://{$name}.php");
         if ($file) {
             // Local variables available in the file: $grav, $config, $name, $file
             $class = include $file;
+            if (!\is_object($class) || !is_subclass_of($class, Theme::class, true)) {
+                $class = null;
+            }
+        } elseif (!$locator('theme://') && !defined('GRAV_CLI')) {
+            $response = new Response(500, [], "Theme '$name' does not exist, unable to display page.");
 
-            if (!is_object($class)) {
-                $themeClassFormat = [
-                    'Grav\\Theme\\' . ucfirst($name),
-                    'Grav\\Theme\\' . $inflector->camelize($name)
-                ];
+            $grav->close($response);
+        }
 
-                foreach ($themeClassFormat as $themeClass) {
-                    if (class_exists($themeClass)) {
-                        $class = new $themeClass($grav, $config, $name);
-                        break;
-                    }
+        // If the class hasn't been initialized yet, guess the class name and create a new instance.
+        if (null === $class) {
+            $themeClassFormat = [
+                'Grav\\Theme\\' . Inflector::camelize($name),
+                'Grav\\Theme\\' . ucfirst($name)
+            ];
+
+            foreach ($themeClassFormat as $themeClass) {
+                if (is_subclass_of($themeClass, Theme::class, true)) {
+                    $class = new $themeClass($grav, $config, $name);
+                    break;
                 }
             }
-        } elseif (!$locator('theme://') && !defined('GRAV_CLI')) {
-            exit("Theme '$name' does not exist, unable to display page.");
         }
 
-        $this->config->set('theme', $config->get('themes.' . $name));
-
-        if (empty($class)) {
+        // Finally if everything else fails, just create a new instance from the default Theme class.
+        if (null === $class) {
             $class = new Theme($grav, $config, $name);
         }
 
+        $this->config->set('theme', $config->get('themes.' . $name));
+
         return $class;
     }
 
     /**
      * Configure and prepare streams for current template.
      *
-     * @throws \InvalidArgumentException
+     * @return void
+     * @throws InvalidArgumentException
      */
     public function configure()
     {
@@ -261,7 +304,7 @@ public function configure()
                 }
             }
 
-            if (\in_array($scheme, $registered, true)) {
+            if (in_array($scheme, $registered, true)) {
                 stream_wrapper_unregister($scheme);
             }
             $type = !empty($config['type']) ? $config['type'] : 'ReadOnlyStream';
@@ -270,7 +313,7 @@ public function configure()
             }
 
             if (!stream_wrapper_register($scheme, $type)) {
-                throw new \InvalidArgumentException("Stream '{$type}' could not be initialized.");
+                throw new InvalidArgumentException("Stream '{$type}' could not be initialized.");
             }
         }
 
@@ -283,6 +326,7 @@ public function configure()
      *
      * @param string $name   Theme name
      * @param Config $config Configuration class
+     * @return void
      */
     protected function loadConfiguration($name, Config $config)
     {
@@ -292,8 +336,10 @@ protected function loadConfiguration($name, Config $config)
 
     /**
      * Load theme languages.
+     * Reads ALL language files from theme stream and merges them.
      *
      * @param Config $config Configuration class
+     * @return void
      */
     protected function loadLanguages(Config $config)
     {
@@ -301,17 +347,15 @@ protected function loadLanguages(Config $config)
         $locator = $this->grav['locator'];
 
         if ($config->get('system.languages.translations', true)) {
-            $language_file = $locator->findResource('theme://languages' . YAML_EXT);
-            if ($language_file) {
+            $language_files = array_reverse($locator->findResources('theme://languages' . YAML_EXT));
+            foreach ($language_files as $language_file) {
                 $language = CompiledYamlFile::instance($language_file)->content();
                 $this->grav['languages']->mergeRecursive($language);
             }
-            $languages_folder = $locator->findResource('theme://languages');
-            if (file_exists($languages_folder)) {
+            $languages_folders = array_reverse($locator->findResources('theme://languages'));
+            foreach ($languages_folders as $languages_folder) {
                 $languages = [];
-                $iterator = new \DirectoryIterator($languages_folder);
-
-                /** @var \DirectoryIterator $directory */
+                $iterator = new DirectoryIterator($languages_folder);
                 foreach ($iterator as $file) {
                     if ($file->getExtension() !== 'yaml') {
                         continue;
@@ -327,8 +371,7 @@ protected function loadLanguages(Config $config)
      * Autoload theme classes for inheritance
      *
      * @param  string $class Class name
-     *
-     * @return mixed  false  FALSE if unable to load $class; Class name if
+     * @return mixed|false   FALSE if unable to load $class; Class name if
      *                       $class is successfully loaded
      */
     protected function autoloadTheme($class)
@@ -357,7 +400,10 @@ protected function autoloadTheme($class)
             }
 
             // Try Old style theme classes
-            $path = strtolower(preg_replace('#\\\|_(?!.+\\\)#', '/', $class));
+            $path = preg_replace('#\\\|_(?!.+\\\)#', '/', $class);
+            \assert(null !== $path);
+
+            $path = strtolower($path);
             $file = $locator("themes://{$path}/theme.php") ?: $locator("themes://{$path}/{$path}.php");
 
             // Load class
diff --git a/system/src/Grav/Common/Twig/Exception/TwigException.php b/system/src/Grav/Common/Twig/Exception/TwigException.php
new file mode 100644
index 0000000000..7605de4c47
--- /dev/null
+++ b/system/src/Grav/Common/Twig/Exception/TwigException.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @package    Grav\Common\Twig\Exception
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Twig\Exception;
+
+use RuntimeException;
+
+/**
+ * TwigException gets thrown when you use {% throw code message %} in twig.
+ *
+ * This allows Grav to catch 401, 403 and 404 exceptions and display proper error page.
+ */
+class TwigException extends RuntimeException
+{
+}
diff --git a/system/src/Grav/Common/Twig/Extension/FilesystemExtension.php b/system/src/Grav/Common/Twig/Extension/FilesystemExtension.php
new file mode 100644
index 0000000000..0ae793e620
--- /dev/null
+++ b/system/src/Grav/Common/Twig/Extension/FilesystemExtension.php
@@ -0,0 +1,387 @@
+<?php
+
+/**
+ * @package    Grav\Common\Twig
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Twig\Extension;
+
+use Grav\Common\Grav;
+use Grav\Common\Utils;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
+
+/**
+ * Class FilesystemExtension
+ * @package Grav\Common\Twig\Extension
+ */
+class FilesystemExtension extends AbstractExtension
+{
+    /** @var UniformResourceLocator */
+    private $locator;
+
+    public function __construct()
+    {
+        $this->locator = Grav::instance()['locator'];
+    }
+
+    /**
+     * @return TwigFilter[]
+     */
+    public function getFilters()
+    {
+        return [
+            new TwigFilter('file_exists', [$this, 'file_exists']),
+            new TwigFilter('fileatime', [$this, 'fileatime']),
+            new TwigFilter('filectime', [$this, 'filectime']),
+            new TwigFilter('filemtime', [$this, 'filemtime']),
+            new TwigFilter('filesize', [$this, 'filesize']),
+            new TwigFilter('filetype', [$this, 'filetype']),
+            new TwigFilter('is_dir', [$this, 'is_dir']),
+            new TwigFilter('is_file', [$this, 'is_file']),
+            new TwigFilter('is_link', [$this, 'is_link']),
+            new TwigFilter('is_readable', [$this, 'is_readable']),
+            new TwigFilter('is_writable', [$this, 'is_writable']),
+            new TwigFilter('is_writeable', [$this, 'is_writable']),
+            new TwigFilter('lstat', [$this, 'lstat']),
+            new TwigFilter('getimagesize', [$this, 'getimagesize']),
+            new TwigFilter('exif_read_data', [$this, 'exif_read_data']),
+            new TwigFilter('read_exif_data', [$this, 'exif_read_data']),
+            new TwigFilter('exif_imagetype', [$this, 'exif_imagetype']),
+            new TwigFilter('hash_file', [$this, 'hash_file']),
+            new TwigFilter('hash_hmac_file', [$this, 'hash_hmac_file']),
+            new TwigFilter('md5_file', [$this, 'md5_file']),
+            new TwigFilter('sha1_file', [$this, 'sha1_file']),
+            new TwigFilter('get_meta_tags', [$this, 'get_meta_tags']),
+            new TwigFilter('pathinfo', [$this, 'pathinfo']),
+        ];
+    }
+
+    /**
+     * Return a list of all functions.
+     *
+     * @return TwigFunction[]
+     */
+    public function getFunctions()
+    {
+        return [
+            new TwigFunction('file_exists', [$this, 'file_exists']),
+            new TwigFunction('fileatime', [$this, 'fileatime']),
+            new TwigFunction('filectime', [$this, 'filectime']),
+            new TwigFunction('filemtime', [$this, 'filemtime']),
+            new TwigFunction('filesize', [$this, 'filesize']),
+            new TwigFunction('filetype', [$this, 'filetype']),
+            new TwigFunction('is_dir', [$this, 'is_dir']),
+            new TwigFunction('is_file', [$this, 'is_file']),
+            new TwigFunction('is_link', [$this, 'is_link']),
+            new TwigFunction('is_readable', [$this, 'is_readable']),
+            new TwigFunction('is_writable', [$this, 'is_writable']),
+            new TwigFunction('is_writeable', [$this, 'is_writable']),
+            new TwigFunction('lstat', [$this, 'lstat']),
+            new TwigFunction('getimagesize', [$this, 'getimagesize']),
+            new TwigFunction('exif_read_data', [$this, 'exif_read_data']),
+            new TwigFunction('read_exif_data', [$this, 'exif_read_data']),
+            new TwigFunction('exif_imagetype', [$this, 'exif_imagetype']),
+            new TwigFunction('hash_file', [$this, 'hash_file']),
+            new TwigFunction('hash_hmac_file', [$this, 'hash_hmac_file']),
+            new TwigFunction('md5_file', [$this, 'md5_file']),
+            new TwigFunction('sha1_file', [$this, 'sha1_file']),
+            new TwigFunction('get_meta_tags', [$this, 'get_meta_tags']),
+            new TwigFunction('pathinfo', [$this, 'pathinfo']),
+        ];
+    }
+
+    /**
+     * @param string $filename
+     * @return bool
+     */
+    public function file_exists($filename): bool
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return file_exists($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return int|false
+     */
+    public function fileatime($filename)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return fileatime($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return int|false
+     */
+    public function filectime($filename)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return filectime($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return int|false
+     */
+    public function filemtime($filename)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return filemtime($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return int|false
+     */
+    public function filesize($filename)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return filesize($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return string|false
+     */
+    public function filetype($filename)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return filetype($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return bool
+     */
+    public function is_dir($filename): bool
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return is_dir($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return bool
+     */
+    public function is_file($filename): bool
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return is_file($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return bool
+     */
+    public function is_link($filename): bool
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return is_link($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return bool
+     */
+    public function is_readable($filename): bool
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return is_readable($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return bool
+     */
+    public function is_writable($filename): bool
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return is_writable($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return array|false
+     */
+    public function lstat($filename)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return lstat($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @return array|false
+     */
+    public function getimagesize($filename)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return getimagesize($filename);
+    }
+
+    /**
+     * @param string $filename
+     * @param string|null $required_sections
+     * @param bool $as_arrays
+     * @param bool $read_thumbnail
+     * @return array|false
+     */
+    public function exif_read_data($filename, ?string $required_sections, bool $as_arrays = false, bool $read_thumbnail = false)
+    {
+        if (!Utils::functionExists('exif_read_data') || !$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return exif_read_data($filename, $required_sections, $as_arrays, $read_thumbnail);
+    }
+
+    /**
+     * @param string $filename
+     * @return int|false
+     */
+    public function exif_imagetype($filename)
+    {
+        if (!Utils::functionExists('exif_imagetype') || !$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return @exif_imagetype($filename);
+    }
+
+    /**
+     * @param string $algo
+     * @param string $filename
+     * @param bool $binary
+     * @return string|false
+     */
+    public function hash_file(string $algo, string $filename, bool $binary = false)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return hash_file($algo, $filename, $binary);
+    }
+
+    /**
+     * @param string $algo
+     * @param string $filename
+     * @param string $key
+     * @param bool $binary
+     * @return string|false
+     */
+    public function hash_hmac_file(string $algo, string $filename, string $key, bool $binary = false)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return hash_hmac_file($algo, $filename, $key, $binary);
+    }
+
+    /**
+     * @param string $filename
+     * @param bool $binary
+     * @return string|false
+     */
+    public function md5_file($filename, bool $binary = false)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return md5_file($filename, $binary);
+    }
+
+    /**
+     * @param string $filename
+     * @param bool $binary
+     * @return string|false
+     */
+    public function sha1_file($filename, bool $binary = false)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return sha1_file($filename, $binary);
+    }
+
+    /**
+     * @param string $filename
+     * @return array|false
+     */
+    public function get_meta_tags($filename)
+    {
+        if (!$this->checkFilename($filename)) {
+            return false;
+        }
+
+        return get_meta_tags($filename);
+    }
+
+    /**
+     * @param string $path
+     * @param int|null $flags
+     * @return string|string[]
+     */
+    public function pathinfo($path, $flags = null)
+    {
+        return Utils::pathinfo($path, $flags);
+    }
+
+    /**
+     * @param string $filename
+     * @return bool
+     */
+    private function checkFilename($filename): bool
+    {
+        return is_string($filename) && (!str_contains($filename, '://') || $this->locator->isStream($filename));
+    }
+}
diff --git a/system/src/Grav/Common/Twig/Extension/GravExtension.php b/system/src/Grav/Common/Twig/Extension/GravExtension.php
new file mode 100644
index 0000000000..64fb315a34
--- /dev/null
+++ b/system/src/Grav/Common/Twig/Extension/GravExtension.php
@@ -0,0 +1,1700 @@
+<?php
+
+/**
+ * @package    Grav\Common\Twig
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Twig\Extension;
+
+use CallbackFilterIterator;
+use Cron\CronExpression;
+use Grav\Common\Config\Config;
+use Grav\Common\Data\Data;
+use Grav\Common\Debugger;
+use Grav\Common\Grav;
+use Grav\Common\Inflector;
+use Grav\Common\Language\Language;
+use Grav\Common\Page\Collection;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\Page\Media;
+use Grav\Common\Scheduler\Cron;
+use Grav\Common\Security;
+use Grav\Common\Twig\TokenParser\TwigTokenParserCache;
+use Grav\Common\Twig\TokenParser\TwigTokenParserLink;
+use Grav\Common\Twig\TokenParser\TwigTokenParserRender;
+use Grav\Common\Twig\TokenParser\TwigTokenParserScript;
+use Grav\Common\Twig\TokenParser\TwigTokenParserStyle;
+use Grav\Common\Twig\TokenParser\TwigTokenParserSwitch;
+use Grav\Common\Twig\TokenParser\TwigTokenParserThrow;
+use Grav\Common\Twig\TokenParser\TwigTokenParserTryCatch;
+use Grav\Common\Twig\TokenParser\TwigTokenParserMarkdown;
+use Grav\Common\User\Interfaces\UserInterface;
+use Grav\Common\Utils;
+use Grav\Common\Yaml;
+use Grav\Common\Helpers\Base32;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use Grav\Framework\Psr7\Response;
+use Iterator;
+use JsonSerializable;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use Traversable;
+use Twig\Environment;
+use Twig\Error\RuntimeError;
+use Twig\Extension\AbstractExtension;
+use Twig\Extension\GlobalsInterface;
+use Twig\Loader\FilesystemLoader;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
+use function array_slice;
+use function count;
+use function func_get_args;
+use function func_num_args;
+use function get_class;
+use function gettype;
+use function in_array;
+use function is_array;
+use function is_bool;
+use function is_float;
+use function is_int;
+use function is_numeric;
+use function is_object;
+use function is_scalar;
+use function is_string;
+use function strlen;
+
+/**
+ * Class GravExtension
+ * @package Grav\Common\Twig\Extension
+ */
+class GravExtension extends AbstractExtension implements GlobalsInterface
+{
+    /** @var Grav */
+    protected $grav;
+    /** @var Debugger|null */
+    protected $debugger;
+    /** @var Config */
+    protected $config;
+
+    /**
+     * GravExtension constructor.
+     */
+    public function __construct()
+    {
+        $this->grav     = Grav::instance();
+        $this->debugger = $this->grav['debugger'] ?? null;
+        $this->config   = $this->grav['config'];
+    }
+
+    /**
+     * Register some standard globals
+     *
+     * @return array
+     */
+    public function getGlobals(): array
+    {
+        return [
+            'grav' => $this->grav,
+        ];
+    }
+
+    /**
+     * Return a list of all filters.
+     *
+     * @return array
+     */
+    public function getFilters(): array
+    {
+        return [
+            new TwigFilter('*ize', [$this, 'inflectorFilter']),
+            new TwigFilter('absolute_url', [$this, 'absoluteUrlFilter']),
+            new TwigFilter('contains', [$this, 'containsFilter']),
+            new TwigFilter('chunk_split', [$this, 'chunkSplitFilter']),
+            new TwigFilter('nicenumber', [$this, 'niceNumberFunc']),
+            new TwigFilter('nicefilesize', [$this, 'niceFilesizeFunc']),
+            new TwigFilter('nicetime', [$this, 'nicetimeFunc']),
+            new TwigFilter('defined', [$this, 'definedDefaultFilter']),
+            new TwigFilter('ends_with', [$this, 'endsWithFilter']),
+            new TwigFilter('fieldName', [$this, 'fieldNameFilter']),
+            new TwigFilter('parent_field', [$this, 'fieldParentFilter']),
+            new TwigFilter('ksort', [$this, 'ksortFilter']),
+            new TwigFilter('ltrim', [$this, 'ltrimFilter']),
+            new TwigFilter('markdown', [$this, 'markdownFunction'], ['needs_context' => true, 'is_safe' => ['html']]),
+            new TwigFilter('md5', [$this, 'md5Filter']),
+            new TwigFilter('base32_encode', [$this, 'base32EncodeFilter']),
+            new TwigFilter('base32_decode', [$this, 'base32DecodeFilter']),
+            new TwigFilter('base64_encode', [$this, 'base64EncodeFilter']),
+            new TwigFilter('base64_decode', [$this, 'base64DecodeFilter']),
+            new TwigFilter('randomize', [$this, 'randomizeFilter']),
+            new TwigFilter('modulus', [$this, 'modulusFilter']),
+            new TwigFilter('rtrim', [$this, 'rtrimFilter']),
+            new TwigFilter('pad', [$this, 'padFilter']),
+            new TwigFilter('regex_replace', [$this, 'regexReplace']),
+            new TwigFilter('safe_email', [$this, 'safeEmailFilter'], ['is_safe' => ['html']]),
+            new TwigFilter('safe_truncate', [Utils::class, 'safeTruncate']),
+            new TwigFilter('safe_truncate_html', [Utils::class, 'safeTruncateHTML']),
+            new TwigFilter('sort_by_key', [$this, 'sortByKeyFilter']),
+            new TwigFilter('starts_with', [$this, 'startsWithFilter']),
+            new TwigFilter('truncate', [Utils::class, 'truncate']),
+            new TwigFilter('truncate_html', [Utils::class, 'truncateHTML']),
+            new TwigFilter('json_decode', [$this, 'jsonDecodeFilter']),
+            new TwigFilter('array_unique', 'array_unique'),
+            new TwigFilter('basename', 'basename'),
+            new TwigFilter('dirname', 'dirname'),
+            new TwigFilter('print_r', [$this, 'print_r']),
+            new TwigFilter('yaml_encode', [$this, 'yamlEncodeFilter']),
+            new TwigFilter('yaml_decode', [$this, 'yamlDecodeFilter']),
+            new TwigFilter('nicecron', [$this, 'niceCronFilter']),
+            new TwigFilter('replace_last', [$this, 'replaceLastFilter']),
+
+            // Translations
+            new TwigFilter('t', [$this, 'translate'], ['needs_environment' => true]),
+            new TwigFilter('tl', [$this, 'translateLanguage']),
+            new TwigFilter('ta', [$this, 'translateArray']),
+
+            // Casting values
+            new TwigFilter('string', [$this, 'stringFilter']),
+            new TwigFilter('int', [$this, 'intFilter'], ['is_safe' => ['all']]),
+            new TwigFilter('bool', [$this, 'boolFilter']),
+            new TwigFilter('float', [$this, 'floatFilter'], ['is_safe' => ['all']]),
+            new TwigFilter('array', [$this, 'arrayFilter']),
+            new TwigFilter('yaml', [$this, 'yamlFilter']),
+
+            // Object Types
+            new TwigFilter('get_type', [$this, 'getTypeFunc']),
+            new TwigFilter('of_type', [$this, 'ofTypeFunc']),
+
+            // PHP methods
+            new TwigFilter('count', 'count'),
+            new TwigFilter('array_diff', 'array_diff'),
+
+            // Security fix
+            new TwigFilter('filter', [$this, 'filterFilter'], ['needs_environment' => true]),
+        ];
+    }
+
+    /**
+     * Return a list of all functions.
+     *
+     * @return array
+     */
+    public function getFunctions(): array
+    {
+        return [
+            new TwigFunction('array', [$this, 'arrayFilter']),
+            new TwigFunction('array_key_value', [$this, 'arrayKeyValueFunc']),
+            new TwigFunction('array_key_exists', 'array_key_exists'),
+            new TwigFunction('array_unique', 'array_unique'),
+            new TwigFunction('array_intersect', [$this, 'arrayIntersectFunc']),
+            new TwigFunction('array_diff', 'array_diff'),
+            new TwigFunction('authorize', [$this, 'authorize']),
+            new TwigFunction('debug', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
+            new TwigFunction('dump', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
+            new TwigFunction('vardump', [$this, 'vardumpFunc']),
+            new TwigFunction('print_r', [$this, 'print_r']),
+            new TwigFunction('http_response_code', 'http_response_code'),
+            new TwigFunction('evaluate', [$this, 'evaluateStringFunc'], ['needs_context' => true]),
+            new TwigFunction('evaluate_twig', [$this, 'evaluateTwigFunc'], ['needs_context' => true]),
+            new TwigFunction('gist', [$this, 'gistFunc']),
+            new TwigFunction('nonce_field', [$this, 'nonceFieldFunc']),
+            new TwigFunction('pathinfo', 'pathinfo'),
+            new TwigFunction('parseurl', 'parse_url'),
+            new TwigFunction('random_string', [$this, 'randomStringFunc']),
+            new TwigFunction('repeat', [$this, 'repeatFunc']),
+            new TwigFunction('regex_replace', [$this, 'regexReplace']),
+            new TwigFunction('regex_filter', [$this, 'regexFilter']),
+            new TwigFunction('regex_match', [$this, 'regexMatch']),
+            new TwigFunction('regex_split', [$this, 'regexSplit']),
+            new TwigFunction('string', [$this, 'stringFilter']),
+            new TwigFunction('url', [$this, 'urlFunc']),
+            new TwigFunction('json_decode', [$this, 'jsonDecodeFilter']),
+            new TwigFunction('get_cookie', [$this, 'getCookie']),
+            new TwigFunction('redirect_me', [$this, 'redirectFunc']),
+            new TwigFunction('range', [$this, 'rangeFunc']),
+            new TwigFunction('isajaxrequest', [$this, 'isAjaxFunc']),
+            new TwigFunction('exif', [$this, 'exifFunc']),
+            new TwigFunction('media_directory', [$this, 'mediaDirFunc']),
+            new TwigFunction('body_class', [$this, 'bodyClassFunc'], ['needs_context' => true]),
+            new TwigFunction('theme_var', [$this, 'themeVarFunc'], ['needs_context' => true]),
+            new TwigFunction('header_var', [$this, 'pageHeaderVarFunc'], ['needs_context' => true]),
+            new TwigFunction('read_file', [$this, 'readFileFunc']),
+            new TwigFunction('nicenumber', [$this, 'niceNumberFunc']),
+            new TwigFunction('nicefilesize', [$this, 'niceFilesizeFunc']),
+            new TwigFunction('nicetime', [$this, 'nicetimeFunc']),
+            new TwigFunction('cron', [$this, 'cronFunc']),
+            new TwigFunction('svg_image', [$this, 'svgImageFunction']),
+            new TwigFunction('xss', [$this, 'xssFunc']),
+            new TwigFunction('unique_id', [$this, 'uniqueId']),
+
+            // Translations
+            new TwigFunction('t', [$this, 'translate'], ['needs_environment' => true]),
+            new TwigFunction('tl', [$this, 'translateLanguage']),
+            new TwigFunction('ta', [$this, 'translateArray']),
+
+            // Object Types
+            new TwigFunction('get_type', [$this, 'getTypeFunc']),
+            new TwigFunction('of_type', [$this, 'ofTypeFunc']),
+
+            // PHP methods
+            new TwigFunction('is_numeric', 'is_numeric'),
+            new TwigFunction('is_iterable', 'is_iterable'),
+            new TwigFunction('is_countable', 'is_countable'),
+            new TwigFunction('is_null', 'is_null'),
+            new TwigFunction('is_string', 'is_string'),
+            new TwigFunction('is_array', 'is_array'),
+            new TwigFunction('is_object', 'is_object'),
+            new TwigFunction('count', 'count'),
+            new TwigFunction('array_diff', 'array_diff'),
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getTokenParsers(): array
+    {
+        return [
+            new TwigTokenParserRender(),
+            new TwigTokenParserThrow(),
+            new TwigTokenParserTryCatch(),
+            new TwigTokenParserScript(),
+            new TwigTokenParserStyle(),
+            new TwigTokenParserLink(),
+            new TwigTokenParserMarkdown(),
+            new TwigTokenParserSwitch(),
+            new TwigTokenParserCache(),
+        ];
+    }
+
+    /**
+     * @param mixed $var
+     * @return string
+     */
+    public function print_r($var)
+    {
+        return print_r($var, true);
+    }
+
+    /**
+     * Filters field name by changing dot notation into array notation.
+     *
+     * @param  string $str
+     * @return string
+     */
+    public function fieldNameFilter($str)
+    {
+        $path = explode('.', rtrim($str, '.'));
+
+        return array_shift($path) . ($path ? '[' . implode('][', $path) . ']' : '');
+    }
+
+    /**
+     * Filters field name by changing dot notation into array notation.
+     *
+     * @param  string $str
+     * @return string
+     */
+    public function fieldParentFilter($str)
+    {
+        $path = explode('.', rtrim($str, '.'));
+        array_pop($path);
+
+        return implode('.', $path);
+    }
+
+    /**
+     * Protects email address.
+     *
+     * @param  string $str
+     * @return string
+     */
+    public function safeEmailFilter($str)
+    {
+        static $list = [
+            '"' => '&#34;',
+            "'" => '&#39;',
+            '&' => '&amp;',
+            '<' => '&lt;',
+            '>' => '&gt;',
+            '@' => '&#64;'
+        ];
+
+        $characters = mb_str_split($str, 1, 'UTF-8');
+
+        $encoded = '';
+        foreach ($characters as $chr) {
+            $encoded .= $list[$chr] ?? (random_int(0, 1) ? '&#' . mb_ord($chr) . ';' : $chr);
+        }
+
+        return $encoded;
+    }
+
+    /**
+     * Returns array in a random order.
+     *
+     * @param  array|Traversable $original
+     * @param  int   $offset Can be used to return only slice of the array.
+     * @return array
+     */
+    public function randomizeFilter($original, $offset = 0)
+    {
+        if ($original instanceof Traversable) {
+            $original = iterator_to_array($original, false);
+        }
+
+        if (!is_array($original)) {
+            return $original;
+        }
+
+        $sorted = [];
+        $random = array_slice($original, $offset);
+        shuffle($random);
+
+        $sizeOf = count($original);
+        for ($x = 0; $x < $sizeOf; $x++) {
+            if ($x < $offset) {
+                $sorted[] = $original[$x];
+            } else {
+                $sorted[] = array_shift($random);
+            }
+        }
+
+        return $sorted;
+    }
+
+    /**
+     * Returns the modulus of an integer
+     *
+     * @param  string|int   $number
+     * @param  int          $divider
+     * @param  array|null   $items array of items to select from to return
+     * @return int
+     */
+    public function modulusFilter($number, $divider, $items = null)
+    {
+        if (is_string($number)) {
+            $number = strlen($number);
+        }
+
+        $remainder = $number % $divider;
+
+        if (is_array($items)) {
+            return $items[$remainder] ?? $items[0];
+        }
+
+        return $remainder;
+    }
+
+    /**
+     * Inflector supports following notations:
+     *
+     * `{{ 'person'|pluralize }} => people`
+     * `{{ 'shoes'|singularize }} => shoe`
+     * `{{ 'welcome page'|titleize }} => "Welcome Page"`
+     * `{{ 'send_email'|camelize }} => SendEmail`
+     * `{{ 'CamelCased'|underscorize }} => camel_cased`
+     * `{{ 'Something Text'|hyphenize }} => something-text`
+     * `{{ 'something_text_to_read'|humanize }} => "Something text to read"`
+     * `{{ '181'|monthize }} => 5`
+     * `{{ '10'|ordinalize }} => 10th`
+     *
+     * @param string $action
+     * @param string $data
+     * @param int|null $count
+     * @return string
+     */
+    public function inflectorFilter($action, $data, $count = null)
+    {
+        $action .= 'ize';
+
+        /** @var Inflector $inflector */
+        $inflector = $this->grav['inflector'];
+
+        if (in_array(
+            $action,
+            ['titleize', 'camelize', 'underscorize', 'hyphenize', 'humanize', 'ordinalize', 'monthize'],
+            true
+        )) {
+            return $inflector->{$action}($data);
+        }
+
+        if (in_array($action, ['pluralize', 'singularize'], true)) {
+            return $count ? $inflector->{$action}($data, $count) : $inflector->{$action}($data);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Return MD5 hash from the input.
+     *
+     * @param  string $str
+     * @return string
+     */
+    public function md5Filter($str)
+    {
+        return md5($str);
+    }
+
+    /**
+     * Return Base32 encoded string
+     *
+     * @param string $str
+     * @return string
+     */
+    public function base32EncodeFilter($str)
+    {
+        return Base32::encode($str);
+    }
+
+    /**
+     * Return Base32 decoded string
+     *
+     * @param string $str
+     * @return string
+     */
+    public function base32DecodeFilter($str)
+    {
+        return Base32::decode($str);
+    }
+
+    /**
+     * Return Base64 encoded string
+     *
+     * @param string $str
+     * @return string
+     */
+    public function base64EncodeFilter($str)
+    {
+        return base64_encode($str);
+    }
+
+    /**
+     * Return Base64 decoded string
+     *
+     * @param string $str
+     * @return string|false
+     */
+    public function base64DecodeFilter($str)
+    {
+        return base64_decode($str);
+    }
+
+    /**
+     * Sorts a collection by key
+     *
+     * @param  array    $input
+     * @param  string   $filter
+     * @param  int      $direction
+     * @param  int      $sort_flags
+     * @return array
+     */
+    public function sortByKeyFilter($input, $filter, $direction = SORT_ASC, $sort_flags = SORT_REGULAR)
+    {
+        return Utils::sortArrayByKey($input, $filter, $direction, $sort_flags);
+    }
+
+    /**
+     * Return ksorted collection.
+     *
+     * @param  array|null $array
+     * @return array
+     */
+    public function ksortFilter($array)
+    {
+        if (null === $array) {
+            $array = [];
+        }
+        ksort($array);
+
+        return $array;
+    }
+
+    /**
+     * Wrapper for chunk_split() function
+     *
+     * @param string $value
+     * @param int $chars
+     * @param string $split
+     * @return string
+     */
+    public function chunkSplitFilter($value, $chars, $split = '-')
+    {
+        return chunk_split($value, $chars, $split);
+    }
+
+    /**
+     * determine if a string contains another
+     *
+     * @param string $haystack
+     * @param string $needle
+     * @return string|bool
+     * @todo returning $haystack here doesn't make much sense
+     */
+    public function containsFilter($haystack, $needle)
+    {
+        if (empty($needle)) {
+            return $haystack;
+        }
+
+        return (strpos($haystack, (string) $needle) !== false);
+    }
+
+    /**
+     * Gets a human readable output for cron syntax
+     *
+     * @param string $at
+     * @return string
+     */
+    public function niceCronFilter($at)
+    {
+        $cron = new Cron($at);
+        return $cron->getText('en');
+    }
+
+    /**
+     * @param string|mixed $str
+     * @param string $search
+     * @param string $replace
+     * @return string|mixed
+     */
+    public function replaceLastFilter($str, $search, $replace)
+    {
+        if (is_string($str) && ($pos = mb_strrpos($str, $search)) !== false) {
+            $str = mb_substr($str, 0, $pos) . $replace . mb_substr($str, $pos + mb_strlen($search));
+        }
+
+        return $str;
+    }
+
+    /**
+     * Get Cron object for a crontab 'at' format
+     *
+     * @param string $at
+     * @return CronExpression
+     */
+    public function cronFunc($at)
+    {
+        return CronExpression::factory($at);
+    }
+
+    /**
+     * displays a facebook style 'time ago' formatted date/time
+     *
+     * @param string $date
+     * @param bool $long_strings
+     * @param bool $show_tense
+     * @return string
+     */
+    public function nicetimeFunc($date, $long_strings = true, $show_tense = true)
+    {
+        if (empty($date)) {
+            return $this->grav['language']->translate('GRAV.NICETIME.NO_DATE_PROVIDED');
+        }
+
+        if ($long_strings) {
+            $periods = [
+                'NICETIME.SECOND',
+                'NICETIME.MINUTE',
+                'NICETIME.HOUR',
+                'NICETIME.DAY',
+                'NICETIME.WEEK',
+                'NICETIME.MONTH',
+                'NICETIME.YEAR',
+                'NICETIME.DECADE'
+            ];
+        } else {
+            $periods = [
+                'NICETIME.SEC',
+                'NICETIME.MIN',
+                'NICETIME.HR',
+                'NICETIME.DAY',
+                'NICETIME.WK',
+                'NICETIME.MO',
+                'NICETIME.YR',
+                'NICETIME.DEC'
+            ];
+        }
+
+        $lengths = ['60', '60', '24', '7', '4.35', '12', '10'];
+
+        $now = time();
+
+        // check if unix timestamp
+        if ((string)(int)$date === (string)$date) {
+            $unix_date = $date;
+        } else {
+            $unix_date = strtotime($date);
+        }
+
+        // check validity of date
+        if (empty($unix_date)) {
+            return $this->grav['language']->translate('GRAV.NICETIME.BAD_DATE');
+        }
+
+        // is it future date or past date
+        if ($now > $unix_date) {
+            $difference = $now - $unix_date;
+            $tense      = $this->grav['language']->translate('GRAV.NICETIME.AGO');
+        } elseif ($now == $unix_date) {
+            $difference = $now - $unix_date;
+            $tense      = $this->grav['language']->translate('GRAV.NICETIME.JUST_NOW');
+        } else {
+            $difference = $unix_date - $now;
+            $tense      = $this->grav['language']->translate('GRAV.NICETIME.FROM_NOW');
+        }
+
+        for ($j = 0; $difference >= $lengths[$j] && $j < count($lengths) - 1; $j++) {
+            $difference /= $lengths[$j];
+        }
+
+        $difference = round($difference);
+
+        if ($difference != 1) {
+            $periods[$j] .= '_PLURAL';
+        }
+
+        if ($this->grav['language']->getTranslation(
+            $this->grav['language']->getLanguage(),
+            $periods[$j] . '_MORE_THAN_TWO'
+        )
+        ) {
+            if ($difference > 2) {
+                $periods[$j] .= '_MORE_THAN_TWO';
+            }
+        }
+
+        $periods[$j] = $this->grav['language']->translate('GRAV.'.$periods[$j]);
+
+        if ($now == $unix_date) {
+            return $tense;
+        }
+
+        $time = "{$difference} {$periods[$j]}";
+        $time .= $show_tense ? " {$tense}" : '';
+
+        return $time;
+    }
+
+    /**
+     * Allow quick check of a string for XSS Vulnerabilities
+     *
+     * @param string|array $data
+     * @return bool|string|array
+     */
+    public function xssFunc($data)
+    {
+        if (!is_array($data)) {
+            return Security::detectXss($data);
+        }
+
+        $results = Security::detectXssFromArray($data);
+        $results_parts = array_map(static function ($value, $key) {
+            return $key.': \''.$value . '\'';
+        }, array_values($results), array_keys($results));
+
+        return implode(', ', $results_parts);
+    }
+
+    /**
+     * Generates a random string with configurable length, prefix and suffix.
+     * Unlike the built-in `uniqid()`, this string is non-conflicting and safe
+     *
+     * @param int $length
+     * @param array $options
+     * @return string
+     * @throws \Exception
+     */
+    public function uniqueId(int $length = 9, array $options = ['prefix' => '', 'suffix' => '']): string
+    {
+        return Utils::uniqueId($length, $options);
+    }
+
+    /**
+     * @param string $string
+     * @return string
+     */
+    public function absoluteUrlFilter($string)
+    {
+        $url    = $this->grav['uri']->base();
+        $string = preg_replace('/((?:href|src) *= *[\'"](?!(http|ftp)))/i', "$1$url", $string);
+
+        return $string;
+    }
+
+    /**
+     * @param array $context
+     * @param string $string
+     * @param bool $block  Block or Line processing
+     * @return string
+     */
+    public function markdownFunction($context, $string, $block = true)
+    {
+        $page = $context['page'] ?? null;
+        return Utils::processMarkdown($string, $block, $page);
+    }
+
+    /**
+     * @param string $haystack
+     * @param string $needle
+     * @return bool
+     */
+    public function startsWithFilter($haystack, $needle)
+    {
+        return Utils::startsWith($haystack, $needle);
+    }
+
+    /**
+     * @param string $haystack
+     * @param string $needle
+     * @return bool
+     */
+    public function endsWithFilter($haystack, $needle)
+    {
+        return Utils::endsWith($haystack, $needle);
+    }
+
+    /**
+     * @param mixed $value
+     * @param null $default
+     * @return mixed|null
+     */
+    public function definedDefaultFilter($value, $default = null)
+    {
+        return $value ?? $default;
+    }
+
+    /**
+     * @param string $value
+     * @param string|null $chars
+     * @return string
+     */
+    public function rtrimFilter($value, $chars = null)
+    {
+        return null !== $chars ? rtrim($value, $chars) : rtrim($value);
+    }
+
+    /**
+     * @param string $value
+     * @param string|null $chars
+     * @return string
+     */
+    public function ltrimFilter($value, $chars = null)
+    {
+        return  null !== $chars ? ltrim($value, $chars) : ltrim($value);
+    }
+
+    /**
+     * Returns a string from a value. If the value is array, return it json encoded
+     *
+     * @param mixed $value
+     * @return string
+     */
+    public function stringFilter($value)
+    {
+        // Format the array as a string
+        if (is_array($value)) {
+            return json_encode($value);
+        }
+
+        // Boolean becomes '1' or '0'
+        if (is_bool($value)) {
+            $value = (int)$value;
+        }
+
+        // Cast the other values to string.
+        return (string)$value;
+    }
+
+    /**
+     * Casts input to int.
+     *
+     * @param mixed $input
+     * @return int
+     */
+    public function intFilter($input)
+    {
+        return (int) $input;
+    }
+
+    /**
+     * Casts input to bool.
+     *
+     * @param mixed $input
+     * @return bool
+     */
+    public function boolFilter($input)
+    {
+        return (bool) $input;
+    }
+
+    /**
+     * Casts input to float.
+     *
+     * @param mixed $input
+     * @return float
+     */
+    public function floatFilter($input)
+    {
+        return (float) $input;
+    }
+
+    /**
+     * Casts input to array.
+     *
+     * @param mixed $input
+     * @return array
+     */
+    public function arrayFilter($input)
+    {
+        if (is_array($input)) {
+            return $input;
+        }
+
+        if (is_object($input)) {
+            if (method_exists($input, 'toArray')) {
+                return $input->toArray();
+            }
+
+            if ($input instanceof Iterator) {
+                return iterator_to_array($input);
+            }
+        }
+
+        return (array)$input;
+    }
+
+    /**
+     * @param array|object $value
+     * @param int|null $inline
+     * @param int|null $indent
+     * @return string
+     */
+    public function yamlFilter($value, $inline = null, $indent = null): string
+    {
+        return Yaml::dump($value, $inline, $indent);
+    }
+
+    /**
+     * @param Environment $twig
+     * @return string
+     */
+    public function translate(Environment $twig, ...$args)
+    {
+        // If admin and tu filter provided, use it
+        if (isset($this->grav['admin'])) {
+            $numargs = count($args);
+            $lang = null;
+
+            if (($numargs === 3 && is_array($args[1])) || ($numargs === 2 && !is_array($args[1]))) {
+                $lang = array_pop($args);
+                /** @var Language $language */
+                $language = $this->grav['language'];
+                if (is_string($lang) && !$language->getLanguageCode($lang)) {
+                    $args[] = $lang;
+                    $lang = null;
+                }
+            } elseif ($numargs === 2 && is_array($args[1])) {
+                $subs = array_pop($args);
+                $args = array_merge($args, $subs);
+            }
+
+            return $this->grav['admin']->translate($args, $lang);
+        }
+
+        // else use the default grav translate functionality
+        return $this->grav['language']->translate($args);
+    }
+
+    /**
+     * Translate Strings
+     *
+     * @param string|array $args
+     * @param array|null $languages
+     * @param bool $array_support
+     * @param bool $html_out
+     * @return string
+     */
+    public function translateLanguage($args, array $languages = null, $array_support = false, $html_out = false)
+    {
+        /** @var Language $language */
+        $language = $this->grav['language'];
+
+        return $language->translate($args, $languages, $array_support, $html_out);
+    }
+
+    /**
+     * @param string $key
+     * @param string $index
+     * @param array|null $lang
+     * @return string
+     */
+    public function translateArray($key, $index, $lang = null)
+    {
+        /** @var Language $language */
+        $language = $this->grav['language'];
+
+        return $language->translateArray($key, $index, $lang);
+    }
+
+    /**
+     * Repeat given string x times.
+     *
+     * @param  string $input
+     * @param  int    $multiplier
+     *
+     * @return string
+     */
+    public function repeatFunc($input, $multiplier)
+    {
+        return str_repeat($input, $multiplier);
+    }
+
+    /**
+     * Return URL to the resource.
+     *
+     * @example {{ url('theme://images/logo.png')|default('http://www.placehold.it/150x100/f4f4f4') }}
+     *
+     * @param  string $input  Resource to be located.
+     * @param  bool   $domain True to include domain name.
+     * @param  bool   $failGracefully If true, return URL even if the file does not exist.
+     * @return string|false      Returns url to the resource or null if resource was not found.
+     */
+    public function urlFunc($input, $domain = false, $failGracefully = false)
+    {
+        return Utils::url($input, $domain, $failGracefully);
+    }
+
+    /**
+     * This function will evaluate Twig $twig through the $environment, and return its results.
+     *
+     * @param array $context
+     * @param string $twig
+     * @return mixed
+     */
+    public function evaluateTwigFunc($context, $twig)
+    {
+
+        $loader = new FilesystemLoader('.');
+        $env = new Environment($loader);
+        $env->addExtension($this);
+
+        $template = $env->createTemplate($twig);
+
+        return $template->render($context);
+    }
+
+    /**
+     * This function will evaluate a $string through the $environment, and return its results.
+     *
+     * @param array $context
+     * @param string $string
+     * @return mixed
+     */
+    public function evaluateStringFunc($context, $string)
+    {
+        return $this->evaluateTwigFunc($context, "{{ $string }}");
+    }
+
+    /**
+     * Based on Twig\Extension\Debug / twig_var_dump
+     * (c) 2011 Fabien Potencier
+     *
+     * @param Environment $env
+     * @param array $context
+     */
+    public function dump(Environment $env, $context)
+    {
+        if (!$env->isDebug() || !$this->debugger) {
+            return;
+        }
+
+        $count = func_num_args();
+        if (2 === $count) {
+            $data = [];
+            foreach ($context as $key => $value) {
+                if (is_object($value)) {
+                    if (method_exists($value, 'toArray')) {
+                        $data[$key] = $value->toArray();
+                    } else {
+                        $data[$key] = 'Object (' . get_class($value) . ')';
+                    }
+                } else {
+                    $data[$key] = $value;
+                }
+            }
+            $this->debugger->addMessage($data, 'debug');
+        } else {
+            for ($i = 2; $i < $count; $i++) {
+                $var = func_get_arg($i);
+                $this->debugger->addMessage($var, 'debug');
+            }
+        }
+    }
+
+    /**
+     * Output a Gist
+     *
+     * @param  string $id
+     * @param  string|false $file
+     * @return string
+     */
+    public function gistFunc($id, $file = false)
+    {
+        $url = 'https://gist.github.com/' . $id . '.js';
+        if ($file) {
+            $url .= '?file=' . $file;
+        }
+        return '<script src="' . $url . '"></script>';
+    }
+
+    /**
+     * Generate a random string
+     *
+     * @param int $count
+     * @return string
+     */
+    public function randomStringFunc($count = 5)
+    {
+        return Utils::generateRandomString($count);
+    }
+
+    /**
+     * Pad a string to a certain length with another string
+     *
+     * @param string $input
+     * @param int    $pad_length
+     * @param string $pad_string
+     * @param int    $pad_type
+     * @return string
+     */
+    public static function padFilter($input, $pad_length, $pad_string = ' ', $pad_type = STR_PAD_RIGHT)
+    {
+        return str_pad($input, (int)$pad_length, $pad_string, $pad_type);
+    }
+
+    /**
+     * Workaround for twig associative array initialization
+     * Returns a key => val array
+     *
+     * @param string $key           key of item
+     * @param string $val           value of item
+     * @param array|null $current_array optional array to add to
+     * @return array
+     */
+    public function arrayKeyValueFunc($key, $val, $current_array = null)
+    {
+        if (empty($current_array)) {
+            return array($key => $val);
+        }
+
+        $current_array[$key] = $val;
+
+        return $current_array;
+    }
+
+    /**
+     * Wrapper for array_intersect() method
+     *
+     * @param array|Collection $array1
+     * @param array|Collection $array2
+     * @return array|Collection
+     */
+    public function arrayIntersectFunc($array1, $array2)
+    {
+        if ($array1 instanceof Collection && $array2 instanceof Collection) {
+            return $array1->intersect($array2)->toArray();
+        }
+
+        return array_intersect($array1, $array2);
+    }
+
+    /**
+     * Translate a string
+     *
+     * @return string
+     */
+    public function translateFunc()
+    {
+        return $this->grav['language']->translate(func_get_args());
+    }
+
+    /**
+     * Authorize an action. Returns true if the user is logged in and
+     * has the right to execute $action.
+     *
+     * @param  string|array $action An action or a list of actions. Each
+     *                              entry can be a string like 'group.action'
+     *                              or without dot notation an associative
+     *                              array.
+     * @return bool                 Returns TRUE if the user is authorized to
+     *                              perform the action, FALSE otherwise.
+     */
+    public function authorize($action)
+    {
+        // Admin can use Flex users even if the site does not; make sure we use the right version of the user.
+        $admin = $this->grav['admin'] ?? null;
+        if ($admin) {
+            $user = $admin->user;
+        } else {
+            /** @var UserInterface|null $user */
+            $user = $this->grav['user'] ?? null;
+        }
+
+        if (!$user) {
+            return false;
+        }
+
+        if (is_array($action)) {
+            if (Utils::isAssoc($action)) {
+                // Handle nested access structure.
+                $actions = Utils::arrayFlattenDotNotation($action);
+            } else {
+                // Handle simple access list.
+                $actions = array_combine($action, array_fill(0, count($action), true));
+            }
+        } else {
+            // Handle single action.
+            $actions = [(string)$action => true];
+        }
+
+        $count = count($actions);
+        foreach ($actions as $act => $authenticated) {
+            // Ignore 'admin.super' if it's not the only value to be checked.
+            if ($act === 'admin.super' && $count > 1 && $user instanceof FlexObjectInterface) {
+                continue;
+            }
+
+            $auth = $user->authorize($act) ?? false;
+            if (is_bool($auth) && $auth === Utils::isPositive($authenticated)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Used to add a nonce to a form. Call {{ nonce_field('action') }} specifying a string representing the action.
+     *
+     * For maximum protection, ensure that the string representing the action is as specific as possible
+     *
+     * @param string $action         the action
+     * @param string $nonceParamName a custom nonce param name
+     * @return string the nonce input field
+     */
+    public function nonceFieldFunc($action, $nonceParamName = 'nonce')
+    {
+        $string = '<input type="hidden" name="' . $nonceParamName . '" value="' . Utils::getNonce($action) . '" />';
+
+        return $string;
+    }
+
+    /**
+     * Decodes string from JSON.
+     *
+     * @param  string  $str
+     * @param  bool  $assoc
+     * @param  int $depth
+     * @param  int $options
+     * @return array
+     */
+    public function jsonDecodeFilter($str, $assoc = false, $depth = 512, $options = 0)
+    {
+        return json_decode(html_entity_decode($str, ENT_COMPAT | ENT_HTML401, 'UTF-8'), $assoc, $depth, $options);
+    }
+
+    /**
+     * Used to retrieve a cookie value
+     *
+     * @param string $key     The cookie name to retrieve
+     * @return string
+     */
+    public function getCookie($key)
+    {
+        return filter_input(INPUT_COOKIE, $key, FILTER_SANITIZE_STRING);
+    }
+
+    /**
+     * Twig wrapper for PHP's preg_replace method
+     *
+     * @param string|string[] $subject the content to perform the replacement on
+     * @param string|string[] $pattern the regex pattern to use for matches
+     * @param string|string[] $replace the replacement value either as a string or an array of replacements
+     * @param int   $limit   the maximum possible replacements for each pattern in each subject
+     * @return string|string[]|null the resulting content
+     */
+    public function regexReplace($subject, $pattern, $replace, $limit = -1)
+    {
+        return preg_replace($pattern, $replace, $subject, $limit);
+    }
+
+    /**
+     * Twig wrapper for PHP's preg_grep method
+     *
+     * @param array $array
+     * @param string $regex
+     * @param int $flags
+     * @return array
+     */
+    public function regexFilter($array, $regex, $flags = 0)
+    {
+        return preg_grep($regex, $array, $flags);
+    }
+
+    /**
+     * Twig wrapper for PHP's preg_match method
+     *
+     * @param string $subject the content to perform the match on
+     * @param string $pattern the regex pattern to use for match
+     * @param int $flags
+     * @param int $offset
+     * @return array|false returns the matches if there is at least one match in the subject for a given pattern or null if not.
+     */
+    public function regexMatch($subject, $pattern, $flags = 0, $offset = 0)
+    {
+        if (preg_match($pattern, $subject, $matches, $flags, $offset) === false) {
+            return false;
+        }
+
+        return $matches;
+    }
+
+    /**
+     * Twig wrapper for PHP's preg_split method
+     *
+     * @param string $subject the content to perform the split on
+     * @param string $pattern the regex pattern to use for split
+     * @param int $limit the maximum possible splits for the given pattern
+     * @param int $flags
+     * @return array|false the resulting array after performing the split operation
+     */
+    public function regexSplit($subject, $pattern, $limit = -1, $flags = 0)
+    {
+        return preg_split($pattern, $subject, $limit, $flags);
+    }
+
+    /**
+     * redirect browser from twig
+     *
+     * @param string $url          the url to redirect to
+     * @param int $statusCode      statusCode, default 303
+     * @return void
+     */
+    public function redirectFunc($url, $statusCode = 303)
+    {
+        $response = new Response($statusCode, ['location' => $url]);
+
+        $this->grav->close($response);
+    }
+
+    /**
+     * Generates an array containing a range of elements, optionally stepped
+     *
+     * @param int $start      Minimum number, default 0
+     * @param int $end        Maximum number, default `getrandmax()`
+     * @param int $step       Increment between elements in the sequence, default 1
+     * @return array
+     */
+    public function rangeFunc($start = 0, $end = 100, $step = 1)
+    {
+        return range($start, $end, $step);
+    }
+
+    /**
+     * Check if HTTP_X_REQUESTED_WITH has been set to xmlhttprequest,
+     * in which case we may unsafely assume ajax. Non critical use only.
+     *
+     * @return bool True if HTTP_X_REQUESTED_WITH exists and has been set to xmlhttprequest
+     */
+    public function isAjaxFunc()
+    {
+        return (
+            !empty($_SERVER['HTTP_X_REQUESTED_WITH'])
+            && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest');
+    }
+
+    /**
+     * Get the Exif data for a file
+     *
+     * @param string $image
+     * @param bool $raw
+     * @return mixed
+     */
+    public function exifFunc($image, $raw = false)
+    {
+        if (isset($this->grav['exif'])) {
+            /** @var UniformResourceLocator $locator */
+            $locator = $this->grav['locator'];
+
+            if ($locator->isStream($image)) {
+                $image = $locator->findResource($image);
+            }
+
+            $exif_reader = $this->grav['exif']->getReader();
+
+            if ($image && file_exists($image) && $this->config->get('system.media.auto_metadata_exif') && $exif_reader) {
+                $exif_data = $exif_reader->read($image);
+
+                if ($exif_data) {
+                    if ($raw) {
+                        return $exif_data->getRawData();
+                    }
+
+                    return $exif_data->getData();
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Simple function to read a file based on a filepath and output it
+     *
+     * @param string $filepath
+     * @return bool|string
+     */
+    public function readFileFunc($filepath)
+    {
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+
+        if ($locator->isStream($filepath)) {
+            $filepath = $locator->findResource($filepath);
+        }
+
+        if ($filepath && file_exists($filepath)) {
+            return file_get_contents($filepath);
+        }
+
+        return false;
+    }
+
+    /**
+     * Process a folder as Media and return a media object
+     *
+     * @param string $media_dir
+     * @return Media|null
+     */
+    public function mediaDirFunc($media_dir)
+    {
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+
+        if ($locator->isStream($media_dir)) {
+            $media_dir = $locator->findResource($media_dir);
+        }
+
+        if ($media_dir && file_exists($media_dir)) {
+            return new Media($media_dir);
+        }
+
+        return null;
+    }
+
+    /**
+     * Dump a variable to the browser
+     *
+     * @param mixed $var
+     * @return void
+     */
+    public function vardumpFunc($var)
+    {
+        dump($var);
+    }
+
+    /**
+     * Returns a nicer more readable filesize based on bytes
+     *
+     * @param int $bytes
+     * @return string
+     */
+    public function niceFilesizeFunc($bytes)
+    {
+        return Utils::prettySize($bytes);
+    }
+
+    /**
+     * Returns a nicer more readable number
+     *
+     * @param int|float|string $n
+     * @return string|bool
+     */
+    public function niceNumberFunc($n)
+    {
+        if (!is_float($n) && !is_int($n)) {
+            if (!is_string($n) || $n === '') {
+                return false;
+            }
+
+            // Strip any thousand formatting and find the first number.
+            $list = array_filter(preg_split("/\D+/", str_replace(',', '', $n)));
+            $n = reset($list);
+
+            if (!is_numeric($n)) {
+                return false;
+            }
+
+            $n = (float)$n;
+        }
+
+        // now filter it;
+        if ($n > 1000000000000) {
+            return round($n/1000000000000, 2).' t';
+        }
+        if ($n > 1000000000) {
+            return round($n/1000000000, 2).' b';
+        }
+        if ($n > 1000000) {
+            return round($n/1000000, 2).' m';
+        }
+        if ($n > 1000) {
+            return round($n/1000, 2).' k';
+        }
+
+        return number_format($n);
+    }
+
+    /**
+     * Get a theme variable
+     * Will try to get the variable for the current page, if not found, it tries it's parent page on up to root.
+     * If still not found, will use the theme's configuration value,
+     * If still not found, will use the $default value passed in
+     *
+     * @param array $context      Twig Context
+     * @param string $var variable to be found (using dot notation)
+     * @param null $default the default value to be used as last resort
+     * @param PageInterface|null $page an optional page to use for the current page
+     * @param bool $exists toggle to simply return the page where the variable is set, else null
+     * @return mixed
+     */
+    public function themeVarFunc($context, $var, $default = null, $page = null, $exists = false)
+    {
+        $page = $page ?? $context['page'] ?? Grav::instance()['page'] ?? null;
+
+        // Try to find var in the page headers
+        if ($page instanceof PageInterface && $page->exists()) {
+            // Loop over pages and look for header vars
+            while ($page && !$page->root()) {
+                $header = new Data((array)$page->header());
+                $value = $header->get($var);
+                if (isset($value)) {
+                    if ($exists) {
+                        return $page;
+                    }
+
+                    return $value;
+                }
+                $page = $page->parent();
+            }
+        }
+
+        if ($exists) {
+            return false;
+        }
+
+        return Grav::instance()['config']->get('theme.' . $var, $default);
+    }
+
+    /**
+     * Look for a page header variable in an array of pages working its way through until a value is found
+     *
+     * @param array $context
+     * @param string $var the variable to look for in the page header
+     * @param string|string[]|null $pages array of pages to check (current page upwards if not null)
+     * @return mixed
+     * @deprecated 1.7 Use themeVarFunc() instead
+     */
+    public function pageHeaderVarFunc($context, $var, $pages = null)
+    {
+        if (is_array($pages)) {
+            $page = array_shift($pages);
+        } else {
+            $page = null;
+        }
+        return $this->themeVarFunc($context, $var, null, $page);
+    }
+
+    /**
+     * takes an array of classes, and if they are not set on body_classes
+     * look to see if they are set in theme config
+     *
+     * @param array $context
+     * @param string|string[] $classes
+     * @return string
+     */
+    public function bodyClassFunc($context, $classes)
+    {
+
+        $header = $context['page']->header();
+        $body_classes = $header->body_classes ?? '';
+
+        foreach ((array)$classes as $class) {
+            if (!empty($body_classes) && Utils::contains($body_classes, $class)) {
+                continue;
+            }
+
+            $val = $this->config->get('theme.' . $class, false) ? $class : false;
+            $body_classes .= $val ? ' ' . $val : '';
+        }
+
+        return $body_classes;
+    }
+
+    /**
+     * Returns the content of an SVG image and adds extra classes as needed
+     *
+     * @param string $path
+     * @param string|null $classes
+     * @return string|string[]|null
+     */
+    public static function svgImageFunction($path, $classes = null, $strip_style = false)
+    {
+        $path = Utils::fullPath($path);
+
+        $classes = $classes ?: '';
+
+        if (file_exists($path) && !is_dir($path)) {
+            $svg = file_get_contents($path);
+            $classes = " inline-block $classes";
+            $matched = false;
+
+            //Remove xml tag if it exists
+            $svg = preg_replace('/^<\?xml.*\?>/','', $svg);
+
+            //Strip style if needed
+            if ($strip_style) {
+                $svg = preg_replace('/<style.*<\/style>/s', '', $svg);
+            }
+
+            //Look for existing class
+            $svg = preg_replace_callback('/^<svg[^>]*(class=\"([^"]*)\")[^>]*>/', function($matches) use ($classes, &$matched) {
+                if (isset($matches[2])) {
+                    $new_classes = $matches[2] . $classes;
+                    $matched = true;
+                    return str_replace($matches[1], "class=\"$new_classes\"", $matches[0]);
+                }
+                return $matches[0];
+            }, $svg
+            );
+
+            // no matches found just add the class
+            if (!$matched) {
+                $classes = trim($classes);
+                $svg = str_replace('<svg ', "<svg class=\"$classes\" ", $svg);
+            }
+
+            return trim($svg);
+        }
+
+        return null;
+    }
+
+
+    /**
+     * Dump/Encode data into YAML format
+     *
+     * @param array|object $data
+     * @param int $inline integer number of levels of inline syntax
+     * @return string
+     */
+    public function yamlEncodeFilter($data, $inline = 10)
+    {
+        if (!is_array($data)) {
+            if ($data instanceof JsonSerializable) {
+                $data = $data->jsonSerialize();
+            } elseif (method_exists($data, 'toArray')) {
+                $data = $data->toArray();
+            } else {
+                $data = json_decode(json_encode($data), true);
+            }
+        }
+
+        return Yaml::dump($data, $inline);
+    }
+
+    /**
+     * Decode/Parse data from YAML format
+     *
+     * @param string $data
+     * @return array
+     */
+    public function yamlDecodeFilter($data)
+    {
+        return Yaml::parse($data);
+    }
+
+    /**
+     * Function/Filter to return the type of variable
+     *
+     * @param mixed $var
+     * @return string
+     */
+    public function getTypeFunc($var)
+    {
+        return gettype($var);
+    }
+
+    /**
+     * Function/Filter to test type of variable
+     *
+     * @param mixed $var
+     * @param string|null $typeTest
+     * @param string|null $className
+     * @return bool
+     */
+    public function ofTypeFunc($var, $typeTest = null, $className = null)
+    {
+
+        switch ($typeTest) {
+            default:
+                return false;
+
+            case 'array':
+                return is_array($var);
+
+            case 'bool':
+                return is_bool($var);
+
+            case 'class':
+                return is_object($var) === true && get_class($var) === $className;
+
+            case 'float':
+                return is_float($var);
+
+            case 'int':
+                return is_int($var);
+
+            case 'numeric':
+                return is_numeric($var);
+
+            case 'object':
+                return is_object($var);
+
+            case 'scalar':
+                return is_scalar($var);
+
+            case 'string':
+                return is_string($var);
+        }
+    }
+
+    /**
+     * @param Environment $env
+     * @param array $array
+     * @param callable|string $arrow
+     * @return array|CallbackFilterIterator
+     * @throws RuntimeError
+     */
+    function filterFilter(Environment $env, $array, $arrow)
+    {
+        if (is_string($arrow) && Utils::isDangerousFunction($arrow)) {
+            throw new RuntimeError('Twig |filter("' . $arrow . '") is not allowed.');
+        }
+
+        return twig_array_filter($env, $array, $arrow);
+    }
+}
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeCache.php b/system/src/Grav/Common/Twig/Node/TwigNodeCache.php
new file mode 100644
index 0000000000..e05e372485
--- /dev/null
+++ b/system/src/Grav/Common/Twig/Node/TwigNodeCache.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @package    Grav\Common\Twig
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Twig\Node;
+
+use Twig\Compiler;
+use Twig\Node\Node;
+
+/**
+ * Class TwigNodeCache
+ * @package Grav\Common\Twig\Node
+ */
+class TwigNodeCache extends Node
+{
+    /**
+     * @param string    $key       unique name for key
+     * @param int       $lifetime  in seconds
+     * @param Node      $body
+     * @param integer   $lineno
+     * @param string|null $tag
+     */
+    public function __construct(string $key, int $lifetime, Node $body, $lineno, $tag = null)
+    {
+        parent::__construct(array('body' => $body), array( 'key' => $key, 'lifetime' => $lifetime), $lineno, $tag);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function compile(Compiler $compiler): void
+    {
+        $boo = $this->getAttribute('key');
+        $compiler
+            ->addDebugInfo($this)
+            ->write("\$cache = \\Grav\\Common\\Grav::instance()['cache'];\n")
+            ->write("\$key = \"twigcache-\" . \"" . $this->getAttribute('key') . "\";\n")
+            ->write("\$lifetime = " . $this->getAttribute('lifetime') . ";\n")
+            ->write("\$cache_body = \$cache->fetch(\$key);\n")
+            ->write("if (\$cache_body === false) {\n")
+            ->indent()
+                ->write("ob_start();\n")
+                    ->indent()
+                        ->subcompile($this->getNode('body'))
+                    ->outdent()
+                ->write("\n")
+                ->write("\$cache_body = ob_get_clean();\n")
+                ->write("\$cache->save(\$key, \$cache_body, \$lifetime);\n")
+            ->outdent()
+            ->write("}\n")
+            ->write("echo \$cache_body;\n");
+    }
+}
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeLink.php b/system/src/Grav/Common/Twig/Node/TwigNodeLink.php
new file mode 100644
index 0000000000..a468633ba3
--- /dev/null
+++ b/system/src/Grav/Common/Twig/Node/TwigNodeLink.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * @package    Grav\Common\Twig
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Twig\Node;
+
+use LogicException;
+use Twig\Compiler;
+use Twig\Node\Expression\AbstractExpression;
+use Twig\Node\Node;
+use Twig\Node\NodeCaptureInterface;
+
+/**
+ * Class TwigNodeLink
+ * @package Grav\Common\Twig\Node
+ */
+class TwigNodeLink extends Node implements NodeCaptureInterface
+{
+    /** @var string */
+    protected $tagName = 'link';
+
+    /**
+     * TwigNodeLink constructor.
+     * @param string|null $rel
+     * @param AbstractExpression|null $file
+     * @param AbstractExpression|null $group
+     * @param AbstractExpression|null $priority
+     * @param AbstractExpression|null $attributes
+     * @param int $lineno
+     * @param string|null $tag
+     */
+    public function __construct(?string $rel, ?AbstractExpression $file, ?AbstractExpression $group, ?AbstractExpression $priority, ?AbstractExpression $attributes, $lineno = 0, $tag = null)
+    {
+        $nodes = ['file' => $file, 'group' => $group, 'priority' => $priority, 'attributes' => $attributes];
+        $nodes = array_filter($nodes);
+
+        parent::__construct($nodes, ['rel' => $rel], $lineno, $tag);
+    }
+
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Compiler $compiler A Twig Compiler instance
+     * @return void
+     * @throws LogicException
+     */
+    public function compile(Compiler $compiler): void
+    {
+        $compiler->addDebugInfo($this);
+        if (!$this->hasNode('file')) {
+            return;
+        }
+
+        $compiler->write('$attributes = [\'rel\' => \'' . $this->getAttribute('rel') . '\'];' . "\n");
+        if ($this->hasNode('attributes')) {
+            $compiler
+                ->write('$attributes += ')
+                ->subcompile($this->getNode('attributes'))
+                ->raw(';' . PHP_EOL)
+                ->write('if (!is_array($attributes)) {' . PHP_EOL)
+                ->indent()
+                ->write("throw new UnexpectedValueException('{% {$this->tagName} with x %}: x is not an array');" . PHP_EOL)
+                ->outdent()
+                ->write('}' . PHP_EOL);
+        }
+
+        if ($this->hasNode('group')) {
+            $compiler
+                ->write('$group = ')
+                ->subcompile($this->getNode('group'))
+                ->raw(';' . PHP_EOL)
+                ->write('if (!is_string($group)) {' . PHP_EOL)
+                ->indent()
+                ->write("throw new UnexpectedValueException('{% {$this->tagName} in x %}: x is not a string');" . PHP_EOL)
+                ->outdent()
+                ->write('}' . PHP_EOL);
+        } else {
+            $compiler->write('$group = \'head\';' . PHP_EOL);
+        }
+
+        if ($this->hasNode('priority')) {
+            $compiler
+                ->write('$priority = (int)(')
+                ->subcompile($this->getNode('priority'))
+                ->raw(');' . PHP_EOL);
+        } else {
+            $compiler->write('$priority = 10;' . PHP_EOL);
+        }
+
+        $compiler->write("\$assets = \\Grav\\Common\\Grav::instance()['assets'];" . PHP_EOL);
+        $compiler->write("\$block = \$context['block'] ?? null;" . PHP_EOL);
+
+        $compiler
+            ->write('$file = (string)(')
+            ->subcompile($this->getNode('file'))
+            ->raw(');' . PHP_EOL);
+
+        // Assets support.
+        $compiler->write('$assets->addLink($file, [\'group\' => $group, \'priority\' => $priority] + $attributes);' . PHP_EOL);
+
+        // HtmlBlock support.
+        $compiler
+            ->write('if ($block instanceof \Grav\Framework\ContentBlock\HtmlBlock) {' . PHP_EOL)
+            ->indent()
+            ->write('$block->addLink([\'href\'=> $file] + $attributes, $priority, $group);' . PHP_EOL)
+            ->outdent()
+            ->write('}' . PHP_EOL);
+    }
+}
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php b/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php
index 7bb2bfc7a4..4637db7748 100644
--- a/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php
+++ b/system/src/Grav/Common/Twig/Node/TwigNodeMarkdown.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,6 +13,10 @@
 use Twig\Node\Node;
 use Twig\Node\NodeOutputInterface;
 
+/**
+ * Class TwigNodeMarkdown
+ * @package Grav\Common\Twig\Node
+ */
 class TwigNodeMarkdown extends Node implements NodeOutputInterface
 {
     /**
@@ -25,12 +29,14 @@ public function __construct(Node $body, $lineno, $tag = 'markdown')
     {
         parent::__construct(['body' => $body], [], $lineno, $tag);
     }
+
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
+     * @param Compiler $compiler A Twig Compiler instance
+     * @return void
      */
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler
             ->addDebugInfo($this)
@@ -41,6 +47,6 @@ public function compile(Compiler $compiler)
             ->write('$lines = explode("\n", $content);' . PHP_EOL)
             ->write('$content = preg_replace(\'/^\' . $matches[0]. \'/\', "", $lines);' . PHP_EOL)
             ->write('$content = join("\n", $content);' . PHP_EOL)
-            ->write('echo $this->env->getExtension(\'Grav\Common\Twig\TwigExtension\')->markdownFunction($context, $content);' . PHP_EOL);
+            ->write('echo $this->env->getExtension(\'Grav\Common\Twig\Extension\GravExtension\')->markdownFunction($context, $content);' . PHP_EOL);
     }
 }
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeRender.php b/system/src/Grav/Common/Twig/Node/TwigNodeRender.php
index 753adf01a6..dbce3c66fe 100644
--- a/system/src/Grav/Common/Twig/Node/TwigNodeRender.php
+++ b/system/src/Grav/Common/Twig/Node/TwigNodeRender.php
@@ -3,19 +3,25 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig\Node;
 
+use LogicException;
 use Twig\Compiler;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Node;
 use Twig\Node\NodeCaptureInterface;
 
+/**
+ * Class TwigNodeRender
+ * @package Grav\Common\Twig\Node
+ */
 class TwigNodeRender extends Node implements NodeCaptureInterface
 {
+    /** @var string */
     protected $tagName = 'render';
 
     /**
@@ -25,36 +31,35 @@ class TwigNodeRender extends Node implements NodeCaptureInterface
      * @param int $lineno
      * @param string|null $tag
      */
-    public function __construct(
-        AbstractExpression $object,
-        ?AbstractExpression $layout,
-        ?AbstractExpression $context,
-        $lineno,
-        $tag = null
-    )
+    public function __construct(AbstractExpression $object, ?AbstractExpression $layout, ?AbstractExpression $context, $lineno, $tag = null)
     {
-        parent::__construct(['object' => $object, 'layout' => $layout, 'context' => $context], [], $lineno, $tag);
+        $nodes = ['object' => $object, 'layout' => $layout, 'context' => $context];
+        $nodes = array_filter($nodes);
+
+        parent::__construct($nodes, [], $lineno, $tag);
     }
+
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
-     * @throws \LogicException
+     * @param Compiler $compiler A Twig Compiler instance
+     * @return void
+     * @throws LogicException
      */
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
         $compiler->write('$object = ')->subcompile($this->getNode('object'))->raw(';' . PHP_EOL);
 
-        $layout = $this->getNode('layout');
-        if ($layout) {
+        if ($this->hasNode('layout')) {
+            $layout = $this->getNode('layout');
             $compiler->write('$layout = ')->subcompile($layout)->raw(';' . PHP_EOL);
         } else {
             $compiler->write('$layout = null;' . PHP_EOL);
         }
 
-        $context = $this->getNode('context');
-        if ($context) {
+        if ($this->hasNode('context')) {
+            $context = $this->getNode('context');
             $compiler->write('$attributes = ')->subcompile($context)->raw(';' . PHP_EOL);
         } else {
             $compiler->write('$attributes = null;' . PHP_EOL);
@@ -70,6 +75,7 @@ public function compile(Compiler $compiler)
             ->outdent()
             ->write('} else {' . PHP_EOL)
             ->indent()
+            ->write('\Grav\Common\Assets\BlockAssets::registerAssets($html);' . PHP_EOL)
             ->write('echo (string)$html;' . PHP_EOL)
             ->outdent()
             ->write('}' . PHP_EOL)
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeScript.php b/system/src/Grav/Common/Twig/Node/TwigNodeScript.php
index 4f6f7764b5..03554bd090 100644
--- a/system/src/Grav/Common/Twig/Node/TwigNodeScript.php
+++ b/system/src/Grav/Common/Twig/Node/TwigNodeScript.php
@@ -3,24 +3,31 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig\Node;
 
+use LogicException;
 use Twig\Compiler;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Node;
 use Twig\Node\NodeCaptureInterface;
 
+/**
+ * Class TwigNodeScript
+ * @package Grav\Common\Twig\Node
+ */
 class TwigNodeScript extends Node implements NodeCaptureInterface
 {
+    /** @var string */
     protected $tagName = 'script';
 
     /**
      * TwigNodeScript constructor.
      * @param Node|null $body
+     * @param string|null $type
      * @param AbstractExpression|null $file
      * @param AbstractExpression|null $group
      * @param AbstractExpression|null $priority
@@ -28,74 +35,108 @@ class TwigNodeScript extends Node implements NodeCaptureInterface
      * @param int $lineno
      * @param string|null $tag
      */
-    public function __construct(
-        Node $body = null,
-        AbstractExpression $file = null,
-        AbstractExpression $group = null,
-        AbstractExpression $priority = null,
-        AbstractExpression $attributes = null,
-        $lineno = 0,
-        $tag = null
-    )
+    public function __construct(?Node $body, ?string $type, ?AbstractExpression $file, ?AbstractExpression $group, ?AbstractExpression $priority, ?AbstractExpression $attributes, $lineno = 0, $tag = null)
     {
-        parent::__construct(['body' => $body, 'file' => $file, 'group' => $group, 'priority' => $priority, 'attributes' => $attributes], [], $lineno, $tag);
+        $nodes = ['body' => $body, 'file' => $file, 'group' => $group, 'priority' => $priority, 'attributes' => $attributes];
+        $nodes = array_filter($nodes);
+
+        parent::__construct($nodes, ['type' => $type], $lineno, $tag);
     }
+
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
-     * @throws \LogicException
+     * @param Compiler $compiler A Twig Compiler instance
+     * @return void
+     * @throws LogicException
      */
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
 
-        $compiler->write("\$assets = \\Grav\\Common\\Grav::instance()['assets'];\n");
-
-        if ($this->getNode('attributes') !== null) {
+        if ($this->hasNode('attributes')) {
             $compiler
                 ->write('$attributes = ')
                 ->subcompile($this->getNode('attributes'))
-                ->raw(";\n")
-                ->write("if (!is_array(\$attributes)) {\n")
+                ->raw(';' . PHP_EOL)
+                ->write('if (!is_array($attributes)) {' . PHP_EOL)
+                ->indent()
+                ->write("throw new UnexpectedValueException('{% {$this->tagName} with x %}: x is not an array');" . PHP_EOL)
+                ->outdent()
+                ->write('}' . PHP_EOL);
+        } else {
+            $compiler->write('$attributes = [];' . PHP_EOL);
+        }
+
+        if ($this->hasNode('group')) {
+            $compiler
+                ->write('$group = ')
+                ->subcompile($this->getNode('group'))
+                ->raw(';' . PHP_EOL)
+                ->write('if (!is_string($group)) {' . PHP_EOL)
                 ->indent()
-                ->write("throw new UnexpectedValueException('{% {$this->tagName} with x %}: x is not an array');\n")
+                ->write("throw new UnexpectedValueException('{% {$this->tagName} in x %}: x is not a string');" . PHP_EOL)
                 ->outdent()
-                ->write("}\n");
+                ->write('}' . PHP_EOL);
         } else {
-            $compiler->write('$attributes = [];' . "\n");
+            $compiler->write('$group = \'head\';' . PHP_EOL);
         }
 
-         if ($this->getNode('group') !== null) {
-             $compiler
-                 ->write("\$attributes['group'] = ")
-                 ->subcompile($this->getNode('group'))
-                 ->raw(";\n")
-                 ->write("if (!is_string(\$attributes['group'])) {\n")
-                 ->indent()
-                 ->write("throw new UnexpectedValueException('{% {$this->tagName} in x %}: x is not a string');\n")
-                 ->outdent()
-                 ->write("}\n");
-         }
-
-        if ($this->getNode('priority') !== null) {
+        if ($this->hasNode('priority')) {
             $compiler
-                ->write("\$attributes['priority'] = (int)(")
+                ->write('$priority = (int)(')
                 ->subcompile($this->getNode('priority'))
-                ->raw(");\n");
+                ->raw(');' . PHP_EOL);
+        } else {
+            $compiler->write('$priority = 10;' . PHP_EOL);
         }
 
-        if ($this->getNode('file') !== null) {
+        $compiler->write("\$assets = \\Grav\\Common\\Grav::instance()['assets'];" . PHP_EOL);
+        $compiler->write("\$block = \$context['block'] ?? null;" . PHP_EOL);
+
+        if ($this->hasNode('file')) {
+            // JS file.
             $compiler
-                ->write('$assets->addJs(')
+                ->write('$file = (string)(')
                 ->subcompile($this->getNode('file'))
-                ->raw(", \$attributes);\n");
+                ->raw(');' . PHP_EOL);
+
+            $method = $this->getAttribute('type') === 'module' ? 'addJsModule' : 'addJs';
+
+            // Assets support.
+            $compiler->write('$assets->' . $method . '($file, [\'group\' => $group, \'priority\' => $priority] + $attributes);' . PHP_EOL);
+
+            $method = $this->getAttribute('type') === 'module' ? 'addModule' : 'addScript';
+
+            // HtmlBlock support.
+            $compiler
+                ->write('if ($block instanceof \Grav\Framework\ContentBlock\HtmlBlock) {' . PHP_EOL)
+                ->indent()
+                ->write('$block->' . $method . '([\'src\'=> $file] + $attributes, $priority, $group);' . PHP_EOL)
+                ->outdent()
+                ->write('}' . PHP_EOL);
+
         } else {
+            // Inline script.
             $compiler
-                ->write("ob_start();\n")
+                ->write('ob_start();' . PHP_EOL)
                 ->subcompile($this->getNode('body'))
-                ->write('$content = ob_get_clean();' . "\n")
-                ->write("\$assets->addInlineJs(\$content, \$attributes);\n");
+                ->write('$content = ob_get_clean();' . PHP_EOL);
+
+            $method = $this->getAttribute('type') === 'module' ? 'addInlineJsModule' : 'addInlineJs';
+
+            // Assets support.
+            $compiler->write('$assets->' . $method . '($content, [\'group\' => $group, \'priority\' => $priority] + $attributes);' . PHP_EOL);
+
+            $method = $this->getAttribute('type') === 'module' ? 'addInlineModule' : 'addInlineScript';
+
+            // HtmlBlock support.
+            $compiler
+                ->write('if ($block instanceof \Grav\Framework\ContentBlock\HtmlBlock) {' . PHP_EOL)
+                ->indent()
+                ->write('$block->' . $method . '([\'content\'=> $content] + $attributes, $priority, $group);' . PHP_EOL)
+                ->outdent()
+                ->write('}' . PHP_EOL);
         }
     }
 }
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php b/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php
index 22f3302b5e..1c3568c6a9 100644
--- a/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php
+++ b/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php
@@ -3,19 +3,25 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig\Node;
 
+use LogicException;
 use Twig\Compiler;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Node;
 use Twig\Node\NodeCaptureInterface;
 
+/**
+ * Class TwigNodeStyle
+ * @package Grav\Common\Twig\Node
+ */
 class TwigNodeStyle extends Node implements NodeCaptureInterface
 {
+    /** @var string */
     protected $tagName = 'style';
 
     /**
@@ -28,74 +34,100 @@ class TwigNodeStyle extends Node implements NodeCaptureInterface
      * @param int $lineno
      * @param string|null $tag
      */
-    public function __construct(
-        Node $body = null,
-        AbstractExpression $file = null,
-        AbstractExpression $group = null,
-        AbstractExpression $priority = null,
-        AbstractExpression $attributes = null,
-        $lineno = 0,
-        $tag = null
-    )
+    public function __construct(?Node $body, ?AbstractExpression $file, ?AbstractExpression $group, ?AbstractExpression $priority, ?AbstractExpression $attributes, $lineno = 0, $tag = null)
     {
-        parent::__construct(['body' => $body, 'file' => $file, 'group' => $group, 'priority' => $priority, 'attributes' => $attributes], [], $lineno, $tag);
+        $nodes = ['body' => $body, 'file' => $file, 'group' => $group, 'priority' => $priority, 'attributes' => $attributes];
+        $nodes = array_filter($nodes);
+
+        parent::__construct($nodes, [], $lineno, $tag);
     }
+
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
-     * @throws \LogicException
+     * @param Compiler $compiler A Twig Compiler instance
+     * @return void
+     * @throws LogicException
      */
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
 
-        $compiler->write("\$assets = \\Grav\\Common\\Grav::instance()['assets'];\n");
-
-        if ($this->getNode('attributes') !== null) {
+        if ($this->hasNode('attributes')) {
             $compiler
                 ->write('$attributes = ')
                 ->subcompile($this->getNode('attributes'))
-                ->raw(";\n")
-                ->write("if (!is_array(\$attributes)) {\n")
+                ->raw(';' . PHP_EOL)
+                ->write('if (!is_array($attributes)) {' . PHP_EOL)
                 ->indent()
-                ->write("throw new UnexpectedValueException('{% {$this->tagName} with x %}: x is not an array');\n")
+                ->write("throw new UnexpectedValueException('{% {$this->tagName} with x %}: x is not an array');" . PHP_EOL)
                 ->outdent()
-                ->write("}\n");
+                ->write('}' . PHP_EOL);
         } else {
-            $compiler->write('$attributes = [];' . "\n");
+            $compiler->write('$attributes = [];' . PHP_EOL);
         }
 
-        if ($this->getNode('group') !== null) {
+        if ($this->hasNode('group')) {
             $compiler
-                ->write("\$attributes['group'] = ")
+                ->write('$group = ')
                 ->subcompile($this->getNode('group'))
-                ->raw(";\n")
-                ->write("if (!is_string(\$attributes['group'])) {\n")
+                ->raw(';' . PHP_EOL)
+                ->write('if (!is_string($group)) {' . PHP_EOL)
                 ->indent()
-                ->write("throw new UnexpectedValueException('{% {$this->tagName} in x %}: x is not a string');\n")
+                ->write("throw new UnexpectedValueException('{% {$this->tagName} in x %}: x is not a string');" . PHP_EOL)
                 ->outdent()
-                ->write("}\n");
+                ->write('}' . PHP_EOL);
+        } else {
+            $compiler->write('$group = \'head\';' . PHP_EOL);
         }
 
-        if ($this->getNode('priority') !== null) {
+        if ($this->hasNode('priority')) {
             $compiler
-                ->write("\$attributes['priority'] = (int)(")
+                ->write('$priority = (int)(')
                 ->subcompile($this->getNode('priority'))
-                ->raw(");\n");
+                ->raw(');' . PHP_EOL);
+        } else {
+            $compiler->write('$priority = 10;' . PHP_EOL);
         }
 
-        if ($this->getNode('file') !== null) {
+        $compiler->write("\$assets = \\Grav\\Common\\Grav::instance()['assets'];" . PHP_EOL);
+        $compiler->write("\$block = \$context['block'] ?? null;" . PHP_EOL);
+
+        if ($this->hasNode('file')) {
+            // CSS file.
             $compiler
-                ->write('$assets->addCss(')
+                ->write('$file = (string)(')
                 ->subcompile($this->getNode('file'))
-                ->raw(", \$attributes);\n");
+                ->raw(');' . PHP_EOL);
+
+            // Assets support.
+            $compiler->write('$assets->addCss($file, [\'group\' => $group, \'priority\' => $priority] + $attributes);' . PHP_EOL);
+
+            // HtmlBlock support.
+            $compiler
+                ->write('if ($block instanceof \Grav\Framework\ContentBlock\HtmlBlock) {' . PHP_EOL)
+                ->indent()
+                ->write('$block->addStyle([\'href\'=> $file] + $attributes, $priority, $group);' . PHP_EOL)
+                ->outdent()
+                ->write('}' . PHP_EOL);
+
         } else {
+            // Inline style.
             $compiler
-                ->write("ob_start();\n")
+                ->write('ob_start();' . PHP_EOL)
                 ->subcompile($this->getNode('body'))
-                ->write('$content = ob_get_clean();' . "\n")
-                ->write("\$assets->addInlineCss(\$content, \$attributes);\n");
+                ->write('$content = ob_get_clean();' . PHP_EOL);
+
+            // Assets support.
+            $compiler->write('$assets->addInlineCss($content, [\'group\' => $group, \'priority\' => $priority] + $attributes);' . PHP_EOL);
+
+            // HtmlBlock support.
+            $compiler
+                ->write('if ($block instanceof \Grav\Framework\ContentBlock\HtmlBlock) {' . PHP_EOL)
+                ->indent()
+                ->write('$block->addInlineStyle([\'content\'=> $content] + $attributes, $priority, $group);' . PHP_EOL)
+                ->outdent()
+                ->write('}' . PHP_EOL);
         }
     }
 }
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php b/system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php
index f29ed6dc06..7bd368e6df 100644
--- a/system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php
+++ b/system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,6 +12,10 @@
 use Twig\Compiler;
 use Twig\Node\Node;
 
+/**
+ * Class TwigNodeSwitch
+ * @package Grav\Common\Twig\Node
+ */
 class TwigNodeSwitch extends Node
 {
     /**
@@ -22,23 +26,21 @@ class TwigNodeSwitch extends Node
      * @param int $lineno
      * @param string|null $tag
      */
-    public function __construct(
-        Node $value,
-        Node $cases,
-        Node $default = null,
-        $lineno = 0,
-        $tag = null
-    )
+    public function __construct(Node $value, Node $cases, Node $default = null, $lineno = 0, $tag = null)
     {
-        parent::__construct(array('value' => $value, 'cases' => $cases, 'default' => $default), array(), $lineno, $tag);
+        $nodes = ['value' => $value, 'cases' => $cases, 'default' => $default];
+        $nodes = array_filter($nodes);
+
+        parent::__construct($nodes, [], $lineno, $tag);
     }
 
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
+     * @param Compiler $compiler A Twig Compiler instance
+     * @return void
      */
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler
             ->addDebugInfo($this)
@@ -47,6 +49,7 @@ public function compile(Compiler $compiler)
             ->raw(") {\n")
             ->indent();
 
+        /** @var Node $case */
         foreach ($this->getNode('cases') as $case) {
             if (!$case->hasNode('body')) {
                 continue;
@@ -68,7 +71,7 @@ public function compile(Compiler $compiler)
                 ->write("}\n");
         }
 
-        if ($this->hasNode('default') && $this->getNode('default') !== null) {
+        if ($this->hasNode('default')) {
             $compiler
                 ->write("default:\n")
                 ->write("{\n")
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeThrow.php b/system/src/Grav/Common/Twig/Node/TwigNodeThrow.php
index 5bb5899084..41ca15dc20 100644
--- a/system/src/Grav/Common/Twig/Node/TwigNodeThrow.php
+++ b/system/src/Grav/Common/Twig/Node/TwigNodeThrow.php
@@ -3,15 +3,20 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig\Node;
 
+use LogicException;
 use Twig\Compiler;
 use Twig\Node\Node;
 
+/**
+ * Class TwigNodeThrow
+ * @package Grav\Common\Twig\Node
+ */
 class TwigNodeThrow extends Node
 {
     /**
@@ -21,12 +26,7 @@ class TwigNodeThrow extends Node
      * @param int $lineno
      * @param string|null $tag
      */
-    public function __construct(
-        $code,
-        Node $message,
-        $lineno = 0,
-        $tag = null
-    )
+    public function __construct($code, Node $message, $lineno = 0, $tag = null)
     {
         parent::__construct(['message' => $message], ['code' => $code], $lineno, $tag);
     }
@@ -34,15 +34,16 @@ public function __construct(
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
-     * @throws \LogicException
+     * @param Compiler $compiler A Twig Compiler instance
+     * @return void
+     * @throws LogicException
      */
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
 
         $compiler
-            ->write('throw new \RuntimeException(')
+            ->write('throw new \Grav\Common\Twig\Exception\TwigException(')
             ->subcompile($this->getNode('message'))
             ->write(', ')
             ->write($this->getAttribute('code') ?: 500)
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeTryCatch.php b/system/src/Grav/Common/Twig/Node/TwigNodeTryCatch.php
index 4028e74167..1213b7c643 100644
--- a/system/src/Grav/Common/Twig/Node/TwigNodeTryCatch.php
+++ b/system/src/Grav/Common/Twig/Node/TwigNodeTryCatch.php
@@ -3,15 +3,20 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig\Node;
 
+use LogicException;
 use Twig\Compiler;
 use Twig\Node\Node;
 
+/**
+ * Class TwigNodeTryCatch
+ * @package Grav\Common\Twig\Node
+ */
 class TwigNodeTryCatch extends Node
 {
     /**
@@ -21,44 +26,38 @@ class TwigNodeTryCatch extends Node
      * @param int $lineno
      * @param string|null $tag
      */
-    public function __construct(
-        Node $try,
-        Node $catch = null,
-        $lineno = 0,
-        $tag = null
-    )
+    public function __construct(Node $try, Node $catch = null, $lineno = 0, $tag = null)
     {
-        parent::__construct(['try' => $try, 'catch' => $catch], [], $lineno, $tag);
+        $nodes = ['try' => $try, 'catch' => $catch];
+        $nodes = array_filter($nodes);
+
+        parent::__construct($nodes, [], $lineno, $tag);
     }
 
     /**
      * Compiles the node to PHP.
      *
-     * @param Compiler $compiler A Twig_Compiler instance
-     * @throws \LogicException
+     * @param Compiler $compiler A Twig Compiler instance
+     * @return void
+     * @throws LogicException
      */
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
 
-        $compiler
-            ->write('try {')
-        ;
+        $compiler->write('try {');
 
         $compiler
             ->indent()
             ->subcompile($this->getNode('try'))
-        ;
+            ->outdent()
+            ->write('} catch (\Exception $e) {' . "\n")
+            ->indent()
+            ->write('if (isset($context[\'grav\'][\'debugger\'])) $context[\'grav\'][\'debugger\']->addException($e);' . "\n")
+            ->write('$context[\'e\'] = $e;' . "\n");
 
-        if ($this->hasNode('catch') && null !== $this->getNode('catch')) {
-            $compiler
-                ->outdent()
-                ->write('} catch (\Exception $e) {' . "\n")
-                ->indent()
-                ->write('if (isset($context[\'grav\'][\'debugger\'])) $context[\'grav\'][\'debugger\']->addException($e);' . "\n")
-                ->write('$context[\'e\'] = $e;' . "\n")
-                ->subcompile($this->getNode('catch'))
-            ;
+        if ($this->hasNode('catch')) {
+            $compiler->subcompile($this->getNode('catch'));
         }
 
         $compiler
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserCache.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserCache.php
new file mode 100644
index 0000000000..1cf21918b1
--- /dev/null
+++ b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserCache.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * @package    Grav\Common\Twig
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Twig\TokenParser;
+
+use Grav\Common\Grav;
+use Grav\Common\Twig\Node\TwigNodeCache;
+use Twig\Error\SyntaxError;
+use Twig\Token;
+use Twig\TokenParser\AbstractTokenParser;
+
+/**
+ * Adds ability to cache Twig between tags.
+ *
+ * {% cache 600 %}
+ * {{ some_complex_work() }}
+ * {% endcache %}
+ *
+ * Where the `600` is an optional lifetime in seconds
+ */
+class TwigTokenParserCache extends AbstractTokenParser
+{
+    /**
+     * @param Token $token
+     * @return TwigNodeCache
+     * @throws SyntaxError
+     */
+    public function parse(Token $token)
+    {
+        $lineno = $token->getLine();
+        $stream = $this->parser->getStream();
+        $key = $this->parser->getVarName() . $lineno;
+        $lifetime = Grav::instance()['cache']->getLifetime();
+
+        // Check for optional lifetime override
+        if (!$stream->test(Token::BLOCK_END_TYPE)) {
+            $lifetime_expr = $this->parser->getExpressionParser()->parseExpression();
+            $lifetime = $lifetime_expr->getAttribute('value');
+        }
+
+        $stream->expect(Token::BLOCK_END_TYPE);
+        $body = $this->parser->subparse(array($this, 'decideCacheEnd'), true);
+        $stream->expect(Token::BLOCK_END_TYPE);
+
+        return new TwigNodeCache($key, $lifetime, $body, $lineno, $this->getTag());
+    }
+
+    /**
+     * Decide if current token marks end of cache block.
+     *
+     * @param Token $token
+     * @return bool
+     */
+    public function decideCacheEnd(Token $token): bool
+    {
+        return $token->test('endcache');
+    }
+    /**
+     * {@inheritDoc}
+     */
+    public function getTag(): string
+    {
+        return 'cache';
+    }
+}
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserLink.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserLink.php
new file mode 100644
index 0000000000..2cb0208eb4
--- /dev/null
+++ b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserLink.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * @package    Grav\Common\Twig
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Twig\TokenParser;
+
+use Grav\Common\Twig\Node\TwigNodeLink;
+use Twig\Error\SyntaxError;
+use Twig\Token;
+use Twig\TokenParser\AbstractTokenParser;
+
+/**
+ * Adds a link to the document. First parameter is always value of `rel` without quotes.
+ *
+ * {% link icon 'theme://images/favicon.png' priority: 20 with { type: 'image/png' } %}
+ * {% link modulepreload 'plugin://grav-plugin/build/js/vendor.js' %}
+ */
+class TwigTokenParserLink extends AbstractTokenParser
+{
+    protected $rel = [
+        'alternate',
+        'author',
+        'dns-prefetch',
+        'help',
+        'icon',
+        'license',
+        'next',
+        'pingback',
+        'preconnect',
+        'prefetch',
+        'preload',
+        'prerender',
+        'prev',
+        'search',
+        'stylesheet',
+    ];
+
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Token $token
+     * @return TwigNodeLink
+     * @throws SyntaxError
+     */
+    public function parse(Token $token)
+    {
+        $lineno = $token->getLine();
+
+        [$rel, $file, $group, $priority, $attributes] = $this->parseArguments($token);
+
+        return new TwigNodeLink($rel, $file, $group, $priority, $attributes, $lineno, $this->getTag());
+    }
+
+    /**
+     * @param Token $token
+     * @return array
+     */
+    protected function parseArguments(Token $token): array
+    {
+        $stream = $this->parser->getStream();
+
+
+        $rel = null;
+        if ($stream->test(Token::NAME_TYPE, $this->rel)) {
+            $rel = $stream->getCurrent()->getValue();
+            $stream->next();
+        }
+
+        $file = null;
+        if (!$stream->test(Token::NAME_TYPE) && !$stream->test(Token::BLOCK_END_TYPE)) {
+            $file = $this->parser->getExpressionParser()->parseExpression();
+        }
+
+        $group = null;
+        if ($stream->nextIf(Token::NAME_TYPE, 'at')) {
+            $group = $this->parser->getExpressionParser()->parseExpression();
+        }
+
+        $priority = null;
+        if ($stream->nextIf(Token::NAME_TYPE, 'priority')) {
+            $stream->expect(Token::PUNCTUATION_TYPE, ':');
+            $priority = $this->parser->getExpressionParser()->parseExpression();
+        }
+
+        $attributes = null;
+        if ($stream->nextIf(Token::NAME_TYPE, 'with')) {
+            $attributes = $this->parser->getExpressionParser()->parseExpression();
+        }
+
+        $stream->expect(Token::BLOCK_END_TYPE);
+
+        return [$rel, $file, $group, $priority, $attributes];
+    }
+
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @return string The tag name
+     */
+    public function getTag(): string
+    {
+        return 'link';
+    }
+}
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserMarkdown.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserMarkdown.php
index 7a1d1394df..49e34e693c 100644
--- a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserMarkdown.php
+++ b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserMarkdown.php
@@ -3,13 +3,14 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig\TokenParser;
 
 use Grav\Common\Twig\Node\TwigNodeMarkdown;
+use Twig\Error\SyntaxError;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
@@ -26,13 +27,15 @@
 class TwigTokenParserMarkdown extends AbstractTokenParser
 {
     /**
-     * {@inheritdoc}
+     * @param Token $token
+     * @return TwigNodeMarkdown
+     * @throws SyntaxError
      */
     public function parse(Token $token)
     {
         $lineno = $token->getLine();
         $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideMarkdownEnd'), true);
+        $body = $this->parser->subparse([$this, 'decideMarkdownEnd'], true);
         $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
         return new TwigNodeMarkdown($body, $lineno, $this->getTag());
     }
@@ -42,14 +45,14 @@ public function parse(Token $token)
      * @param Token $token
      * @return bool
      */
-    public function decideMarkdownEnd(Token $token)
+    public function decideMarkdownEnd(Token $token): bool
     {
         return $token->test('endmarkdown');
     }
     /**
      * {@inheritdoc}
      */
-    public function getTag()
+    public function getTag(): string
     {
         return 'markdown';
     }
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserRender.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserRender.php
index 811705d7b6..de16266b05 100644
--- a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserRender.php
+++ b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserRender.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -24,9 +24,8 @@ class TwigTokenParserRender extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token A Twig_Token instance
-     *
-     * @return Node A Twig_Node instance
+     * @param Token $token
+     * @return TwigNodeRender
      */
     public function parse(Token $token)
     {
@@ -41,7 +40,7 @@ public function parse(Token $token)
      * @param Token $token
      * @return array
      */
-    protected function parseArguments(Token $token)
+    protected function parseArguments(Token $token): array
     {
         $stream = $this->parser->getStream();
 
@@ -68,7 +67,7 @@ protected function parseArguments(Token $token)
      *
      * @return string The tag name
      */
-    public function getTag()
+    public function getTag(): string
     {
         return 'render';
     }
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserScript.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserScript.php
index bb04707f68..b943a25406 100644
--- a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserScript.php
+++ b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserScript.php
@@ -3,42 +3,48 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig\TokenParser;
 
 use Grav\Common\Twig\Node\TwigNodeScript;
-use Twig\Node\Node;
+use Twig\Error\SyntaxError;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
 /**
- * Adds a script to head/bottom/custom location in the document.
+ * Adds a script to head/bottom/custom group location in the document.
  *
- * {% script 'theme://js/something.js' in 'bottom' priority: 20 with { defer: true, async: true } %}
+ * {% script 'theme://js/something.js' at 'bottom' priority: 20 with { position: 'pipeline', loading: 'async defer' } %}
+ * {% script module 'theme://js/module.mjs' at 'head' %}
  *
- * {% script in 'bottom' priority: 20 %}
- *     alert('Warning!');
+ * {% script 'theme://js/something.js' at 'bottom' priority: 20 with { loading: 'inline' } %}
+ * {% script at 'bottom' priority: 20 %}
+ *   alert('Warning!');
+ * {% endscript %}
+ *
+ * {% script module 'theme://js/module.mjs' at 'bottom' with { loading: 'inline' } %}
+ * {% script module at 'bottom' %}
+ *   ...
  * {% endscript %}
-
  */
 class TwigTokenParserScript extends AbstractTokenParser
 {
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token A Twig_Token instance
-     *
-     * @return Node A Twig_Node instance
+     * @param Token $token
+     * @return TwigNodeScript
+     * @throws SyntaxError
      */
     public function parse(Token $token)
     {
         $lineno = $token->getLine();
         $stream = $this->parser->getStream();
 
-        list($file, $group, $priority, $attributes) = $this->parseArguments($token);
+        [$type, $file, $group, $priority, $attributes] = $this->parseArguments($token);
 
         $content = null;
         if ($file === null) {
@@ -46,24 +52,46 @@ public function parse(Token $token)
             $stream->expect(Token::BLOCK_END_TYPE);
         }
 
-        return new TwigNodeScript($content, $file, $group, $priority, $attributes, $lineno, $this->getTag());
+        return new TwigNodeScript($content, $type, $file, $group, $priority, $attributes, $lineno, $this->getTag());
     }
 
     /**
      * @param Token $token
      * @return array
      */
-    protected function parseArguments(Token $token)
+    protected function parseArguments(Token $token): array
     {
         $stream = $this->parser->getStream();
 
+        // Look for deprecated {% script ... in ... %}
+        if (!$stream->test(Token::BLOCK_END_TYPE) && !$stream->test(Token::OPERATOR_TYPE, 'in')) {
+            $i = 0;
+            do {
+                $token = $stream->look(++$i);
+                if ($token->test(Token::BLOCK_END_TYPE)) {
+                    break;
+                }
+                if ($token->test(Token::OPERATOR_TYPE, 'in') && $stream->look($i+1)->test(Token::STRING_TYPE)) {
+                    user_error("Twig: Using {% script ... in ... %} is deprecated, use {% script ...  at ... %} instead", E_USER_DEPRECATED);
+
+                    break;
+                }
+            } while (true);
+        }
+
+        $type = null;
+        if ($stream->test(Token::NAME_TYPE, 'module')) {
+            $type = $stream->getCurrent()->getValue();
+            $stream->next();
+        }
+
         $file = null;
-        if (!$stream->test(Token::NAME_TYPE) && !$stream->test(Token::OPERATOR_TYPE) && !$stream->test(Token::BLOCK_END_TYPE)) {
+        if (!$stream->test(Token::NAME_TYPE) && !$stream->test(Token::OPERATOR_TYPE, 'in') && !$stream->test(Token::BLOCK_END_TYPE)) {
             $file = $this->parser->getExpressionParser()->parseExpression();
         }
 
         $group = null;
-        if ($stream->nextIf(Token::OPERATOR_TYPE, 'in')) {
+        if ($stream->nextIf(Token::NAME_TYPE, 'at') || $stream->nextIf(Token::OPERATOR_TYPE, 'in')) {
             $group = $this->parser->getExpressionParser()->parseExpression();
         }
 
@@ -80,14 +108,14 @@ protected function parseArguments(Token $token)
 
         $stream->expect(Token::BLOCK_END_TYPE);
 
-        return [$file, $group, $priority, $attributes];
+        return [$type, $file, $group, $priority, $attributes];
     }
 
     /**
      * @param Token $token
      * @return bool
      */
-    public function decideBlockEnd(Token $token)
+    public function decideBlockEnd(Token $token): bool
     {
         return $token->test('endscript');
     }
@@ -97,7 +125,7 @@ public function decideBlockEnd(Token $token)
      *
      * @return string The tag name
      */
-    public function getTag()
+    public function getTag(): string
     {
         return 'script';
     }
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php
index 5a5beb66e0..0687395adc 100644
--- a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php
+++ b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php
@@ -3,14 +3,14 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig\TokenParser;
 
 use Grav\Common\Twig\Node\TwigNodeStyle;
-use Twig\Node\Node;
+use Twig\Error\SyntaxError;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
@@ -28,16 +28,16 @@ class TwigTokenParserStyle extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token A Twig_Token instance
-     *
-     * @return Node A Twig_Node instance
+     * @param Token $token
+     * @return TwigNodeStyle
+     * @throws SyntaxError
      */
     public function parse(Token $token)
     {
         $lineno = $token->getLine();
         $stream = $this->parser->getStream();
 
-        list ($file, $group, $priority, $attributes) = $this->parseArguments($token);
+        [$file, $group, $priority, $attributes] = $this->parseArguments($token);
 
         $content = null;
         if (!$file) {
@@ -52,17 +52,33 @@ public function parse(Token $token)
      * @param Token $token
      * @return array
      */
-    protected function parseArguments(Token $token)
+    protected function parseArguments(Token $token): array
     {
         $stream = $this->parser->getStream();
 
+        // Look for deprecated {% style ... in ... %}
+        if (!$stream->test(Token::BLOCK_END_TYPE) && !$stream->test(Token::OPERATOR_TYPE, 'in')) {
+            $i = 0;
+            do {
+                $token = $stream->look(++$i);
+                if ($token->test(Token::BLOCK_END_TYPE)) {
+                    break;
+                }
+                if ($token->test(Token::OPERATOR_TYPE, 'in') && $stream->look($i+1)->test(Token::STRING_TYPE)) {
+                    user_error("Twig: Using {% style ... in ... %} is deprecated, use {% style ...  at ... %} instead", E_USER_DEPRECATED);
+
+                    break;
+                }
+            } while (true);
+        }
+
         $file = null;
-        if (!$stream->test(Token::NAME_TYPE) && !$stream->test(Token::OPERATOR_TYPE) && !$stream->test(Token::BLOCK_END_TYPE)) {
+        if (!$stream->test(Token::NAME_TYPE) && !$stream->test(Token::OPERATOR_TYPE, 'in') && !$stream->test(Token::BLOCK_END_TYPE)) {
             $file = $this->parser->getExpressionParser()->parseExpression();
         }
 
         $group = null;
-        if ($stream->nextIf(Token::OPERATOR_TYPE, 'in')) {
+        if ($stream->nextIf(Token::NAME_TYPE, 'at') || $stream->nextIf(Token::OPERATOR_TYPE, 'in')) {
             $group = $this->parser->getExpressionParser()->parseExpression();
         }
 
@@ -86,7 +102,7 @@ protected function parseArguments(Token $token)
      * @param Token $token
      * @return bool
      */
-    public function decideBlockEnd(Token $token)
+    public function decideBlockEnd(Token $token): bool
     {
         return $token->test('endstyle');
     }
@@ -96,7 +112,7 @@ public function decideBlockEnd(Token $token)
      *
      * @return string The tag name
      */
-    public function getTag()
+    public function getTag(): string
     {
         return 'style';
     }
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserSwitch.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserSwitch.php
index 7bd3ba99f6..c63fe95651 100644
--- a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserSwitch.php
+++ b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserSwitch.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  * @origin     https://gist.github.com/maxgalbu/9409182
  */
@@ -31,7 +31,9 @@
 class TwigTokenParserSwitch extends AbstractTokenParser
 {
     /**
-     * {@inheritdoc}
+     * @param Token $token
+     * @return TwigNodeSwitch
+     * @throws SyntaxError
      */
     public function parse(Token $token)
     {
@@ -72,7 +74,7 @@ public function parse(Token $token)
                     }
 
                     $stream->expect(Token::BLOCK_END_TYPE);
-                    $body = $this->parser->subparse(array($this, 'decideIfFork'));
+                    $body = $this->parser->subparse([$this, 'decideIfFork']);
                     $cases[] = new Node([
                         'values' => new Node($values),
                         'body' => $body
@@ -81,7 +83,7 @@ public function parse(Token $token)
 
                 case 'default':
                     $stream->expect(Token::BLOCK_END_TYPE);
-                    $default = $this->parser->subparse(array($this, 'decideIfEnd'));
+                    $default = $this->parser->subparse([$this, 'decideIfEnd']);
                     break;
 
                 case 'endswitch':
@@ -104,9 +106,9 @@ public function parse(Token $token)
      * @param Token $token
      * @return bool
      */
-    public function decideIfFork(Token $token)
+    public function decideIfFork(Token $token): bool
     {
-        return $token->test(array('case', 'default', 'endswitch'));
+        return $token->test(['case', 'default', 'endswitch']);
     }
 
     /**
@@ -115,15 +117,15 @@ public function decideIfFork(Token $token)
      * @param Token $token
      * @return bool
      */
-    public function decideIfEnd(Token $token)
+    public function decideIfEnd(Token $token): bool
     {
-        return $token->test(array('endswitch'));
+        return $token->test(['endswitch']);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getTag()
+    public function getTag(): string
     {
         return 'switch';
     }
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserThrow.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserThrow.php
index c0d6de943f..41f415d2a4 100644
--- a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserThrow.php
+++ b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserThrow.php
@@ -3,13 +3,14 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig\TokenParser;
 
 use Grav\Common\Twig\Node\TwigNodeThrow;
+use Twig\Error\SyntaxError;
 use Twig\Node\Node;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
@@ -26,9 +27,9 @@ class TwigTokenParserThrow extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token A Twig_Token instance
-     *
-     * @return Node A Twig_Node instance
+     * @param Token $token
+     * @return TwigNodeThrow
+     * @throws SyntaxError
      */
     public function parse(Token $token)
     {
@@ -39,7 +40,7 @@ public function parse(Token $token)
         $message = $this->parser->getExpressionParser()->parseExpression();
         $stream->expect(Token::BLOCK_END_TYPE);
 
-        return new TwigNodeThrow($code, $message, $lineno, $this->getTag());
+        return new TwigNodeThrow((int)$code, $message, $lineno, $this->getTag());
     }
 
     /**
@@ -47,7 +48,7 @@ public function parse(Token $token)
      *
      * @return string The tag name
      */
-    public function getTag()
+    public function getTag(): string
     {
         return 'throw';
     }
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserTryCatch.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserTryCatch.php
index 95adef394b..9930632836 100644
--- a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserTryCatch.php
+++ b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserTryCatch.php
@@ -3,13 +3,14 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig\TokenParser;
 
 use Grav\Common\Twig\Node\TwigNodeTryCatch;
+use Twig\Error\SyntaxError;
 use Twig\Node\Node;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
@@ -30,9 +31,9 @@ class TwigTokenParserTryCatch extends AbstractTokenParser
     /**
      * Parses a token and returns a node.
      *
-     * @param Token $token A Twig_Token instance
-     *
-     * @return Node A Twig_Node instance
+     * @param Token $token
+     * @return TwigNodeTryCatch
+     * @throws SyntaxError
      */
     public function parse(Token $token)
     {
@@ -50,14 +51,22 @@ public function parse(Token $token)
         return new TwigNodeTryCatch($try, $catch, $lineno, $this->getTag());
     }
 
-    public function decideCatch(Token $token)
+    /**
+     * @param Token $token
+     * @return bool
+     */
+    public function decideCatch(Token $token): bool
     {
-        return $token->test(array('catch'));
+        return $token->test(['catch']);
     }
 
-    public function decideEnd(Token $token)
+    /**
+     * @param Token $token
+     * @return bool
+     */
+    public function decideEnd(Token $token): bool
     {
-        return $token->test(array('endtry')) || $token->test(array('endcatch'));
+        return $token->test(['endtry']) || $token->test(['endcatch']);
     }
 
     /**
@@ -65,7 +74,7 @@ public function decideEnd(Token $token)
      *
      * @return string The tag name
      */
-    public function getTag()
+    public function getTag(): string
     {
         return 'try';
     }
diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
index 5c9008fb92..39ae3c6f6c 100644
--- a/system/src/Grav/Common/Twig/Twig.php
+++ b/system/src/Grav/Common/Twig/Twig.php
@@ -3,61 +3,70 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig;
 
+use Grav\Common\Debugger;
 use Grav\Common\Grav;
 use Grav\Common\Config\Config;
 use Grav\Common\Language\Language;
 use Grav\Common\Language\LanguageCodes;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Page\Pages;
+use Grav\Common\Twig\Exception\TwigException;
+use Grav\Common\Twig\Extension\FilesystemExtension;
+use Grav\Common\Twig\Extension\GravExtension;
+use Grav\Common\Utils;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 use RocketTheme\Toolbox\Event\Event;
-use Phive\Twig\Extensions\Deferred\DeferredExtension;
+use RuntimeException;
+use Twig\Cache\FilesystemCache;
+use Twig\DeferredExtension\DeferredExtension;
+use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Error\RuntimeError;
+use Twig\Extension\CoreExtension;
+use Twig\Extension\DebugExtension;
+use Twig\Extension\StringLoaderExtension;
+use Twig\Loader\ArrayLoader;
+use Twig\Loader\ChainLoader;
+use Twig\Loader\ExistsLoaderInterface;
+use Twig\Loader\FilesystemLoader;
+use Twig\Profiler\Profile;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
+use function function_exists;
+use function in_array;
+use function is_array;
 
+/**
+ * Class Twig
+ * @package Grav\Common\Twig
+ */
 class Twig
 {
-    /**
-     * @var \Twig_Environment
-     */
+    /** @var Environment */
     public $twig;
-
-    /**
-     * @var array
-     */
+    /** @var array */
     public $twig_vars = [];
-
-    /**
-     * @var array
-     */
+    /** @var array */
     public $twig_paths;
-
-    /**
-     * @var string
-     */
+    /** @var string */
     public $template;
 
-    /**
-     * @var Grav
-     */
+    /** @var Grav */
     protected $grav;
-
-    /**
-     * @var \Twig_Loader_Filesystem
-     */
+    /** @var FilesystemLoader */
     protected $loader;
-
-    /**
-     * @var \Twig_Loader_Array
-     */
+    /** @var ArrayLoader */
     protected $loaderArray;
-
-
+    /** @var bool */
     protected $autoescape;
+    /** @var Profile */
+    protected $profile;
 
     /**
      * Constructor
@@ -73,6 +82,8 @@ public function __construct(Grav $grav)
     /**
      * Twig initialization that sets the twig loader chain, then the environment, then extensions
      * and also the base set of twig vars
+     *
+     * @return $this
      */
     public function init()
     {
@@ -88,7 +99,7 @@ public function init()
 
             // handle language templates if available
             if ($language->enabled()) {
-                $lang_templates = $locator->findResource('theme://templates/' . ($active_language ? $active_language : $language->getDefault()));
+                $lang_templates = $locator->findResource('theme://templates/' . ($active_language ?: $language->getDefault()));
                 if ($lang_templates) {
                     $this->twig_paths[] = $lang_templates;
                 }
@@ -102,7 +113,7 @@ public function init()
             $core_templates = array_merge($locator->findResources('system://templates'), $locator->findResources('system://templates/testing'));
             $this->twig_paths = array_merge($this->twig_paths, $core_templates);
 
-            $this->loader = new \Twig_Loader_Filesystem($this->twig_paths);
+            $this->loader = new FilesystemLoader($this->twig_paths);
 
             // Register all other prefixes as namespaces in twig
             foreach ($locator->getPaths('theme') as $prefix => $_) {
@@ -114,7 +125,7 @@ public function init()
 
                 // handle language templates if available
                 if ($language->enabled()) {
-                    $lang_templates = $locator->findResource('theme://'.$prefix.'templates/' . ($active_language ? $active_language : $language->getDefault()));
+                    $lang_templates = $locator->findResource('theme://'.$prefix.'templates/' . ($active_language ?: $language->getDefault()));
                     if ($lang_templates) {
                         $twig_paths[] = $lang_templates;
                     }
@@ -128,16 +139,16 @@ public function init()
 
             $this->grav->fireEvent('onTwigLoader');
 
-            $this->loaderArray = new \Twig_Loader_Array([]);
-            $loader_chain = new \Twig_Loader_Chain([$this->loaderArray, $this->loader]);
+            $this->loaderArray = new ArrayLoader([]);
+            $loader_chain = new ChainLoader([$this->loaderArray, $this->loader]);
 
             $params = $config->get('system.twig');
             if (!empty($params['cache'])) {
                 $cachePath = $locator->findResource('cache://twig', true, true);
-                $params['cache'] = new \Twig_Cache_Filesystem($cachePath, \Twig_Cache_Filesystem::FORCE_BYTECODE_INVALIDATION);
+                $params['cache'] = new FilesystemCache($cachePath, FilesystemCache::FORCE_BYTECODE_INVALIDATION);
             }
 
-            if (!$config->get('system.strict_mode.twig_compat', true)) {
+            if (!$config->get('system.strict_mode.twig_compat', false)) {
                 // Force autoescape on for all files if in strict mode.
                 $params['autoescape'] = 'html';
             } elseif (!empty($this->autoescape)) {
@@ -150,42 +161,74 @@ public function init()
 
             $this->twig = new TwigEnvironment($loader_chain, $params);
 
-            if ($config->get('system.twig.undefined_functions')) {
-                $this->twig->registerUndefinedFunctionCallback(function ($name) {
+            $this->twig->registerUndefinedFunctionCallback(function (string $name) use ($config) {
+                $allowed = $config->get('system.twig.safe_functions');
+                if (is_array($allowed) && in_array($name, $allowed, true) && function_exists($name)) {
+                    return new TwigFunction($name, $name);
+                }
+                if ($config->get('system.twig.undefined_functions')) {
                     if (function_exists($name)) {
-                        return new \Twig_SimpleFunction($name, $name);
+                        if (!Utils::isDangerousFunction($name)) {
+                            user_error("PHP function {$name}() was used as Twig function. This is deprecated in Grav 1.7. Please add it to system configuration: `system.twig.safe_functions`", E_USER_DEPRECATED);
+
+                            return new TwigFunction($name, $name);
+                        }
+
+                        /** @var Debugger $debugger */
+                        $debugger = $this->grav['debugger'];
+                        $debugger->addException(new RuntimeException("Blocked potentially dangerous PHP function {$name}() being used as Twig function. If you really want to use it, please add it to system configuration: `system.twig.safe_functions`"));
                     }
 
-                    return new \Twig_SimpleFunction($name, function () {
-                    });
-                });
-            }
+                    return new TwigFunction($name, static function () {});
+                }
+
+                return false;
+            });
 
-            if ($config->get('system.twig.undefined_filters')) {
-                $this->twig->registerUndefinedFilterCallback(function ($name) {
+            $this->twig->registerUndefinedFilterCallback(function (string $name) use ($config) {
+                $allowed = $config->get('system.twig.safe_filters');
+                if (is_array($allowed) && in_array($name, $allowed, true) && function_exists($name)) {
+                    return new TwigFilter($name, $name);
+                }
+                if ($config->get('system.twig.undefined_filters')) {
                     if (function_exists($name)) {
-                        return new \Twig_SimpleFilter($name, $name);
+                        if (!Utils::isDangerousFunction($name)) {
+                            user_error("PHP function {$name}() used as Twig filter. This is deprecated in Grav 1.7. Please add it to system configuration: `system.twig.safe_filters`", E_USER_DEPRECATED);
+
+                            return new TwigFilter($name, $name);
+                        }
+
+                        /** @var Debugger $debugger */
+                        $debugger = $this->grav['debugger'];
+                        $debugger->addException(new RuntimeException("Blocked potentially dangerous PHP function {$name}() being used as Twig filter. If you really want to use it, please add it to system configuration: `system.twig.safe_filters`"));
                     }
 
-                    return new \Twig_SimpleFilter($name, function () {
-                    });
-                });
-            }
+                    return new TwigFilter($name, static function () {});
+                }
+
+                return false;
+            });
 
             $this->grav->fireEvent('onTwigInitialized');
 
             // set default date format if set in config
             if ($config->get('system.pages.dateformat.long')) {
-                /** @var \Twig_Extension_Core $extension */
-                $extension = $this->twig->getExtension('Twig_Extension_Core');
+                /** @var CoreExtension $extension */
+                $extension = $this->twig->getExtension(CoreExtension::class);
                 $extension->setDateFormat($config->get('system.pages.dateformat.long'));
             }
             // enable the debug extension if required
             if ($config->get('system.twig.debug')) {
-                $this->twig->addExtension(new \Twig_Extension_Debug());
+                $this->twig->addExtension(new DebugExtension());
             }
-            $this->twig->addExtension(new TwigExtension());
+            $this->twig->addExtension(new GravExtension());
+            $this->twig->addExtension(new FilesystemExtension());
             $this->twig->addExtension(new DeferredExtension());
+            $this->twig->addExtension(new StringLoaderExtension());
+
+            /** @var Debugger $debugger */
+            $debugger = $this->grav['debugger'];
+            $debugger->addTwigProfiler($this->twig);
 
             $this->grav->fireEvent('onTwigExtensions');
 
@@ -202,7 +245,7 @@ public function init()
                     'assets'            => $this->grav['assets'],
                     'taxonomy'          => $this->grav['taxonomy'],
                     'browser'           => $this->grav['browser'],
-                    'base_dir'          => rtrim(ROOT_DIR, '/'),
+                    'base_dir'          => GRAV_ROOT,
                     'home_url'          => $pages->homeUrl($active_language),
                     'base_url'          => $pages->baseUrl($active_language),
                     'base_url_absolute' => $pages->baseUrl($active_language, true),
@@ -219,7 +262,7 @@ public function init()
     }
 
     /**
-     * @return \Twig_Environment
+     * @return Environment
      */
     public function twig()
     {
@@ -227,13 +270,22 @@ public function twig()
     }
 
     /**
-     * @return \Twig_Loader_Filesystem
+     * @return FilesystemLoader
      */
     public function loader()
     {
         return $this->loader;
     }
 
+    /**
+     * @return Profile
+     */
+    public function profile()
+    {
+        return $this->profile;
+    }
+
+
     /**
      * Adds or overrides a template.
      *
@@ -251,10 +303,9 @@ public function setTemplate($name, $template)
      * 2) Renders individual page items for twig processing before the site rendering
      *
      * @param  PageInterface   $item    The page item to render
-     * @param  string $content Optional content override
+     * @param  string|null $content Optional content override
      *
      * @return string          The rendered output
-     * @throws \Twig_Error_Loader
      */
     public function processPage(PageInterface $item, $content = null)
     {
@@ -267,17 +318,14 @@ public function processPage(PageInterface $item, $content = null)
         $twig_vars['page'] = $item;
         $twig_vars['media'] = $item->media();
         $twig_vars['header'] = $item->header();
-
         $local_twig = clone $this->twig;
 
         $output = '';
+
         try {
-            // Process Modular Twig
-            if ($item->modularTwig()) {
+            if ($item->isModule()) {
                 $twig_vars['content'] = $content;
-                $extension = $item->templateFormat();
-                $extension = $extension ? ".{$extension}.twig" : TEMPLATE_EXT;
-                $template = $item->template() . $extension;
+                $template = $this->getPageTwigTemplate($item);
                 $output = $content = $local_twig->render($template, $twig_vars);
             }
 
@@ -288,8 +336,8 @@ public function processPage(PageInterface $item, $content = null)
                 $output = $local_twig->render($name, $twig_vars);
             }
 
-        } catch (\Twig_Error_Loader $e) {
-            throw new \RuntimeException($e->getRawMessage(), 404, $e);
+        } catch (LoaderError $e) {
+            throw new RuntimeException($e->getRawMessage(), 400, $e);
         }
 
         return $output;
@@ -312,12 +360,11 @@ public function processTemplate($template, $vars = [])
 
         try {
             $output = $this->twig->render($template, $vars);
-        } catch (\Twig_Error_Loader $e) {
-            throw new \RuntimeException($e->getRawMessage(), 404, $e);
+        } catch (LoaderError $e) {
+            throw new RuntimeException($e->getRawMessage(), 404, $e);
         }
 
         return $output;
-
     }
 
 
@@ -341,8 +388,8 @@ public function processString($string, array $vars = [])
 
         try {
             $output = $this->twig->render($name, $vars);
-        } catch (\Twig_Error_Loader $e) {
-            throw new \RuntimeException($e->getRawMessage(), 404, $e);
+        } catch (LoaderError $e) {
+            throw new RuntimeException($e->getRawMessage(), 404, $e);
         }
 
         return $output;
@@ -352,62 +399,80 @@ public function processString($string, array $vars = [])
      * Twig process that renders the site layout. This is the main twig process that renders the overall
      * page and handles all the layout for the site display.
      *
-     * @param string $format Output format (defaults to HTML).
-     *
+     * @param string|null $format Output format (defaults to HTML).
+     * @param array $vars
      * @return string the rendered output
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function processSite($format = null, array $vars = [])
     {
-        // set the page now its been processed
-        $this->grav->fireEvent('onTwigSiteVariables');
-        $pages = $this->grav['pages'];
-        $page = $this->grav['page'];
-        $content = $page->content();
+        try {
+            $grav = $this->grav;
 
-        $twig_vars = $this->twig_vars;
+            // set the page now its been processed
+            $grav->fireEvent('onTwigSiteVariables');
 
-        $twig_vars['theme'] = $this->grav['config']->get('theme');
-        $twig_vars['pages'] = $pages->root();
-        $twig_vars['page'] = $page;
-        $twig_vars['header'] = $page->header();
-        $twig_vars['media'] = $page->media();
-        $twig_vars['content'] = $content;
-        $ext = '.' . ($format ?: 'html') . TWIG_EXT;
-
-        // determine if params are set, if so disable twig cache
-        $params = $this->grav['uri']->params(null, true);
-        if (!empty($params)) {
-            $this->twig->setCache(false);
-        }
+            /** @var Pages $pages */
+            $pages = $grav['pages'];
+
+            /** @var PageInterface $page */
+            $page = $grav['page'];
+
+            $twig_vars = $this->twig_vars;
+            $twig_vars['theme'] = $grav['config']->get('theme');
+            $twig_vars['pages'] = $pages->root();
+            $twig_vars['page'] = $page;
+            $twig_vars['header'] = $page->header();
+            $twig_vars['media'] = $page->media();
+            $twig_vars['content'] = $page->content();
+
+            // determine if params are set, if so disable twig cache
+            $params = $grav['uri']->params(null, true);
+            if (!empty($params)) {
+                $this->twig->setCache(false);
+            }
 
-        // Get Twig template layout
-        $template = $this->template($page->template() . $ext);
+            // Get Twig template layout
+            $template = $this->getPageTwigTemplate($page, $format);
+            $page->templateFormat($format);
 
-        try {
             $output = $this->twig->render($template, $vars + $twig_vars);
-        } catch (\Twig_Error_Loader $e) {
-            $error_msg = $e->getMessage();
-            // Try html version of this template if initial template was NOT html
-            if ($ext !== '.html' . TWIG_EXT) {
-                try {
-                    $page->templateFormat('html');
-                    $output = $this->twig->render($page->template() . '.html' . TWIG_EXT, $vars + $twig_vars);
-                } catch (\Twig_Error_Loader $e) {
-                    throw new \RuntimeException($error_msg, 400, $e);
+        } catch (LoaderError $e) {
+            throw new RuntimeException($e->getMessage(), 400, $e);
+        } catch (RuntimeError $e) {
+            $prev = $e->getPrevious();
+            if ($prev instanceof TwigException) {
+                $code = $prev->getCode() ?: 500;
+                // Fire onPageNotFound event.
+                $event = new Event([
+                    'page' => $page,
+                    'code' => $code,
+                    'message' => $prev->getMessage(),
+                    'exception' => $prev,
+                    'route' => $grav['route'],
+                    'request' => $grav['request']
+                ]);
+                $event = $grav->fireEvent("onDisplayErrorPage.{$code}", $event);
+                $newPage = $event['page'];
+                if ($newPage && $newPage !== $page) {
+                    unset($grav['page']);
+                    $grav['page'] = $newPage;
+
+                    return $this->processSite($newPage->templateFormat(), $vars);
                 }
-            } else {
-                throw new \RuntimeException($error_msg, 400, $e);
             }
+
+            throw $e;
         }
 
         return $output;
     }
 
     /**
-     * Wraps the Twig_Loader_Filesystem addPath method (should be used only in `onTwigLoader()` event
+     * Wraps the FilesystemLoader addPath method (should be used only in `onTwigLoader()` event
      * @param string $template_path
      * @param string $namespace
+     * @throws LoaderError
      */
     public function addPath($template_path, $namespace = '__main__')
     {
@@ -415,9 +480,10 @@ public function addPath($template_path, $namespace = '__main__')
     }
 
     /**
-     * Wraps the Twig_Loader_Filesystem prependPath method (should be used only in `onTwigLoader()` event
+     * Wraps the FilesystemLoader prependPath method (should be used only in `onTwigLoader()` event
      * @param string $template_path
      * @param string $namespace
+     * @throws LoaderError
      */
     public function prependPath($template_path, $namespace = '__main__')
     {
@@ -429,7 +495,6 @@ public function prependPath($template_path, $namespace = '__main__')
      * the one being passed in
      *
      * @param  string $template the template name
-     *
      * @return string           the template name
      */
     public function template($template)
@@ -437,10 +502,47 @@ public function template($template)
         return $this->template ?? $template;
     }
 
+    /**
+     * @param PageInterface $page
+     * @param string|null $format
+     * @return string
+     */
+    public function getPageTwigTemplate($page, &$format = null)
+    {
+        $template = $page->template();
+        $default = $page->isModule() ? 'modular/default' : 'default';
+        $extension = $format ?: $page->templateFormat();
+        $twig_extension = $extension ? '.'. $extension .TWIG_EXT : TEMPLATE_EXT;
+        $template_file = $this->template($page->template() . $twig_extension);
+
+        // TODO: no longer needed in Twig 3.
+        /** @var ExistsLoaderInterface $loader */
+        $loader = $this->twig->getLoader();
+        if ($loader->exists($template_file)) {
+            // template.xxx.twig
+            $page_template = $template_file;
+        } elseif ($twig_extension !== TEMPLATE_EXT && $loader->exists($template . TEMPLATE_EXT)) {
+            // template.html.twig
+            $page_template = $template . TEMPLATE_EXT;
+            $format = 'html';
+        } elseif ($loader->exists($default . $twig_extension)) {
+            // default.xxx.twig
+            $page_template = $default . $twig_extension;
+        } else {
+            // default.html.twig
+            $page_template = $default . TEMPLATE_EXT;
+            $format = 'html';
+        }
+
+        return $page_template;
+
+    }
+
     /**
      * Overrides the autoescape setting
      *
      * @param bool $state
+     * @return void
      * @deprecated 1.5 Auto-escape should always be turned on to protect against XSS issues (can be disabled per template file).
      */
     public function setAutoescape($state)
diff --git a/system/src/Grav/Common/Twig/TwigClockworkDataSource.php b/system/src/Grav/Common/Twig/TwigClockworkDataSource.php
new file mode 100644
index 0000000000..407a05ef4d
--- /dev/null
+++ b/system/src/Grav/Common/Twig/TwigClockworkDataSource.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @package    Grav\Common\Twig
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Twig;
+
+use Clockwork\DataSource\DataSource;
+use Clockwork\Request\Request;
+use Twig\Environment;
+use Twig\Extension\ProfilerExtension;
+use Twig\Profiler\Profile;
+
+/**
+ * Class TwigClockworkDataSource
+ * @package Grav\Common\Twig
+ */
+class TwigClockworkDataSource extends DataSource
+{
+    /** @var Environment */
+    protected $twig;
+
+    /** @var Profile */
+    protected $profile;
+
+    // Create a new data source, takes Twig instance as an argument
+    public function __construct(Environment $twig)
+    {
+        $this->twig = $twig;
+    }
+
+    /**
+     * Register the Twig profiler extension
+     */
+    public function listenToEvents(): void
+    {
+        $this->twig->addExtension(new ProfilerExtension($this->profile = new Profile()));
+    }
+
+    /**
+     * Adds rendered views to the request
+     *
+     * @param Request $request
+     * @return Request
+     */
+    public function resolve(Request $request)
+    {
+        $timeline = (new TwigClockworkDumper())->dump($this->profile);
+
+        $request->viewsData = array_merge($request->viewsData, $timeline->finalize());
+
+        return $request;
+    }
+}
diff --git a/system/src/Grav/Common/Twig/TwigClockworkDumper.php b/system/src/Grav/Common/Twig/TwigClockworkDumper.php
new file mode 100644
index 0000000000..c960cf2cdd
--- /dev/null
+++ b/system/src/Grav/Common/Twig/TwigClockworkDumper.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @package    Grav\Common\Twig
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Twig;
+
+use Clockwork\Request\Timeline\Timeline;
+use Twig\Profiler\Profile;
+
+/**
+ * Class TwigClockworkDumper
+ * @package Grav\Common\Twig
+ */
+class TwigClockworkDumper
+{
+    protected $lastId = 1;
+
+    /**
+     * Dumps a profile into a new rendered views timeline
+     *
+     * @param Profile $profile
+     * @return Timeline
+     */
+    public function dump(Profile $profile)
+    {
+        $timeline = new Timeline;
+
+        $this->dumpProfile($profile, $timeline);
+
+        return $timeline;
+    }
+
+    /**
+     * @param Profile $profile
+     * @param Timeline $timeline
+     * @param null $parent
+     */
+    public function dumpProfile(Profile $profile, Timeline $timeline, $parent = null)
+    {
+        $id = $this->lastId++;
+
+        if ($profile->isRoot()) {
+            $name = $profile->getName();
+        } elseif ($profile->isTemplate()) {
+            $name = $profile->getTemplate();
+        } else {
+            $name = $profile->getTemplate() . '::' . $profile->getType() . '(' . $profile->getName() . ')';
+        }
+
+        foreach ($profile as $p) {
+            $this->dumpProfile($p, $timeline, $id);
+        }
+
+        $data = $profile->__serialize();
+
+        $timeline->event($name, [
+            'name'  => $id,
+            'start' => $data[3]['wt'] ?? null,
+            'end'   => $data[4]['wt'] ?? null,
+            'data'  => [
+                'data'        => [],
+                'memoryUsage' => $data[4]['mu'] ?? null,
+                'parent'      => $parent
+            ]
+        ]);
+    }
+}
diff --git a/system/src/Grav/Common/Twig/TwigEnvironment.php b/system/src/Grav/Common/Twig/TwigEnvironment.php
index 54ef24f718..dba8846931 100644
--- a/system/src/Grav/Common/Twig/TwigEnvironment.php
+++ b/system/src/Grav/Common/Twig/TwigEnvironment.php
@@ -3,13 +3,58 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig;
 
-class TwigEnvironment extends \Twig_Environment
+use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Loader\ExistsLoaderInterface;
+use Twig\Loader\LoaderInterface;
+use Twig\Template;
+use Twig\TemplateWrapper;
+
+/**
+ * Class TwigEnvironment
+ * @package Grav\Common\Twig
+ */
+class TwigEnvironment extends Environment
 {
     use WriteCacheFileTrait;
+
+    /**
+     * @inheritDoc
+     */
+    public function resolveTemplate($names)
+    {
+        if (!\is_array($names)) {
+            $names = [$names];
+        }
+
+        $count = \count($names);
+        foreach ($names as $name) {
+            if ($name instanceof Template) {
+                return $name;
+            }
+            if ($name instanceof TemplateWrapper) {
+                return $name;
+            }
+
+            // Optimization: Avoid throwing an exception when it would be ignored anyway.
+            if (1 !== $count) {
+                /** @var LoaderInterface|ExistsLoaderInterface $loader */
+                $loader = $this->getLoader();
+                if (!$loader->exists($name)) {
+                    continue;
+                }
+            }
+
+            // Throws LoaderError: Unable to find template "%s".
+            return $this->loadTemplate($name);
+        }
+
+        throw new LoaderError(sprintf('Unable to find one of the following templates: "%s".', implode('", "', $names)));
+    }
 }
diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php
index f84923ebdf..07c442e8e9 100644
--- a/system/src/Grav/Common/Twig/TwigExtension.php
+++ b/system/src/Grav/Common/Twig/TwigExtension.php
@@ -3,1443 +3,19 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\Twig;
 
-use Cron\CronExpression;
-use Grav\Common\Config\Config;
-use Grav\Common\Debugger;
-use Grav\Common\Grav;
-use Grav\Common\Language\Language;
-use Grav\Common\Page\Collection;
-use Grav\Common\Page\Media;
-use Grav\Common\Scheduler\Cron;
-use Grav\Common\Security;
-use Grav\Common\Twig\TokenParser\TwigTokenParserRender;
-use Grav\Common\Twig\TokenParser\TwigTokenParserScript;
-use Grav\Common\Twig\TokenParser\TwigTokenParserStyle;
-use Grav\Common\Twig\TokenParser\TwigTokenParserSwitch;
-use Grav\Common\Twig\TokenParser\TwigTokenParserThrow;
-use Grav\Common\Twig\TokenParser\TwigTokenParserTryCatch;
-use Grav\Common\Twig\TokenParser\TwigTokenParserMarkdown;
-use Grav\Common\User\Interfaces\UserInterface;
-use Grav\Common\Utils;
-use Grav\Common\Yaml;
-use Grav\Common\Helpers\Base32;
-use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use Grav\Common\Twig\Extension\GravExtension;
 
-class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface
+/**
+ * Class TwigExtension
+ * @package Grav\Common\Twig
+ * @deprecated 1.7 Use GravExtension instead
+ */
+class TwigExtension extends GravExtension
 {
-    /** @var Grav */
-    protected $grav;
-
-    /** @var Debugger */
-    protected $debugger;
-
-    /** @var Config */
-    protected $config;
-
-    /**
-     * TwigExtension constructor.
-     */
-    public function __construct()
-    {
-        $this->grav     = Grav::instance();
-        $this->debugger = $this->grav['debugger'] ?? null;
-        $this->config   = $this->grav['config'];
-    }
-
-    /**
-     * Register some standard globals
-     *
-     * @return array
-     */
-    public function getGlobals()
-    {
-        return [
-            'grav' => $this->grav,
-        ];
-    }
-
-    /**
-     * Return a list of all filters.
-     *
-     * @return array
-     */
-    public function getFilters()
-    {
-        return [
-            new \Twig_SimpleFilter('*ize', [$this, 'inflectorFilter']),
-            new \Twig_SimpleFilter('absolute_url', [$this, 'absoluteUrlFilter']),
-            new \Twig_SimpleFilter('contains', [$this, 'containsFilter']),
-            new \Twig_SimpleFilter('chunk_split', [$this, 'chunkSplitFilter']),
-            new \Twig_SimpleFilter('nicenumber', [$this, 'niceNumberFunc']),
-            new \Twig_SimpleFilter('nicefilesize', [$this, 'niceFilesizeFunc']),
-            new \Twig_SimpleFilter('nicetime', [$this, 'nicetimeFunc']),
-            new \Twig_SimpleFilter('defined', [$this, 'definedDefaultFilter']),
-            new \Twig_SimpleFilter('ends_with', [$this, 'endsWithFilter']),
-            new \Twig_SimpleFilter('fieldName', [$this, 'fieldNameFilter']),
-            new \Twig_SimpleFilter('ksort', [$this, 'ksortFilter']),
-            new \Twig_SimpleFilter('ltrim', [$this, 'ltrimFilter']),
-            new \Twig_SimpleFilter('markdown', [$this, 'markdownFunction'], ['needs_context' => true, 'is_safe' => ['html']]),
-            new \Twig_SimpleFilter('md5', [$this, 'md5Filter']),
-            new \Twig_SimpleFilter('base32_encode', [$this, 'base32EncodeFilter']),
-            new \Twig_SimpleFilter('base32_decode', [$this, 'base32DecodeFilter']),
-            new \Twig_SimpleFilter('base64_encode', [$this, 'base64EncodeFilter']),
-            new \Twig_SimpleFilter('base64_decode', [$this, 'base64DecodeFilter']),
-            new \Twig_SimpleFilter('randomize', [$this, 'randomizeFilter']),
-            new \Twig_SimpleFilter('modulus', [$this, 'modulusFilter']),
-            new \Twig_SimpleFilter('rtrim', [$this, 'rtrimFilter']),
-            new \Twig_SimpleFilter('pad', [$this, 'padFilter']),
-            new \Twig_SimpleFilter('regex_replace', [$this, 'regexReplace']),
-            new \Twig_SimpleFilter('safe_email', [$this, 'safeEmailFilter']),
-            new \Twig_SimpleFilter('safe_truncate', ['\Grav\Common\Utils', 'safeTruncate']),
-            new \Twig_SimpleFilter('safe_truncate_html', ['\Grav\Common\Utils', 'safeTruncateHTML']),
-            new \Twig_SimpleFilter('sort_by_key', [$this, 'sortByKeyFilter']),
-            new \Twig_SimpleFilter('starts_with', [$this, 'startsWithFilter']),
-            new \Twig_SimpleFilter('truncate', ['\Grav\Common\Utils', 'truncate']),
-            new \Twig_SimpleFilter('truncate_html', ['\Grav\Common\Utils', 'truncateHTML']),
-            new \Twig_SimpleFilter('json_decode', [$this, 'jsonDecodeFilter']),
-            new \Twig_SimpleFilter('array_unique', 'array_unique'),
-            new \Twig_SimpleFilter('basename', 'basename'),
-            new \Twig_SimpleFilter('dirname', 'dirname'),
-            new \Twig_SimpleFilter('print_r', 'print_r'),
-            new \Twig_SimpleFilter('yaml_encode', [$this, 'yamlEncodeFilter']),
-            new \Twig_SimpleFilter('yaml_decode', [$this, 'yamlDecodeFilter']),
-            new \Twig_SimpleFilter('nicecron', [$this, 'niceCronFilter']),
-
-            // Translations
-            new \Twig_SimpleFilter('t', [$this, 'translate'], ['needs_environment' => true]),
-            new \Twig_SimpleFilter('tl', [$this, 'translateLanguage']),
-            new \Twig_SimpleFilter('ta', [$this, 'translateArray']),
-
-            // Casting values
-            new \Twig_SimpleFilter('string', [$this, 'stringFilter']),
-            new \Twig_SimpleFilter('int', [$this, 'intFilter'], ['is_safe' => ['all']]),
-            new \Twig_SimpleFilter('bool', [$this, 'boolFilter']),
-            new \Twig_SimpleFilter('float', [$this, 'floatFilter'], ['is_safe' => ['all']]),
-            new \Twig_SimpleFilter('array', [$this, 'arrayFilter']),
-
-            // Object Types
-            new \Twig_SimpleFilter('get_type', [$this, 'getTypeFunc']),
-            new \Twig_SimpleFilter('of_type', [$this, 'ofTypeFunc'])
-        ];
-    }
-
-    /**
-     * Return a list of all functions.
-     *
-     * @return array
-     */
-    public function getFunctions()
-    {
-        return [
-            new \Twig_SimpleFunction('array', [$this, 'arrayFilter']),
-            new \Twig_SimpleFunction('array_key_value', [$this, 'arrayKeyValueFunc']),
-            new \Twig_SimpleFunction('array_key_exists', 'array_key_exists'),
-            new \Twig_SimpleFunction('array_unique', 'array_unique'),
-            new \Twig_SimpleFunction('array_intersect', [$this, 'arrayIntersectFunc']),
-            new \Twig_SimpleFunction('authorize', [$this, 'authorize']),
-            new \Twig_SimpleFunction('debug', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
-            new \Twig_SimpleFunction('dump', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
-            new \Twig_SimpleFunction('vardump', [$this, 'vardumpFunc']),
-            new \Twig_SimpleFunction('print_r', 'print_r'),
-            new \Twig_SimpleFunction('http_response_code', 'http_response_code'),
-            new \Twig_SimpleFunction('evaluate', [$this, 'evaluateStringFunc'], ['needs_context' => true]),
-            new \Twig_SimpleFunction('evaluate_twig', [$this, 'evaluateTwigFunc'], ['needs_context' => true]),
-            new \Twig_SimpleFunction('gist', [$this, 'gistFunc']),
-            new \Twig_SimpleFunction('nonce_field', [$this, 'nonceFieldFunc']),
-            new \Twig_SimpleFunction('pathinfo', 'pathinfo'),
-            new \Twig_SimpleFunction('random_string', [$this, 'randomStringFunc']),
-            new \Twig_SimpleFunction('repeat', [$this, 'repeatFunc']),
-            new \Twig_SimpleFunction('regex_replace', [$this, 'regexReplace']),
-            new \Twig_SimpleFunction('regex_filter', [$this, 'regexFilter']),
-            new \Twig_SimpleFunction('string', [$this, 'stringFunc']),
-            new \Twig_SimpleFunction('url', [$this, 'urlFunc']),
-            new \Twig_SimpleFunction('json_decode', [$this, 'jsonDecodeFilter']),
-            new \Twig_SimpleFunction('get_cookie', [$this, 'getCookie']),
-            new \Twig_SimpleFunction('redirect_me', [$this, 'redirectFunc']),
-            new \Twig_SimpleFunction('range', [$this, 'rangeFunc']),
-            new \Twig_SimpleFunction('isajaxrequest', [$this, 'isAjaxFunc']),
-            new \Twig_SimpleFunction('exif', [$this, 'exifFunc']),
-            new \Twig_SimpleFunction('media_directory', [$this, 'mediaDirFunc']),
-            new \Twig_SimpleFunction('body_class', [$this, 'bodyClassFunc']),
-            new \Twig_SimpleFunction('theme_var', [$this, 'themeVarFunc']),
-            new \Twig_SimpleFunction('header_var', [$this, 'pageHeaderVarFunc']),
-            new \Twig_SimpleFunction('read_file', [$this, 'readFileFunc']),
-            new \Twig_SimpleFunction('nicenumber', [$this, 'niceNumberFunc']),
-            new \Twig_SimpleFunction('nicefilesize', [$this, 'niceFilesizeFunc']),
-            new \Twig_SimpleFunction('nicetime', [$this, 'nicetimeFunc']),
-            new \Twig_SimpleFunction('cron', [$this, 'cronFunc']),
-            new \Twig_SimpleFunction('xss', [$this, 'xssFunc']),
-
-
-            // Translations
-            new \Twig_SimpleFunction('t', [$this, 'translate'], ['needs_environment' => true]),
-            new \Twig_SimpleFunction('tl', [$this, 'translateLanguage']),
-            new \Twig_SimpleFunction('ta', [$this, 'translateArray']),
-
-            // Object Types
-            new \Twig_SimpleFunction('get_type', [$this, 'getTypeFunc']),
-            new \Twig_SimpleFunction('of_type', [$this, 'ofTypeFunc'])
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    public function getTokenParsers()
-    {
-        return [
-            new TwigTokenParserRender(),
-            new TwigTokenParserThrow(),
-            new TwigTokenParserTryCatch(),
-            new TwigTokenParserScript(),
-            new TwigTokenParserStyle(),
-            new TwigTokenParserMarkdown(),
-            new TwigTokenParserSwitch(),
-        ];
-    }
-
-    /**
-     * Filters field name by changing dot notation into array notation.
-     *
-     * @param  string $str
-     *
-     * @return string
-     */
-    public function fieldNameFilter($str)
-    {
-        $path = explode('.', rtrim($str, '.'));
-
-        return array_shift($path) . ($path ? '[' . implode('][', $path) . ']' : '');
-    }
-
-    /**
-     * Protects email address.
-     *
-     * @param  string $str
-     *
-     * @return string
-     */
-    public function safeEmailFilter($str)
-    {
-        $email   = '';
-        for ($i = 0, $len = strlen($str); $i < $len; $i++) {
-            $j = random_int(0, 1);
-
-            $email .= $j === 0 ? '&#' . ord($str[$i]) . ';' : $str[$i];
-        }
-
-        return str_replace('@', '&#64;', $email);
-    }
-
-    /**
-     * Returns array in a random order.
-     *
-     * @param  array $original
-     * @param  int   $offset Can be used to return only slice of the array.
-     *
-     * @return array
-     */
-    public function randomizeFilter($original, $offset = 0)
-    {
-        if (!\is_array($original)) {
-            return $original;
-        }
-
-        if ($original instanceof \Traversable) {
-            $original = iterator_to_array($original, false);
-        }
-
-        $sorted = [];
-        $random = array_slice($original, $offset);
-        shuffle($random);
-
-        $sizeOf = \count($original);
-        for ($x = 0; $x < $sizeOf; $x++) {
-            if ($x < $offset) {
-                $sorted[] = $original[$x];
-            } else {
-                $sorted[] = array_shift($random);
-            }
-        }
-
-        return $sorted;
-    }
-
-    /**
-     * Returns the modulus of an integer
-     *
-     * @param  string|int   $number
-     * @param  int          $divider
-     * @param  array        $items array of items to select from to return
-     *
-     * @return int
-     */
-    public function modulusFilter($number, $divider, $items = null)
-    {
-        if (\is_string($number)) {
-            $number = strlen($number);
-        }
-
-        $remainder = $number % $divider;
-
-        if (\is_array($items)) {
-            return $items[$remainder] ?? $items[0];
-        }
-
-        return $remainder;
-    }
-
-    /**
-     * Inflector supports following notations:
-     *
-     * `{{ 'person'|pluralize }} => people`
-     * `{{ 'shoes'|singularize }} => shoe`
-     * `{{ 'welcome page'|titleize }} => "Welcome Page"`
-     * `{{ 'send_email'|camelize }} => SendEmail`
-     * `{{ 'CamelCased'|underscorize }} => camel_cased`
-     * `{{ 'Something Text'|hyphenize }} => something-text`
-     * `{{ 'something_text_to_read'|humanize }} => "Something text to read"`
-     * `{{ '181'|monthize }} => 5`
-     * `{{ '10'|ordinalize }} => 10th`
-     *
-     * @param string $action
-     * @param string $data
-     * @param int    $count
-     *
-     * @return string
-     */
-    public function inflectorFilter($action, $data, $count = null)
-    {
-        $action .= 'ize';
-
-        $inflector = $this->grav['inflector'];
-
-        if (\in_array(
-            $action,
-            ['titleize', 'camelize', 'underscorize', 'hyphenize', 'humanize', 'ordinalize', 'monthize'],
-            true
-        )) {
-            return $inflector->{$action}($data);
-        }
-
-        if (\in_array($action, ['pluralize', 'singularize'], true)) {
-            return $count ? $inflector->{$action}($data, $count) : $inflector->{$action}($data);
-        }
-
-        return $data;
-    }
-
-    /**
-     * Return MD5 hash from the input.
-     *
-     * @param  string $str
-     *
-     * @return string
-     */
-    public function md5Filter($str)
-    {
-        return md5($str);
-    }
-
-    /**
-     * Return Base32 encoded string
-     *
-     * @param string $str
-     * @return string
-     */
-    public function base32EncodeFilter($str)
-    {
-        return Base32::encode($str);
-    }
-
-    /**
-     * Return Base32 decoded string
-     *
-     * @param string $str
-     * @return bool|string
-     */
-    public function base32DecodeFilter($str)
-    {
-        return Base32::decode($str);
-    }
-
-    /**
-     * Return Base64 encoded string
-     *
-     * @param string $str
-     * @return string
-     */
-    public function base64EncodeFilter($str)
-    {
-        return base64_encode($str);
-    }
-
-    /**
-     * Return Base64 decoded string
-     *
-     * @param string $str
-     * @return bool|string
-     */
-    public function base64DecodeFilter($str)
-    {
-        return base64_decode($str);
-    }
-
-
-    /**
-     * Sorts a collection by key
-     *
-     * @param  array    $input
-     * @param  string   $filter
-     * @param  int      $direction
-     * @param  int      $sort_flags
-     *
-     * @return array
-     */
-    public function sortByKeyFilter($input, $filter, $direction = SORT_ASC, $sort_flags = SORT_REGULAR)
-    {
-        return Utils::sortArrayByKey($input, $filter, $direction, $sort_flags);
-    }
-
-    /**
-     * Return ksorted collection.
-     *
-     * @param  array $array
-     *
-     * @return array
-     */
-    public function ksortFilter($array)
-    {
-        if (null === $array) {
-            $array = [];
-        }
-        ksort($array);
-
-        return $array;
-    }
-
-    /**
-     * Wrapper for chunk_split() function
-     *
-     * @param string $value
-     * @param int $chars
-     * @param string $split
-     * @return string
-     */
-    public function chunkSplitFilter($value, $chars, $split = '-')
-    {
-        return chunk_split($value, $chars, $split);
-    }
-
-    /**
-     * determine if a string contains another
-     *
-     * @param string $haystack
-     * @param string $needle
-     *
-     * @return bool
-     */
-    public function containsFilter($haystack, $needle)
-    {
-        if (empty($needle)) {
-            return $haystack;
-        }
-
-        return (strpos($haystack, (string) $needle) !== false);
-    }
-
-    /**
-     * Gets a human readable output for cron syntax
-     *
-     * @param $at
-     * @return string
-     */
-    public function niceCronFilter($at)
-    {
-        $cron = new Cron($at);
-        return $cron->getText('en');
-    }
-
-    /**
-     * Get Cron object for a crontab 'at' format
-     *
-     * @param string $at
-     * @return CronExpression
-     */
-    public function cronFunc($at)
-    {
-        return CronExpression::factory($at);
-    }
-
-    /**
-     * displays a facebook style 'time ago' formatted date/time
-     *
-     * @param string $date
-     * @param bool $long_strings
-     *
-     * @param bool $show_tense
-     * @return bool
-     */
-    public function nicetimeFunc($date, $long_strings = true, $show_tense = true)
-    {
-        if (empty($date)) {
-            return $this->grav['language']->translate('GRAV.NICETIME.NO_DATE_PROVIDED', null, true);
-        }
-
-        if ($long_strings) {
-            $periods = [
-                'NICETIME.SECOND',
-                'NICETIME.MINUTE',
-                'NICETIME.HOUR',
-                'NICETIME.DAY',
-                'NICETIME.WEEK',
-                'NICETIME.MONTH',
-                'NICETIME.YEAR',
-                'NICETIME.DECADE'
-            ];
-        } else {
-            $periods = [
-                'NICETIME.SEC',
-                'NICETIME.MIN',
-                'NICETIME.HR',
-                'NICETIME.DAY',
-                'NICETIME.WK',
-                'NICETIME.MO',
-                'NICETIME.YR',
-                'NICETIME.DEC'
-            ];
-        }
-
-        $lengths = ['60', '60', '24', '7', '4.35', '12', '10'];
-
-        $now = time();
-
-        // check if unix timestamp
-        if ((string)(int)$date === (string)$date) {
-            $unix_date = $date;
-        } else {
-            $unix_date = strtotime($date);
-        }
-
-        // check validity of date
-        if (empty($unix_date)) {
-            return $this->grav['language']->translate('GRAV.NICETIME.BAD_DATE', null, true);
-        }
-
-        // is it future date or past date
-        if ($now > $unix_date) {
-            $difference = $now - $unix_date;
-            $tense      = $this->grav['language']->translate('GRAV.NICETIME.AGO', null, true);
-
-        } elseif ($now == $unix_date) {
-            $difference = $now - $unix_date;
-            $tense      = $this->grav['language']->translate('GRAV.NICETIME.JUST_NOW', null, false);
-
-        } else {
-            $difference = $unix_date - $now;
-            $tense      = $this->grav['language']->translate('GRAV.NICETIME.FROM_NOW', null, true);
-        }
-
-        for ($j = 0; $difference >= $lengths[$j] && $j < count($lengths) - 1; $j++) {
-            $difference /= $lengths[$j];
-        }
-
-        $difference = round($difference);
-
-        if ($difference != 1) {
-            $periods[$j] .= '_PLURAL';
-        }
-
-        if ($this->grav['language']->getTranslation($this->grav['language']->getLanguage(),
-            $periods[$j] . '_MORE_THAN_TWO')
-        ) {
-            if ($difference > 2) {
-                $periods[$j] .= '_MORE_THAN_TWO';
-            }
-        }
-
-        $periods[$j] = $this->grav['language']->translate('GRAV.'.$periods[$j], null, true);
-
-        if ($now == $unix_date) {
-            return $tense;
-        }
-
-        $time = "{$difference} {$periods[$j]}";
-        $time .= $show_tense ? " {$tense}" : '';
-
-        return $time;
-    }
-
-    /**
-     * Allow quick check of a string for XSS Vulnerabilities
-     *
-     * @param string|array $data
-     * @return bool|string|array
-     */
-    public function xssFunc($data)
-    {
-        if (!\is_array($data)) {
-            return Security::detectXss($data);
-        }
-
-        $results = Security::detectXssFromArray($data);
-        $results_parts = array_map(function($value, $key) {
-            return $key.': \''.$value . '\'';
-        }, array_values($results), array_keys($results));
-
-        return implode(', ', $results_parts);
-    }
-
-    /**
-     * @param string $string
-     *
-     * @return mixed
-     */
-    public function absoluteUrlFilter($string)
-    {
-        $url    = $this->grav['uri']->base();
-        $string = preg_replace('/((?:href|src) *= *[\'"](?!(http|ftp)))/i', "$1$url", $string);
-
-        return $string;
-
-    }
-
-    /**
-     * @param string $string
-     *
-     * @param array $context
-     * @param bool $block  Block or Line processing
-     * @return mixed|string
-     */
-    public function markdownFunction($context, $string, $block = true)
-    {
-        $page = $context['page'] ?? null;
-        return Utils::processMarkdown($string, $block, $page);
-    }
-
-    /**
-     * @param string $haystack
-     * @param string $needle
-     *
-     * @return bool
-     */
-    public function startsWithFilter($haystack, $needle)
-    {
-        return Utils::startsWith($haystack, $needle);
-    }
-
-    /**
-     * @param string $haystack
-     * @param string $needle
-     *
-     * @return bool
-     */
-    public function endsWithFilter($haystack, $needle)
-    {
-        return Utils::endsWith($haystack, $needle);
-    }
-
-    /**
-     * @param mixed $value
-     * @param null $default
-     *
-     * @return null
-     */
-    public function definedDefaultFilter($value, $default = null)
-    {
-        return null !== $value ? $value : $default;
-        }
-
-    /**
-     * @param string $value
-     * @param null $chars
-     *
-     * @return string
-     */
-    public function rtrimFilter($value, $chars = null)
-    {
-        return rtrim($value, $chars);
-    }
-
-    /**
-     * @param string $value
-     * @param null $chars
-     *
-     * @return string
-     */
-    public function ltrimFilter($value, $chars = null)
-    {
-        return ltrim($value, $chars);
-    }
-
-    /**
-     * Casts input to string.
-     *
-     * @param mixed $input
-     * @return string
-     */
-    public function stringFilter($input)
-    {
-        return (string) $input;
-    }
-
-
-    /**
-     * Casts input to int.
-     *
-     * @param mixed $input
-     * @return int
-     */
-    public function intFilter($input)
-    {
-        return (int) $input;
-    }
-
-    /**
-     * Casts input to bool.
-     *
-     * @param mixed $input
-     * @return bool
-     */
-    public function boolFilter($input)
-    {
-        return (bool) $input;
-    }
-
-    /**
-     * Casts input to float.
-     *
-     * @param mixed $input
-     * @return float
-     */
-    public function floatFilter($input)
-    {
-        return (float) $input;
-    }
-
-    /**
-     * Casts input to array.
-     *
-     * @param mixed $input
-     * @return array
-     */
-    public function arrayFilter($input)
-    {
-        return (array) $input;
-    }
-
-    /**
-     * @return string
-     */
-    public function translate(\Twig_Environment $twig)
-    {
-        // shift off the environment
-        $args = func_get_args();
-        array_shift($args);
-
-        // If admin and tu filter provided, use it
-        if (isset($this->grav['admin'])) {
-            $numargs = count($args);
-            $lang = null;
-
-            if (($numargs === 3 && is_array($args[1])) || ($numargs === 2 && !is_array($args[1]))) {
-                $lang = array_pop($args);
-            } elseif ($numargs === 2 && is_array($args[1])) {
-                $subs = array_pop($args);
-                $args = array_merge($args, $subs);
-            }
-
-            return $this->grav['admin']->translate($args, $lang);
-        }
-
-        // else use the default grav translate functionality
-        return $this->grav['language']->translate($args);
-    }
-
-    /**
-     * Translate Strings
-     *
-     * @param string|array $args
-     * @param array|null $languages
-     * @param bool $array_support
-     * @param bool $html_out
-     * @return string
-     */
-    public function translateLanguage($args, array $languages = null, $array_support = false, $html_out = false)
-    {
-        /** @var Language $language */
-        $language = $this->grav['language'];
-
-        return $language->translate($args, $languages, $array_support, $html_out);
-    }
-
-    /**
-     * @param string $key
-     * @param string $index
-     * @param array|null $lang
-     * @return string
-     */
-    public function translateArray($key, $index, $lang = null)
-    {
-        /** @var Language $language */
-        $language = $this->grav['language'];
-
-        return $language->translateArray($key, $index, $lang);
-    }
-
-    /**
-     * Repeat given string x times.
-     *
-     * @param  string $input
-     * @param  int    $multiplier
-     *
-     * @return string
-     */
-    public function repeatFunc($input, $multiplier)
-    {
-        return str_repeat($input, $multiplier);
-    }
-
-    /**
-     * Return URL to the resource.
-     *
-     * @example {{ url('theme://images/logo.png')|default('http://www.placehold.it/150x100/f4f4f4') }}
-     *
-     * @param  string $input  Resource to be located.
-     * @param  bool   $domain True to include domain name.
-     *
-     * @return string|null      Returns url to the resource or null if resource was not found.
-     */
-    public function urlFunc($input, $domain = false)
-    {
-        return Utils::url($input, $domain);
-        }
-
-    /**
-     * This function will evaluate Twig $twig through the $environment, and return its results.
-     *
-     * @param array $context
-     * @param string $twig
-     * @return mixed
-     */
-    public function evaluateTwigFunc($context, $twig ) {
-
-        $loader = new \Twig_Loader_Filesystem('.');
-        $env = new \Twig_Environment($loader);
-
-        $template = $env->createTemplate($twig);
-
-        return $template->render($context);
-    }
-
-    /**
-     * This function will evaluate a $string through the $environment, and return its results.
-     *
-     * @param array $context
-     * @param string $string
-     * @return mixed
-     */
-    public function evaluateStringFunc($context, $string )
-    {
-        return $this->evaluateTwigFunc($context, "{{ $string }}");
-    }
-
-
-    /**
-     * Based on Twig_Extension_Debug / twig_var_dump
-     * (c) 2011 Fabien Potencier
-     *
-     * @param \Twig_Environment $env
-     * @param string $context
-     */
-    public function dump(\Twig_Environment $env, $context)
-    {
-        if (!$env->isDebug() || !$this->debugger) {
-            return;
-        }
-
-        $count = func_num_args();
-        if (2 === $count) {
-            $data = [];
-            foreach ($context as $key => $value) {
-                if (is_object($value)) {
-                    if (method_exists($value, 'toArray')) {
-                        $data[$key] = $value->toArray();
-                    } else {
-                        $data[$key] = "Object (" . get_class($value) . ")";
-                    }
-                } else {
-                    $data[$key] = $value;
-                }
-            }
-            $this->debugger->addMessage($data, 'debug');
-        } else {
-            for ($i = 2; $i < $count; $i++) {
-                $this->debugger->addMessage(func_get_arg($i), 'debug');
-            }
-        }
-    }
-
-    /**
-     * Output a Gist
-     *
-     * @param  string $id
-     * @param  string|bool $file
-     *
-     * @return string
-     */
-    public function gistFunc($id, $file = false)
-    {
-        $url = 'https://gist.github.com/' . $id . '.js';
-        if ($file) {
-            $url .= '?file=' . $file;
-        }
-        return '<script src="' . $url . '"></script>';
-    }
-
-    /**
-     * Generate a random string
-     *
-     * @param int $count
-     *
-     * @return string
-     */
-    public function randomStringFunc($count = 5)
-    {
-        return Utils::generateRandomString($count);
-    }
-
-    /**
-     * Pad a string to a certain length with another string
-     *
-     * @param string $input
-     * @param int    $pad_length
-     * @param string $pad_string
-     * @param int    $pad_type
-     *
-     * @return string
-     */
-    public static function padFilter($input, $pad_length, $pad_string = ' ', $pad_type = STR_PAD_RIGHT)
-    {
-        return str_pad($input, (int)$pad_length, $pad_string, $pad_type);
-    }
-
-    /**
-     * Workaround for twig associative array initialization
-     * Returns a key => val array
-     *
-     * @param string $key           key of item
-     * @param string $val           value of item
-     * @param array  $current_array optional array to add to
-     *
-     * @return array
-     */
-    public function arrayKeyValueFunc($key, $val, $current_array = null)
-    {
-        if (empty($current_array)) {
-            return array($key => $val);
-        }
-
-        $current_array[$key] = $val;
-
-        return $current_array;
-    }
-
-    /**
-     * Wrapper for array_intersect() method
-     *
-     * @param array $array1
-     * @param array $array2
-     * @return array
-     */
-    public function arrayIntersectFunc($array1, $array2)
-    {
-        if ($array1 instanceof Collection && $array2 instanceof Collection) {
-            return $array1->intersect($array2);
-        }
-
-        return array_intersect($array1, $array2);
-    }
-
-    /**
-     * Returns a string from a value. If the value is array, return it json encoded
-     *
-     * @param array|string $value
-     *
-     * @return string
-     */
-    public function stringFunc($value)
-    {
-        if (is_array($value)) { //format the array as a string
-            return json_encode($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Translate a string
-     *
-     * @return string
-     */
-    public function translateFunc()
-    {
-        return $this->grav['language']->translate(func_get_args());
-    }
-
-    /**
-     * Authorize an action. Returns true if the user is logged in and
-     * has the right to execute $action.
-     *
-     * @param  string|array $action An action or a list of actions. Each
-     *                              entry can be a string like 'group.action'
-     *                              or without dot notation an associative
-     *                              array.
-     * @return bool                 Returns TRUE if the user is authorized to
-     *                              perform the action, FALSE otherwise.
-     */
-    public function authorize($action)
-    {
-        /** @var UserInterface|null $user */
-        $user = $this->grav['user'] ?? null;
-
-        if (!$user || !$user->authenticated || (isset($user->authorized) && !$user->authorized)) {
-            return false;
-        }
-
-        $action = (array) $action;
-        foreach ($action as $key => $perms) {
-            $prefix = is_int($key) ? '' : $key . '.';
-            $perms = $prefix ? (array) $perms : [$perms => true];
-            foreach ($perms as $action2 => $authenticated) {
-                if ($user->authorize($prefix . $action2)) {
-                    return $authenticated;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Used to add a nonce to a form. Call {{ nonce_field('action') }} specifying a string representing the action.
-     *
-     * For maximum protection, ensure that the string representing the action is as specific as possible
-     *
-     * @param string $action         the action
-     * @param string $nonceParamName a custom nonce param name
-     *
-     * @return string the nonce input field
-     */
-    public function nonceFieldFunc($action, $nonceParamName = 'nonce')
-    {
-        $string = '<input type="hidden" name="' . $nonceParamName . '" value="' . Utils::getNonce($action) . '" />';
-
-        return $string;
-    }
-
-    /**
-     * Decodes string from JSON.
-     *
-     * @param  string  $str
-     * @param  bool  $assoc
-     * @param  int $depth
-     * @param  int $options
-     * @return array
-     */
-    public function jsonDecodeFilter($str, $assoc = false, $depth = 512, $options = 0)
-    {
-        return json_decode(html_entity_decode($str), $assoc, $depth, $options);
-    }
-
-    /**
-     * Used to retrieve a cookie value
-     *
-     * @param string $key     The cookie name to retrieve
-     *
-     * @return mixed
-     */
-    public function getCookie($key)
-    {
-        return filter_input(INPUT_COOKIE, $key, FILTER_SANITIZE_STRING);
-    }
-
-    /**
-     * Twig wrapper for PHP's preg_replace method
-     *
-     * @param mixed $subject the content to perform the replacement on
-     * @param mixed $pattern the regex pattern to use for matches
-     * @param mixed $replace the replacement value either as a string or an array of replacements
-     * @param int   $limit   the maximum possible replacements for each pattern in each subject
-     *
-     * @return string|string[]|null the resulting content
-     */
-    public function regexReplace($subject, $pattern, $replace, $limit = -1)
-    {
-        return preg_replace($pattern, $replace, $subject, $limit);
-    }
-
-    /**
-     * Twig wrapper for PHP's preg_grep method
-     *
-     * @param array $array
-     * @param string $regex
-     * @param int $flags
-     * @return array
-     */
-    public function regexFilter($array, $regex, $flags = 0)
-    {
-        return preg_grep($regex, $array, $flags);
-    }
-
-    /**
-     * redirect browser from twig
-     *
-     * @param string $url          the url to redirect to
-     * @param int $statusCode      statusCode, default 303
-     */
-    public function redirectFunc($url, $statusCode = 303)
-    {
-        header('Location: ' . $url, true, $statusCode);
-        exit();
-    }
-
-    /**
-     * Generates an array containing a range of elements, optionally stepped
-     *
-     * @param int $start      Minimum number, default 0
-     * @param int $end        Maximum number, default `getrandmax()`
-     * @param int $step       Increment between elements in the sequence, default 1
-     *
-     * @return array
-     */
-    public function rangeFunc($start = 0, $end = 100, $step = 1)
-    {
-        return range($start, $end, $step);
-    }
-
-    /**
-     * Check if HTTP_X_REQUESTED_WITH has been set to xmlhttprequest,
-     * in which case we may unsafely assume ajax. Non critical use only.
-     *
-     * @return bool True if HTTP_X_REQUESTED_WITH exists and has been set to xmlhttprequest
-     */
-    public function isAjaxFunc()
-    {
-        return (
-            !empty($_SERVER['HTTP_X_REQUESTED_WITH'])
-            && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest');
-    }
-
-    /**
-     * Get the Exif data for a file
-     *
-     * @param string $image
-     * @param bool $raw
-     * @return mixed
-     */
-    public function exifFunc($image, $raw = false)
-    {
-        if (isset($this->grav['exif'])) {
-            /** @var UniformResourceLocator $locator */
-            $locator = $this->grav['locator'];
-
-            if ($locator->isStream($image)) {
-                $image = $locator->findResource($image);
-            }
-
-            $exif_reader = $this->grav['exif']->getReader();
-
-            if ($image && file_exists($image) && $this->config->get('system.media.auto_metadata_exif') && $exif_reader) {
-
-                $exif_data = $exif_reader->read($image);
-
-                if ($exif_data) {
-                    if ($raw) {
-                        return $exif_data->getRawData();
-                    }
-
-                    return $exif_data->getData();
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Simple function to read a file based on a filepath and output it
-     *
-     * @param string $filepath
-     * @return bool|string
-     */
-    public function readFileFunc($filepath)
-    {
-        /** @var UniformResourceLocator $locator */
-        $locator = $this->grav['locator'];
-
-        if ($locator->isStream($filepath)) {
-            $filepath = $locator->findResource($filepath);
-        }
-
-        if ($filepath && file_exists($filepath)) {
-            return file_get_contents($filepath);
-        }
-
-        return false;
-    }
-
-    /**
-     * Process a folder as Media and return a media object
-     *
-     * @param string $media_dir
-     * @return Media|null
-     */
-    public function mediaDirFunc($media_dir)
-    {
-        /** @var UniformResourceLocator $locator */
-        $locator = $this->grav['locator'];
-
-        if ($locator->isStream($media_dir)) {
-            $media_dir = $locator->findResource($media_dir);
-        }
-
-        if ($media_dir && file_exists($media_dir)) {
-            return new Media($media_dir);
-        }
-
-        return null;
-    }
-
-    /**
-     * Dump a variable to the browser
-     *
-     * @param mixed $var
-     */
-    public function vardumpFunc($var)
-    {
-        var_dump($var);
-    }
-
-    /**
-     * Returns a nicer more readable filesize based on bytes
-     *
-     * @param int $bytes
-     * @return string
-     */
-    public function niceFilesizeFunc($bytes)
-    {
-        return Utils::prettySize($bytes);
-    }
-
-    /**
-     * Returns a nicer more readable number
-     *
-     * @param int|float|string $n
-     * @return string|bool
-     */
-    public function niceNumberFunc($n)
-    {
-        if (!\is_float($n) && !\is_int($n)) {
-            if (!\is_string($n) || $n === '') {
-                return false;
-            }
-
-            // Strip any thousand formatting and find the first number.
-            $list = array_filter(preg_split("/\D+/", str_replace(',', '', $n)));
-            $n = reset($list);
-
-            if (!\is_numeric($n)) {
-                return false;
-            }
-
-            $n = (float)$n;
-        }
-
-        // now filter it;
-        if ($n > 1000000000000) {
-            return round($n/1000000000000, 2).' t';
-        }
-        if ($n > 1000000000) {
-            return round($n/1000000000, 2).' b';
-        }
-        if ($n > 1000000) {
-            return round($n/1000000, 2).' m';
-        }
-        if ($n > 1000) {
-            return round($n/1000, 2).' k';
-        }
-
-        return number_format($n);
-    }
-
-    /**
-     * Get a theme variable
-     *
-     * @param string $var
-     * @param bool $default
-     * @return string
-     */
-    public function themeVarFunc($var, $default = null)
-    {
-        $header = $this->grav['page']->header();
-        $header_classes = $header->{$var} ?? null;
-
-        return $header_classes ?: $this->config->get('theme.' . $var, $default);
-    }
-
-    /**
-     * takes an array of classes, and if they are not set on body_classes
-     * look to see if they are set in theme config
-     *
-     * @param string|string[] $classes
-     * @return string
-     */
-    public function bodyClassFunc($classes)
-    {
-
-        $header = $this->grav['page']->header();
-        $body_classes = $header->body_classes ?? '';
-
-        foreach ((array)$classes as $class) {
-            if (!empty($body_classes) && Utils::contains($body_classes, $class)) {
-                continue;
-            }
-
-            $val = $this->config->get('theme.' . $class, false) ? $class : false;
-            $body_classes .= $val ? ' ' . $val : '';
-        }
-
-        return $body_classes;
-    }
-
-    /**
-     * Look for a page header variable in an array of pages working its way through until a value is found
-     *
-     * @param string $var
-     * @param string|string[]|null $pages
-     * @return mixed
-     */
-    public function pageHeaderVarFunc($var, $pages = null)
-    {
-        if ($pages === null) {
-            $pages = $this->grav['page'];
-        }
-
-        // Make sure pages are an array
-        if (!\is_array($pages)) {
-            $pages = [$pages];
-        }
-
-        // Loop over pages and look for header vars
-        foreach ($pages as $page) {
-            if (\is_string($page)) {
-                $page = $this->grav['pages']->find($page);
-            }
-
-            if ($page) {
-                $header = $page->header();
-                if (isset($header->{$var})) {
-                    return $header->{$var};
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Dump/Encode data into YAML format
-     *
-     * @param array $data
-     * @param int $inline integer number of levels of inline syntax
-     * @return string
-     */
-    public function yamlEncodeFilter($data, $inline = 10)
-    {
-        return Yaml::dump($data, $inline);
-    }
-
-    /**
-     * Decode/Parse data from YAML format
-     *
-     * @param string $data
-     * @return array
-     */
-    public function yamlDecodeFilter($data)
-    {
-        return Yaml::parse($data);
-    }
-
-    /**
-     * Function/Filter to return the type of variable
-     *
-     * @param mixed $var
-     * @return string
-     */
-    public function getTypeFunc($var)
-    {
-        return gettype($var);
-    }
-
-    /**
-     * Function/Filter to test type of variable
-     *
-     * @param mixed $var
-     * @param string|null $typeTest
-     * @param string|null $className
-     * @return bool
-     */
-    public function ofTypeFunc($var, $typeTest=null, $className=null)
-    {
-
-        switch ($typeTest)
-        {
-            default:
-                return false;
-                break;
-
-            case 'array':
-                return is_array($var);
-                break;
-
-            case 'bool':
-                return is_bool($var);
-                break;
-
-            case 'class':
-                return is_object($var) === true && get_class($var) === $className;
-                break;
-
-            case 'float':
-                return is_float($var);
-                break;
-
-            case 'int':
-                return is_int($var);
-                break;
-
-            case 'numeric':
-                return is_numeric($var);
-                break;
-
-            case 'object':
-                return is_object($var);
-                break;
-
-            case 'scalar':
-                return is_scalar($var);
-                break;
-
-            case 'string':
-                return is_string($var);
-                break;
-        }
-    }
 }
diff --git a/system/src/Grav/Common/Twig/WriteCacheFileTrait.php b/system/src/Grav/Common/Twig/WriteCacheFileTrait.php
index f87ff671ec..575a281630 100644
--- a/system/src/Grav/Common/Twig/WriteCacheFileTrait.php
+++ b/system/src/Grav/Common/Twig/WriteCacheFileTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\Twig
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,9 +11,15 @@
 
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
+use function dirname;
 
+/**
+ * Trait WriteCacheFileTrait
+ * @package Grav\Common\Twig
+ */
 trait WriteCacheFileTrait
 {
+    /** @var bool */
     protected static $umask;
 
     /**
@@ -22,6 +28,7 @@ trait WriteCacheFileTrait
      *
      * @param string $file
      * @param string $content
+     * @return void
      */
     protected function writeCacheFile($file, $content)
     {
diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index 16d7fb1669..76d9a9926b 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,58 +13,92 @@
 use Grav\Common\Language\Language;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Page\Pages;
+use Grav\Framework\Route\Route;
 use Grav\Framework\Route\RouteFactory;
 use Grav\Framework\Uri\UriFactory;
 use Grav\Framework\Uri\UriPartsFilter;
 use RocketTheme\Toolbox\Event\Event;
+use RuntimeException;
+use function array_key_exists;
+use function count;
+use function in_array;
+use function is_array;
+use function is_string;
+use function strlen;
 
+/**
+ * Class Uri
+ * @package Grav\Common
+ */
 class Uri
 {
     const HOSTNAME_REGEX = '/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/';
 
-    /** @var \Grav\Framework\Uri\Uri */
+    /** @var \Grav\Framework\Uri\Uri|null */
     protected static $currentUri;
 
-    /** @var \Grav\Framework\Route\Route */
+    /** @var Route|null */
     protected static $currentRoute;
 
+    /** @var string */
     public $url;
 
     // Uri parts.
+    /** @var string|null */
     protected $scheme;
+    /** @var string|null */
     protected $user;
+    /** @var string|null */
     protected $password;
+    /** @var string|null */
     protected $host;
+    /** @var int|null */
     protected $port;
+    /** @var string */
     protected $path;
+    /** @var string */
     protected $query;
+    /** @var string|null */
     protected $fragment;
 
     // Internal stuff.
+    /** @var string */
     protected $base;
+    /** @var string|null */
     protected $basename;
+    /** @var string */
     protected $content_path;
+    /** @var string|null */
     protected $extension;
+    /** @var string */
     protected $env;
+    /** @var array */
     protected $paths;
+    /** @var array */
     protected $queries;
+    /** @var array */
     protected $params;
+    /** @var string */
     protected $root;
+    /** @var string */
+    protected $setup_base;
+    /** @var string */
     protected $root_path;
+    /** @var string */
     protected $uri;
-    protected $content_type;
+    /** @var array */
     protected $post;
 
     /**
      * Uri constructor.
-     * @param string|array $env
+     * @param string|array|null $env
      */
     public function __construct($env = null)
     {
         if (is_string($env)) {
             $this->createFromString($env);
         } else {
-            $this->createFromEnvironment(\is_array($env) ? $env : $_SERVER);
+            $this->createFromEnvironment(is_array($env) ? $env : $_SERVER);
         }
     }
 
@@ -73,7 +107,6 @@ public function __construct($env = null)
      * Used for testing purposes.
      *
      * @param string $url the URL to use in the class
-     *
      * @return $this
      */
     public function initializeWithUrl($url = '')
@@ -90,7 +123,6 @@ public function initializeWithUrl($url = '')
      *
      * @param string $url
      * @param string $root_path
-     *
      * @return $this
      */
     public function initializeWithUrlAndRootPath($url, $root_path)
@@ -105,8 +137,7 @@ public function initializeWithUrlAndRootPath($url, $root_path)
      * Validate a hostname
      *
      * @param string $hostname The hostname
-     *
-     * @return boolean
+     * @return bool
      */
     public function validateHostname($hostname)
     {
@@ -115,6 +146,8 @@ public function validateHostname($hostname)
 
     /**
      * Initializes the URI object based on the url set on the object
+     *
+     * @return void
      */
     public function init()
     {
@@ -127,19 +160,25 @@ public function init()
         $language = $grav['language'];
 
         // add the port to the base for non-standard ports
-        if ($this->port !== null && $config->get('system.reverse_proxy_setup') === false) {
-            $this->base .= ':' . (string)$this->port;
+        if ($this->port && $config->get('system.reverse_proxy_setup') === false) {
+            $this->base .= ':' . $this->port;
         }
 
         // Handle custom base
-        $custom_base = rtrim($grav['config']->get('system.custom_base_url'), '/');
-
+        $custom_base = rtrim($grav['config']->get('system.custom_base_url', ''), '/');
         if ($custom_base) {
             $custom_parts = parse_url($custom_base);
+            if ($custom_parts === false) {
+                throw new RuntimeException('Bad configuration: system.custom_base_url');
+            }
             $orig_root_path = $this->root_path;
             $this->root_path = isset($custom_parts['path']) ? rtrim($custom_parts['path'], '/') : '';
             if (isset($custom_parts['scheme'])) {
                 $this->base = $custom_parts['scheme'] . '://' . $custom_parts['host'];
+                $this->port = $custom_parts['port'] ?? null;
+                if ($this->port && $config->get('system.reverse_proxy_setup') === false) {
+                    $this->base .= ':' . $this->port;
+                }
                 $this->root = $custom_base;
             } else {
                 $this->root = $this->base . $this->root_path;
@@ -151,13 +190,14 @@ public function init()
 
         $this->url = $this->base . $this->uri;
 
-        $uri = str_replace(static::filterPath($this->root), '', $this->url);
+        $uri = Utils::replaceFirstOccurrence(static::filterPath($this->root), '', $this->url);
 
         // remove the setup.php based base if set:
         $setup_base = $grav['pages']->base();
         if ($setup_base) {
             $uri = preg_replace('|^' . preg_quote($setup_base, '|') . '|', '', $uri);
         }
+        $this->setup_base = $setup_base;
 
         // process params
         $uri = $this->processParams($uri, $config->get('system.param_sep'));
@@ -165,8 +205,8 @@ public function init()
         // set active language
         $uri = $language->setActiveFromUri($uri);
 
-        // split the URL and params
-        $bits = parse_url($uri);
+        // split the URL and params (and make sure that the path isn't seen as domain)
+        $bits = parse_url('http://domain.com' . $uri);
 
         //process fragment
         if (isset($bits['fragment'])) {
@@ -177,7 +217,7 @@ public function init()
         $path = $bits['path'] ?? '/';
 
         // remove the extension if there is one set
-        $parts = pathinfo($path);
+        $parts = Utils::pathinfo($path);
 
         // set the original basename
         $this->basename = $parts['basename'];
@@ -195,7 +235,7 @@ public function init()
         // set the new url
         $this->url = $this->root . $path;
         $this->path = static::cleanPath($path);
-        $this->content_path = trim(str_replace($this->base, '', $this->path), '/');
+        $this->content_path = trim(Utils::replaceFirstOccurrence($this->base, '', $this->path), '/');
         if ($this->content_path !== '') {
             $this->paths = explode('/', $this->content_path);
         }
@@ -205,15 +245,15 @@ public function init()
         $grav['base_url_relative'] = $this->rootUrl(false);
         $grav['base_url'] = $config->get('system.absolute_urls') ? $grav['base_url_absolute'] : $grav['base_url_relative'];
 
-        RouteFactory::setRoot($this->root_path);
+        RouteFactory::setRoot($this->root_path . $setup_base);
         RouteFactory::setLanguage($language->getLanguageURLPrefix());
+        RouteFactory::setParamValueDelimiter($config->get('system.param_sep'));
     }
 
     /**
      * Return URI path.
      *
-     * @param string $id
-     *
+     * @param int|null $id
      * @return string|string[]
      */
     public function paths($id = null)
@@ -230,7 +270,6 @@ public function paths($id = null)
      *
      * @param bool $absolute True to include full path.
      * @param bool $domain True to include domain. Works only if first parameter is also true.
-     *
      * @return string
      */
     public function route($absolute = false, $domain = false)
@@ -241,7 +280,7 @@ public function route($absolute = false, $domain = false)
     /**
      * Return full query string or a single query attribute.
      *
-     * @param string $id Optional attribute. Get a single query attribute if set
+     * @param string|null $id Optional attribute. Get a single query attribute if set
      * @param bool $raw If true and $id is not set, return the full query array. Otherwise return the query string
      *
      * @return string|array Returns an array if $id = null and $raw = true
@@ -266,9 +305,8 @@ public function query($id = null, $raw = false)
     /**
      * Return all or a single query parameter as a URI compatible string.
      *
-     * @param string $id Optional parameter name.
+     * @param string|null $id Optional parameter name.
      * @param boolean $array return the array format or not
-     *
      * @return null|string|array
      */
     public function params($id = null, $array = false)
@@ -300,23 +338,22 @@ public function params($id = null, $array = false)
      * Get URI parameter.
      *
      * @param string $id
-     *
-     * @return bool|string
+     * @param string|false|null $default
+     * @return string|false|null
      */
-    public function param($id)
+    public function param($id, $default = false)
     {
         if (isset($this->params[$id])) {
-            return html_entity_decode(rawurldecode($this->params[$id]));
+            return html_entity_decode(rawurldecode($this->params[$id]), ENT_COMPAT | ENT_HTML401, 'UTF-8');
         }
 
-        return false;
+        return $default;
     }
 
     /**
      * Gets the Fragment portion of a URI (eg #target)
      *
-     * @param string $fragment
-     *
+     * @param string|null $fragment
      * @return string|null
      */
     public function fragment($fragment = null)
@@ -331,7 +368,6 @@ public function fragment($fragment = null)
      * Return URL.
      *
      * @param bool $include_host Include hostname.
-     *
      * @return string
      */
     public function url($include_host = false)
@@ -340,7 +376,7 @@ public function url($include_host = false)
             return $this->url;
         }
 
-        $url = str_replace($this->base, '', rtrim($this->url, '/'));
+        $url = Utils::replaceFirstOccurrence($this->base, '', rtrim($this->url, '/'));
 
         return $url ?: '/';
     }
@@ -348,7 +384,7 @@ public function url($include_host = false)
     /**
      * Return the Path
      *
-     * @return String The path of the URI
+     * @return string The path of the URI
      */
     public function path()
     {
@@ -359,8 +395,7 @@ public function path()
      * Return the Extension of the URI
      *
      * @param string|null $default
-     *
-     * @return string The extension of the URI
+     * @return string|null The extension of the URI
      */
     public function extension($default = null)
     {
@@ -371,12 +406,15 @@ public function extension($default = null)
         return $this->extension;
     }
 
+    /**
+     * @return string
+     */
     public function method()
     {
         $method = isset($_SERVER['REQUEST_METHOD']) ? strtoupper($_SERVER['REQUEST_METHOD']) : 'GET';
 
-        if ($method === 'POST' && isset($_SERVER['X-HTTP-METHOD-OVERRIDE'])) {
-            $method = strtoupper($_SERVER['X-HTTP-METHOD-OVERRIDE']);
+        if ($method === 'POST' && isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+            $method = strtoupper($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']);
         }
 
         return $method;
@@ -385,7 +423,7 @@ public function method()
     /**
      * Return the scheme of the URI
      *
-     * @param bool $raw
+     * @param bool|null $raw
      * @return string The scheme of the URI
      */
     public function scheme($raw = false)
@@ -424,8 +462,8 @@ public function host()
     public function port($raw = false)
     {
         $port = $this->port;
-        // If not in raw mode and port is not set, figure it out from scheme.
-        if (!$raw && $port === null) {
+        // If not in raw mode and port is not set or is 0, figure it out from scheme.
+        if (!$raw && !$port) {
             if ($this->scheme === 'http') {
                 $this->port = 80;
             } elseif ($this->scheme === 'https') {
@@ -433,7 +471,7 @@ public function port($raw = false)
             }
         }
 
-        return $this->port;
+        return $this->port ?: null;
     }
 
     /**
@@ -459,7 +497,7 @@ public function password()
     /**
      * Gets the environment name
      *
-     * @return String
+     * @return string
      */
     public function environment()
     {
@@ -470,7 +508,7 @@ public function environment()
     /**
      * Return the basename of the URI
      *
-     * @return String The basename of the URI
+     * @return string The basename of the URI
      */
     public function basename()
     {
@@ -481,7 +519,7 @@ public function basename()
      * Return the full uri
      *
      * @param bool $include_root
-     * @return mixed
+     * @return string
      */
     public function uri($include_root = true)
     {
@@ -489,13 +527,13 @@ public function uri($include_root = true)
             return $this->uri;
         }
 
-        return str_replace($this->root_path, '', $this->uri);
+        return Utils::replaceFirstOccurrence($this->root_path, '', $this->uri);
     }
 
     /**
      * Return the base of the URI
      *
-     * @return String The base of the URI
+     * @return string The base of the URI
      */
     public function base()
     {
@@ -506,7 +544,7 @@ public function base()
      * Return the base relative URL including the language prefix
      * or the base relative url if multi-language is not enabled
      *
-     * @return String The base of the URI
+     * @return string The base of the URI
      */
     public function baseIncludingLanguage()
     {
@@ -522,8 +560,7 @@ public function baseIncludingLanguage()
      * Return root URL to the site.
      *
      * @param bool $include_host Include hostname.
-     *
-     * @return mixed
+     * @return string
      */
     public function rootUrl($include_host = false)
     {
@@ -531,7 +568,7 @@ public function rootUrl($include_host = false)
             return $this->root;
         }
 
-        return str_replace($this->base, '', $this->root);
+        return Utils::replaceFirstOccurrence($this->base, '', $this->root);
     }
 
     /**
@@ -541,52 +578,69 @@ public function rootUrl($include_host = false)
      */
     public function currentPage()
     {
-        return $this->params['page'] ?? 1;
+        $page = (int)($this->params['page'] ?? 1);
+
+        return max(1, $page);
     }
 
     /**
      * Return relative path to the referrer defaulting to current or given page.
      *
-     * @param string $default
-     * @param string $attributes
+     * You should set the third parameter to `true` for redirects as long as you came from the same sub-site and language.
      *
+     * @param string|null $default
+     * @param string|null $attributes
+     * @param bool $withoutBaseRoute
      * @return string
      */
-    public function referrer($default = null, $attributes = null)
+    public function referrer($default = null, $attributes = null, bool $withoutBaseRoute = false)
     {
         $referrer = $_SERVER['HTTP_REFERER'] ?? null;
 
         // Check that referrer came from our site.
-        $root = $this->rootUrl(true);
-        if ($referrer) {
-            // Referrer should always have host set and it should come from the same base address.
-            if (stripos($referrer, $root) !== 0) {
-                $referrer = null;
-            }
+        if ($withoutBaseRoute) {
+            /** @var Pages $pages */
+            $pages = Grav::instance()['pages'];
+            $base = $pages->baseUrl(null, true);
+        } else {
+            $base = $this->rootUrl(true);
         }
 
-        if (!$referrer) {
+        // Referrer should always have host set and it should come from the same base address.
+        if (!is_string($referrer) || !str_starts_with($referrer, $base)) {
             $referrer = $default ?: $this->route(true, true);
         }
 
+        // Relative path from grav root.
+        $referrer = substr($referrer, strlen($base));
         if ($attributes) {
             $referrer .= $attributes;
         }
 
-        // Return relative path.
-        return substr($referrer, strlen($root));
+        return $referrer;
     }
 
+    /**
+     * @return string
+     */
+    #[\ReturnTypeWillChange]
     public function __toString()
     {
         return static::buildUrl($this->toArray());
     }
 
+    /**
+     * @return string
+     */
     public function toOriginalString()
     {
         return static::buildUrl($this->toArray(true));
     }
 
+    /**
+     * @param bool $full
+     * @return array
+     */
     public function toArray($full = false)
     {
         if ($full === true) {
@@ -600,7 +654,7 @@ public function toArray($full = false)
         return [
             'scheme'    => $this->scheme,
             'host'      => $this->host,
-            'port'      => $this->port,
+            'port'      => $this->port ?: null,
             'user'      => $this->user,
             'pass'      => $this->password,
             'path'      => $path,
@@ -617,7 +671,7 @@ public function toArray($full = false)
      */
     public static function paramsRegex()
     {
-        return '/\/([^\:\#\/\?]*' . Grav::instance()['config']->get('system.param_sep') . '[^\:\#\/\?]*)/';
+        return '/\/{1,}([^\:\#\/\?]*' . Grav::instance()['config']->get('system.param_sep') . '[^\:\#\/\?]*)/';
     }
 
     /**
@@ -627,20 +681,23 @@ public static function paramsRegex()
      */
     public static function ip()
     {
+        $ip = 'UNKNOWN';
+
         if (getenv('HTTP_CLIENT_IP')) {
             $ip = getenv('HTTP_CLIENT_IP');
-        } elseif (getenv('HTTP_X_FORWARDED_FOR')) {
-            $ip = getenv('HTTP_X_FORWARDED_FOR');
-        } elseif (getenv('HTTP_X_FORWARDED')) {
+        } elseif (getenv('HTTP_CF_CONNECTING_IP')) {
+            $ip = getenv('HTTP_CF_CONNECTING_IP');
+        } elseif (getenv('HTTP_X_FORWARDED_FOR') && Grav::instance()['config']->get('system.http_x_forwarded.ip')) {
+            $ips = array_map('trim', explode(',', getenv('HTTP_X_FORWARDED_FOR')));
+            $ip = array_shift($ips);
+        } elseif (getenv('HTTP_X_FORWARDED') && Grav::instance()['config']->get('system.http_x_forwarded.ip')) {
             $ip = getenv('HTTP_X_FORWARDED');
         } elseif (getenv('HTTP_FORWARDED_FOR')) {
             $ip = getenv('HTTP_FORWARDED_FOR');
         } elseif (getenv('HTTP_FORWARDED')) {
             $ip = getenv('HTTP_FORWARDED');
-        } elseif (getenv('REMOTE_ADDR')){
+        } elseif (getenv('REMOTE_ADDR')) {
             $ip = getenv('REMOTE_ADDR');
-        } else {
-            $ip = 'UNKNOWN';
         }
 
         return $ip;
@@ -663,13 +720,15 @@ public static function getCurrentUri()
     /**
      * Returns current route.
      *
-     * @return \Grav\Framework\Route\Route
+     * @return Route
      */
     public static function getCurrentRoute()
     {
         if (!static::$currentRoute) {
+            /** @var Uri $uri */
             $uri = Grav::instance()['uri'];
-            static::$currentRoute = RouteFactory::createFromParts($uri->toArray());
+
+            static::$currentRoute = RouteFactory::createFromLegacyUri($uri);
         }
 
         return static::$currentRoute;
@@ -679,8 +738,7 @@ public static function getCurrentRoute()
      * Is this an external URL? if it starts with `http` then yes, else false
      *
      * @param  string $url the URL in question
-     *
-     * @return boolean      is eternal state
+     * @return bool      is eternal state
      */
     public static function isExternal($url)
     {
@@ -691,7 +749,6 @@ public static function isExternal($url)
      * The opposite of built-in PHP method parse_url()
      *
      * @param array $parsed_url
-     *
      * @return string
      */
     public static function buildUrl($parsed_url)
@@ -771,7 +828,6 @@ public static function convertUrl(PageInterface $page, $url, $type = 'link', $ab
         } elseif ($url_path === '/' || ($base_url !== '' && Utils::startsWith($url_path, $base_url))) {
             $url_path = $base_url . $url_path;
         } else {
-
             // see if page is relative to this or absolute
             if (Utils::startsWith($url_path, '/')) {
                 $normalized_url = Utils::normalizePath($base_url . $url_path);
@@ -783,7 +839,7 @@ public static function convertUrl(PageInterface $page, $url, $type = 'link', $ab
             }
 
             // special check to see if path checking is required.
-            $just_path = str_replace($normalized_url, '', $normalized_path);
+            $just_path = Utils::replaceFirstOccurrence($normalized_url, '', $normalized_path);
             if ($normalized_url === '/' || $just_path === $page->path()) {
                 $url_path = $normalized_url;
             } else {
@@ -798,7 +854,7 @@ public static function convertUrl(PageInterface $page, $url, $type = 'link', $ab
                 }
 
                 if ($full_path) {
-                    $path_info = pathinfo($full_path);
+                    $path_info = Utils::pathinfo($full_path);
                     $page_path = $path_info['dirname'];
                     $filename = '';
 
@@ -833,8 +889,7 @@ public static function convertUrl(PageInterface $page, $url, $type = 'link', $ab
         }
 
         // handle absolute URLs
-        if (\is_array($url) && !$external && ($absolute === true || $grav['config']->get('system.absolute_urls', false))) {
-
+        if (is_array($url) && !$external && ($absolute === true || $grav['config']->get('system.absolute_urls', false))) {
             $url['scheme'] = $uri->scheme(true);
             $url['host'] = $uri->host();
             $url['port'] = $uri->port(true);
@@ -844,7 +899,7 @@ public static function convertUrl(PageInterface $page, $url, $type = 'link', $ab
             $routes = $pages->routes();
 
             // if this is an image, get the proper path
-            $url_bits = pathinfo($url_path);
+            $url_bits = Utils::pathinfo($url_path);
             if (isset($url_bits['extension'])) {
                 $target_path = $url_bits['dirname'];
             } else {
@@ -852,7 +907,7 @@ public static function convertUrl(PageInterface $page, $url, $type = 'link', $ab
             }
 
             // strip base from this path
-            $target_path = str_replace($uri->rootUrl(), '', $target_path);
+            $target_path = Utils::replaceFirstOccurrence($uri->rootUrl(), '', $target_path);
 
             // set to / if root
             if (empty($target_path)) {
@@ -877,7 +932,7 @@ public static function convertUrl(PageInterface $page, $url, $type = 'link', $ab
 
         // Handle route only
         if ($route_only) {
-            $url_path = str_replace(static::filterPath($base_url), '', $url_path);
+            $url_path = Utils::replaceFirstOccurrence(static::filterPath($base_url), '', $url_path);
         }
 
         // transform back to string/array as needed
@@ -890,13 +945,24 @@ public static function convertUrl(PageInterface $page, $url, $type = 'link', $ab
         return $url;
     }
 
+    /**
+     * @param string $url
+     * @return array|false
+     */
     public static function parseUrl($url)
     {
         $grav = Grav::instance();
 
+        // Remove extra slash from streams, parse_url() doesn't like it.
+        if ($pos = strpos($url, ':///')) {
+            $url = substr_replace($url, '://', $pos, 4);
+        }
+
         $encodedUrl = preg_replace_callback(
             '%[^:/@?&=#]+%usD',
-            function ($matches) { return rawurlencode($matches[0]); },
+            static function ($matches) {
+                return rawurlencode($matches[0]);
+            },
             $url
         );
 
@@ -906,7 +972,7 @@ function ($matches) { return rawurlencode($matches[0]); },
             return false;
         }
 
-        foreach($parts as $name => $value) {
+        foreach ($parts as $name => $value) {
             $parts[$name] = rawurldecode($value);
         }
 
@@ -914,7 +980,7 @@ function ($matches) { return rawurlencode($matches[0]); },
             $parts['path'] = '';
         }
 
-        list($stripped_path, $params) = static::extractParams($parts['path'], $grav['config']->get('system.param_sep'));
+        [$stripped_path, $params] = static::extractParams($parts['path'], $grav['config']->get('system.param_sep'));
 
         if (!empty($params)) {
             $parts['path'] = $stripped_path;
@@ -924,6 +990,11 @@ function ($matches) { return rawurlencode($matches[0]); },
         return $parts;
     }
 
+    /**
+     * @param string $uri
+     * @param string $delimiter
+     * @return array
+     */
     public static function extractParams($uri, $delimiter)
     {
         $params = [];
@@ -933,7 +1004,7 @@ public static function extractParams($uri, $delimiter)
 
             foreach ($matches as $match) {
                 $param = explode($delimiter, $match[1]);
-                if (\count($param) === 2) {
+                if (count($param) === 2) {
                     $plain_var = filter_var(rawurldecode($param[1]), FILTER_SANITIZE_STRING);
                     $params[$param[0]] = $plain_var;
                     $uri = str_replace($match[0], '', $uri);
@@ -950,7 +1021,7 @@ public static function extractParams($uri, $delimiter)
      * @param PageInterface   $page         the current page to use as reference
      * @param string $markdown_url the URL as it was written in the markdown
      * @param string $type         the type of URL, image | link
-     * @param null   $relative     if null, will use system default, if true will use relative links internally
+     * @param bool|null $relative     if null, will use system default, if true will use relative links internally
      *
      * @return string the more friendly formatted url
      */
@@ -975,7 +1046,7 @@ public static function convertUrlOld(PageInterface $page, $markdown_url, $type =
         $base_url = rtrim($base . $grav['pages']->base(), '/') . $language_append;
 
         // if absolute and starts with a base_url move on
-        if (pathinfo($markdown_url, PATHINFO_DIRNAME) === '.' && $page->url() === '/') {
+        if (Utils::pathinfo($markdown_url, PATHINFO_DIRNAME) === '.' && $page->url() === '/') {
             return '/' . $markdown_url;
         }
         // no path to convert
@@ -998,7 +1069,7 @@ public static function convertUrlOld(PageInterface $page, $markdown_url, $type =
         }
 
         // special check to see if path checking is required.
-        $just_path = str_replace($normalized_url, '', $normalized_path);
+        $just_path = Utils::replaceFirstOccurrence($normalized_url, '', $normalized_path);
         if ($just_path === $page->path()) {
             return $normalized_url;
         }
@@ -1014,7 +1085,7 @@ public static function convertUrlOld(PageInterface $page, $markdown_url, $type =
             return $normalized_url;
         }
 
-        $path_info = pathinfo($full_path);
+        $path_info = Utils::pathinfo($full_path);
         $page_path = $path_info['dirname'];
         $filename = '';
 
@@ -1081,24 +1152,21 @@ public static function addNonce($url, $action, $nonceParamName = 'nonce')
     public static function isValidUrl($url)
     {
         $regex = '/^(?:(https?|ftp|telnet):)?\/\/((?:[a-z0-9@:.-]|%[0-9A-F]{2}){3,})(?::(\d+))?((?:\/(?:[a-z0-9-._~!$&\'\(\)\*\+\,\;\=\:\@]|%[0-9A-F]{2})*)*)(?:\?((?:[a-z0-9-._~!$&\'\(\)\*\+\,\;\=\:\/?@]|%[0-9A-F]{2})*))?(?:#((?:[a-z0-9-._~!$&\'\(\)\*\+\,\;\=\:\/?@]|%[0-9A-F]{2})*))?/';
-        if (preg_match($regex, $url)) {
-            return true;
-        }
 
-        return false;
+        return (bool)preg_match($regex, $url);
     }
 
     /**
      * Removes extra double slashes and fixes back-slashes
      *
      * @param string $path
-     * @return mixed|string
+     * @return string
      */
     public static function cleanPath($path)
     {
         $regex = '/(\/)\/+/';
         $path = str_replace(['\\', '/ /'], '/', $path);
-        $path = preg_replace($regex,'$1',$path);
+        $path = preg_replace($regex, '$1', $path);
 
         return $path;
     }
@@ -1106,7 +1174,7 @@ public static function cleanPath($path)
     /**
      * Filters the user info string.
      *
-     * @param string $info The raw user or password.
+     * @param string|null $info The raw user or password.
      * @return string The percent-encoded user or password string.
      */
     public static function filterUserInfo($info)
@@ -1122,7 +1190,7 @@ public static function filterUserInfo($info)
      * will NOT double-encode characters that are already
      * percent-encoded.
      *
-     * @param  string $path The raw uri path.
+     * @param  string|null $path The raw uri path.
      * @return string       The RFC 3986 percent-encoded uri path.
      * @link   http://www.faqs.org/rfcs/rfc3986.html
      */
@@ -1134,7 +1202,7 @@ public static function filterPath($path)
     /**
      * Filters the query string or fragment of a URI.
      *
-     * @param string $query The raw uri query string.
+     * @param string|null $query The raw uri query string.
      * @return string The percent-encoded query string.
      */
     public static function filterQuery($query)
@@ -1144,18 +1212,19 @@ public static function filterQuery($query)
 
     /**
      * @param array $env
+     * @return void
      */
     protected function createFromEnvironment(array $env)
     {
         // Build scheme.
-        if (isset($env['HTTP_X_FORWARDED_PROTO'])) {
+        if (isset($env['HTTP_X_FORWARDED_PROTO']) && Grav::instance()['config']->get('system.http_x_forwarded.protocol')) {
             $this->scheme = $env['HTTP_X_FORWARDED_PROTO'];
         } elseif (isset($env['X-FORWARDED-PROTO'])) {
             $this->scheme = $env['X-FORWARDED-PROTO'];
         } elseif (isset($env['HTTP_CLOUDFRONT_FORWARDED_PROTO'])) {
             $this->scheme = $env['HTTP_CLOUDFRONT_FORWARDED_PROTO'];
         } elseif (isset($env['REQUEST_SCHEME']) && empty($env['HTTPS'])) {
-           $this->scheme = $env['REQUEST_SCHEME'];
+            $this->scheme = $env['REQUEST_SCHEME'];
         } else {
             $https = $env['HTTPS'] ?? '';
             $this->scheme = (empty($https) || strtolower($https) === 'off') ? 'http' : 'https';
@@ -1166,11 +1235,14 @@ protected function createFromEnvironment(array $env)
         $this->password = $env['PHP_AUTH_PW'] ?? null;
 
         // Build host.
-        $hostname = 'localhost';
-        if (isset($env['HTTP_HOST'])) {
+        if (isset($env['HTTP_X_FORWARDED_HOST']) && Grav::instance()['config']->get('system.http_x_forwarded.host')) {
+            $hostname = $env['HTTP_X_FORWARDED_HOST'];
+        } else if (isset($env['HTTP_HOST'])) {
             $hostname = $env['HTTP_HOST'];
         } elseif (isset($env['SERVER_NAME'])) {
             $hostname = $env['SERVER_NAME'];
+        } else {
+            $hostname = 'localhost';
         }
         // Remove port from HTTP_HOST generated $hostname
         $hostname = Utils::substrToString($hostname, ':');
@@ -1178,21 +1250,21 @@ protected function createFromEnvironment(array $env)
         $this->host = $this->validateHostname($hostname) ? $hostname : 'unknown';
 
         // Build port.
-        if (isset($env['HTTP_X_FORWARDED_PORT'])) {
-           $this->port = (int)$env['HTTP_X_FORWARDED_PORT'];
+        if (isset($env['HTTP_X_FORWARDED_PORT']) && Grav::instance()['config']->get('system.http_x_forwarded.port')) {
+            $this->port = (int)$env['HTTP_X_FORWARDED_PORT'];
         } elseif (isset($env['X-FORWARDED-PORT'])) {
-           $this->port = (int)$env['X-FORWARDED-PORT'];
+            $this->port = (int)$env['X-FORWARDED-PORT'];
         } elseif (isset($env['HTTP_CLOUDFRONT_FORWARDED_PROTO'])) {
            // Since AWS Cloudfront does not provide a forwarded port header,
            // we have to build the port using the scheme.
-           $this->port = $this->port();
+            $this->port = $this->port();
         } elseif (isset($env['SERVER_PORT'])) {
-           $this->port = (int)$env['SERVER_PORT'];
+            $this->port = (int)$env['SERVER_PORT'];
         } else {
-           $this->port = null;
+            $this->port = null;
         }
 
-        if ($this->hasStandardPort()) {
+        if ($this->port === 0 || $this->hasStandardPort()) {
             $this->port = null;
         }
 
@@ -1201,9 +1273,9 @@ protected function createFromEnvironment(array $env)
         $this->path = rawurldecode(parse_url('http://example.com' . $request_uri, PHP_URL_PATH));
 
         // Build query string.
-        $this->query =  $env['QUERY_STRING'] ?? '';
+        $this->query = $env['QUERY_STRING'] ?? '';
         if ($this->query === '') {
-            $this->query = parse_url('http://example.com' . $request_uri, PHP_URL_QUERY);
+            $this->query = parse_url('http://example.com' . $request_uri, PHP_URL_QUERY) ?? '';
         }
 
         // Support ngnix routes.
@@ -1232,7 +1304,7 @@ protected function createFromEnvironment(array $env)
      */
     protected function hasStandardPort()
     {
-        return ($this->port === 80 || $this->port === 443);
+        return (!$this->port || $this->port === 80 || $this->port === 443);
     }
 
     /**
@@ -1243,13 +1315,15 @@ protected function createFromString($url)
         // Set Uri parts.
         $parts = parse_url($url);
         if ($parts === false) {
-            throw new \RuntimeException('Malformed URL: ' . $url);
+            throw new RuntimeException('Malformed URL: ' . $url);
         }
+        $port = (int)($parts['port'] ?? 0);
+
         $this->scheme = $parts['scheme'] ?? null;
         $this->user = $parts['user'] ?? null;
         $this->password = $parts['pass'] ?? null;
         $this->host = $parts['host'] ?? null;
-        $this->port = isset($parts['port']) ? (int)$parts['port'] : null;
+        $this->port = $port ?: null;
         $this->path = $parts['path'] ?? '';
         $this->query = $parts['query'] ?? '';
         $this->fragment = $parts['fragment'] ?? null;
@@ -1268,6 +1342,9 @@ protected function createFromString($url)
         $this->reset();
     }
 
+    /**
+     * @return void
+     */
     protected function reset()
     {
         // resets
@@ -1289,9 +1366,9 @@ protected function reset()
      * Get post from either $_POST or JSON response object
      * By default returns all data, or can return a single item
      *
-     * @param string $element
-     * @param string $filter_type
-     * @return array|mixed|null
+     * @param string|null $element
+     * @param string|null $filter_type
+     * @return array|null
      */
     public function post($element = null, $filter_type = null)
     {
@@ -1330,7 +1407,7 @@ public function getContentType($short = true)
         if (isset($_SERVER['CONTENT_TYPE'])) {
             $content_type = $_SERVER['CONTENT_TYPE'];
             if ($short) {
-                return Utils::substrToString($content_type,';');
+                return Utils::substrToString($content_type, ';');
             }
             return $content_type;
         }
@@ -1340,35 +1417,51 @@ public function getContentType($short = true)
     /**
      * Check if this is a valid Grav extension
      *
-     * @param $extension
+     * @param string|null $extension
      * @return bool
      */
-    public function isValidExtension($extension)
+    public function isValidExtension($extension): bool
     {
-        $valid_page_types = implode('|', Utils::getSupportPageTypes());
+        $extension = (string)$extension;
 
-        // Strip the file extension for valid page types
-        if (preg_match('/(' . $valid_page_types . ')/', $extension)) {
-            return true;
-        }
-        return false;
+        return $extension !== '' && in_array($extension, Utils::getSupportPageTypes(), true);
     }
 
     /**
      * Allow overriding of any element (be careful!)
      *
-     * @param $data
+     * @param array $data
      * @return Uri
      */
     public function setUriProperties($data)
     {
         foreach (get_object_vars($this) as $property => $default) {
-            if (!array_key_exists($property, $data)) continue;
+            if (!array_key_exists($property, $data)) {
+                continue;
+            }
             $this->{$property} = $data[$property]; // assign value to object
         }
         return $this;
     }
 
+
+    /**
+     * Compatibility in case getallheaders() is not available on platform
+     */
+    public static function getAllHeaders()
+    {
+        if (!function_exists('getallheaders')) {
+            $headers = [];
+            foreach ($_SERVER as $name => $value) {
+                if (substr($name, 0, 5) == 'HTTP_') {
+                    $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
+                }
+            }
+            return $headers;
+        }
+        return getallheaders();
+    }
+
     /**
      * Get the base URI with port if needed
      *
@@ -1393,6 +1486,9 @@ private function buildRootPath()
         return $rootPath;
     }
 
+    /**
+     * @return string
+     */
     private function buildEnvironment()
     {
         // check for localhost variations
@@ -1408,10 +1504,9 @@ private function buildEnvironment()
      *
      * @param string $uri
      * @param string $delimiter
-     *
      * @return string
      */
-    private function processParams($uri, $delimiter = ':')
+    private function processParams(string $uri, string $delimiter = ':'): string
     {
         if (strpos($uri, $delimiter) !== false) {
             preg_match_all(static::paramsRegex(), $uri, $matches, PREG_SET_ORDER);
diff --git a/system/src/Grav/Common/User/Access.php b/system/src/Grav/Common/User/Access.php
new file mode 100644
index 0000000000..96f4d96d6f
--- /dev/null
+++ b/system/src/Grav/Common/User/Access.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @package    Grav\Common\User
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\User;
+
+use function is_bool;
+
+/**
+ * Class Access
+ * @package Grav\Common\User
+ */
+class Access extends \Grav\Framework\Acl\Access
+{
+    /** @var array[] */
+    private $aliases = [
+        'admin.configuration.system' => ['admin.configuration_system'],
+        'admin.configuration.site' => ['admin.configuration_site', 'admin.settings'],
+        'admin.configuration.media' => ['admin.configuration_media'],
+        'admin.configuration.info' => ['admin.configuration_info'],
+    ];
+
+    /**
+     * @param string $action
+     * @return bool|null
+     */
+    public function get(string $action)
+    {
+        $result = parent::get($action);
+        if (is_bool($result)) {
+            return $result;
+        }
+
+        // Get access value.
+        if (isset($this->aliases[$action])) {
+            $aliases = $this->aliases[$action];
+            foreach ($aliases as $alias) {
+                $result = parent::get($alias);
+                if (is_bool($result)) {
+                    return $result;
+                }
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/system/src/Grav/Common/User/Authentication.php b/system/src/Grav/Common/User/Authentication.php
index 24477323fd..c32fd62e67 100644
--- a/system/src/Grav/Common/User/Authentication.php
+++ b/system/src/Grav/Common/User/Authentication.php
@@ -3,12 +3,18 @@
 /**
  * @package    Grav\Common\User
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\User;
 
+use RuntimeException;
+
+/**
+ * Class Authentication
+ * @package Grav\Common\User
+ */
 abstract class Authentication
 {
     /**
@@ -16,19 +22,19 @@ abstract class Authentication
      *
      * @param string $password Plaintext password.
      *
-     * @throws \RuntimeException
+     * @throws RuntimeException
      * @return string
      */
     public static function create($password): string
     {
         if (!$password) {
-            throw new \RuntimeException('Password hashing failed: no password provided.');
+            throw new RuntimeException('Password hashing failed: no password provided.');
         }
 
         $hash = password_hash($password, PASSWORD_DEFAULT);
 
         if (!$hash) {
-            throw new \RuntimeException('Password hashing failed: internal error.');
+            throw new RuntimeException('Password hashing failed: internal error.');
         }
 
         return $hash;
diff --git a/system/src/Grav/Common/User/DataUser/User.php b/system/src/Grav/Common/User/DataUser/User.php
index 9a06aee202..9cd3904f03 100644
--- a/system/src/Grav/Common/User/DataUser/User.php
+++ b/system/src/Grav/Common/User/DataUser/User.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\User
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,23 +14,32 @@
 use Grav\Common\Data\Data;
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Grav;
+use Grav\Common\Media\Interfaces\MediaCollectionInterface;
 use Grav\Common\Page\Media;
-use Grav\Common\Page\Medium\ImageMedium;
+use Grav\Common\Page\Medium\Medium;
 use Grav\Common\Page\Medium\MediumFactory;
 use Grav\Common\User\Authentication;
 use Grav\Common\User\Interfaces\UserInterface;
 use Grav\Common\User\Traits\UserTrait;
+use Grav\Common\Utils;
+use Grav\Framework\Flex\Flex;
+use function is_array;
 
+/**
+ * Class User
+ * @package Grav\Common\User\DataUser
+ */
 class User extends Data implements UserInterface
 {
     use UserTrait;
 
+    /** @var MediaCollectionInterface */
     protected $_media;
 
     /**
      * User constructor.
      * @param array $items
-     * @param Blueprint $blueprints
+     * @param Blueprint|null $blueprints
      */
     public function __construct(array $items = [], $blueprints = null)
     {
@@ -49,6 +58,7 @@ public function __construct(array $items = [], $blueprints = null)
      * @param string $offset
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         $value = parent::offsetExists($offset);
@@ -65,6 +75,7 @@ public function offsetExists($offset)
      * @param string $offset
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         $value = parent::offsetGet($offset);
@@ -78,6 +89,9 @@ public function offsetGet($offset)
         return $value;
     }
 
+    /**
+     * @return bool
+     */
     public function isValid(): bool
     {
         return $this->items !== null;
@@ -99,49 +113,72 @@ public function update(array $data, array $files = [])
     }
 
     /**
-     * Save user without the username
+     * Save user
+     *
+     * @return void
      */
     public function save()
     {
-        /** @var CompiledYamlFile $file */
+        /** @var CompiledYamlFile|null $file */
         $file = $this->file();
         if (!$file || !$file->filename()) {
             user_error(__CLASS__ . ': calling \$user = new ' . __CLASS__ . "() is deprecated since Grav 1.6, use \$grav['accounts']->load(\$username) or \$grav['accounts']->load('') instead", E_USER_DEPRECATED);
         }
 
         if ($file) {
-            $username = $this->get('username');
+            $username = $this->filterUsername((string)$this->get('username'));
 
             if (!$file->filename()) {
                 $locator = Grav::instance()['locator'];
-                $file->filename($locator->findResource('account://' . mb_strtolower($username) . YAML_EXT, true, true));
+                $file->filename($locator->findResource('account://' . $username . YAML_EXT, true, true));
             }
 
             // if plain text password, hash it and remove plain text
-            $password = $this->get('password');
-            if ($password) {
+            $password = $this->get('password') ?? $this->get('password1');
+            if (null !== $password && '' !== $password) {
+                $password2 = $this->get('password2');
+                if (!\is_string($password) || ($password2 && $password !== $password2)) {
+                    throw new \RuntimeException('Passwords did not match.');
+                }
+
                 $this->set('hashed_password', Authentication::create($password));
-                $this->undef('password');
             }
+            $this->undef('password');
+            $this->undef('password1');
+            $this->undef('password2');
 
             $data = $this->items;
-            unset($data['username'], $data['authenticated'], $data['authorized']);
+            if ($username === $data['username']) {
+                unset($data['username']);
+            }
+            unset($data['authenticated'], $data['authorized']);
 
             $file->save($data);
+
+            // We need to signal Flex Users about the change.
+            /** @var Flex|null $flex */
+            $flex = Grav::instance()['flex'] ?? null;
+            $users = $flex ? $flex->getDirectory('user-accounts') : null;
+            if (null !== $users) {
+                $users->clearCache();
+            }
         }
     }
 
+    /**
+     * @return MediaCollectionInterface|Media
+     */
     public function getMedia()
     {
         if (null === $this->_media) {
             // Media object should only contain avatar, nothing else.
-            $media = new Media($this->getMediaFolder(), $this->getMediaOrder(), false);
+            $media = new Media($this->getMediaFolder() ?? '', $this->getMediaOrder(), false);
 
             $path = $this->getAvatarFile();
             if ($path && is_file($path)) {
                 $medium = MediumFactory::fromFile($path);
                 if ($medium) {
-                    $media->add(basename($path), $medium);
+                    $media->add(Utils::basename($path), $medium);
                 }
             }
 
@@ -151,11 +188,17 @@ public function getMedia()
         return $this->_media;
     }
 
+    /**
+     * @return string
+     */
     public function getMediaFolder()
     {
-        return $this->blueprints()->fields()['avatar']['destination'] ?? 'user://accounts/avatars';
+        return $this->blueprints()->fields()['avatar']['destination'] ?? 'account://avatars';
     }
 
+    /**
+     * @return array
+     */
     public function getMediaOrder()
     {
         return [];
@@ -163,6 +206,8 @@ public function getMediaOrder()
 
     /**
      * Serialize user.
+     *
+     * @return string[]
      */
     public function __sleep()
     {
@@ -207,7 +252,7 @@ public function merge(array $data)
     /**
      * Return media object for the User's avatar.
      *
-     * @return ImageMedium|null
+     * @return Medium|null
      * @deprecated 1.6 Use ->getAvatarImage() method instead.
      */
     public function getAvatarMedia()
@@ -235,7 +280,6 @@ public function avatarUrl()
      * Ensures backwards compatibility
      *
      * @param  string $action
-     *
      * @return bool
      * @deprecated 1.5 Use ->authorize() method instead.
      */
@@ -243,7 +287,7 @@ public function authorise($action)
     {
         user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.5, use authorize() method instead', E_USER_DEPRECATED);
 
-        return $this->authorize($action);
+        return $this->authorize($action) ?? false;
     }
 
     /**
@@ -252,6 +296,7 @@ public function authorise($action)
      * @return int
      * @deprecated 1.6 Method makes no sense for user account.
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6', E_USER_DEPRECATED);
@@ -259,10 +304,22 @@ public function count()
         return parent::count();
     }
 
+    /**
+     * @param string $username
+     * @return string
+     */
+    protected function filterUsername(string $username): string
+    {
+        return mb_strtolower($username);
+    }
+
+    /**
+     * @return string|null
+     */
     protected function getAvatarFile(): ?string
     {
         $avatars = $this->get('avatar');
-        if (\is_array($avatars) && $avatars) {
+        if (is_array($avatars) && $avatars) {
             $avatar = array_shift($avatars);
             return $avatar['path'] ?? null;
         }
diff --git a/system/src/Grav/Common/User/DataUser/UserCollection.php b/system/src/Grav/Common/User/DataUser/UserCollection.php
index 800322a9f4..c997bdc443 100644
--- a/system/src/Grav/Common/User/DataUser/UserCollection.php
+++ b/system/src/Grav/Common/User/DataUser/UserCollection.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\User
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -16,7 +16,15 @@
 use Grav\Common\User\Interfaces\UserInterface;
 use Grav\Common\Utils;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use function count;
+use function in_array;
+use function is_string;
 
+/**
+ * Class UserCollection
+ * @package Grav\Common\User\DataUser
+ */
 class UserCollection implements UserCollectionInterface
 {
     /** @var string */
@@ -41,20 +49,25 @@ public function __construct(string $className)
      */
     public function load($username): UserInterface
     {
+        $username = (string)$username;
+
         $grav = Grav::instance();
         /** @var UniformResourceLocator $locator */
         $locator = $grav['locator'];
 
-        // force lowercase of username
-        $username = mb_strtolower($username);
+        // Filter username.
+        $username = $this->filterUsername($username);
 
         $filename = 'account://' . $username . YAML_EXT;
         $path = $locator->findResource($filename) ?: $locator->findResource($filename, true, true);
+        if (!is_string($path)) {
+            throw new RuntimeException('Internal Error');
+        }
         $file = CompiledYamlFile::instance($path);
         $content = (array)$file->content() + ['username' => $username, 'state' => 'enabled'];
 
         $userClass = $this->className;
-        $callable = function() {
+        $callable = static function () {
             $blueprints = new Blueprints;
 
             return $blueprints->get('user/account');
@@ -78,8 +91,16 @@ public function find($query, $fields = ['username', 'email']): UserInterface
     {
         $fields = (array)$fields;
 
-        $account_dir = Grav::instance()['locator']->findResource('account://');
-        $files = $account_dir ? array_diff(scandir($account_dir), ['.', '..']) : [];
+        $grav = Grav::instance();
+        /** @var UniformResourceLocator $locator */
+        $locator = $grav['locator'];
+
+        $account_dir = $locator->findResource('account://');
+        if (!is_string($account_dir)) {
+            return $this->load('');
+        }
+
+        $files = array_diff(scandir($account_dir) ?: [], ['.', '..']);
 
         // Try with username first, you never know!
         if (in_array('username', $fields, true)) {
@@ -91,11 +112,12 @@ public function find($query, $fields = ['username', 'email']): UserInterface
 
         // If not found, try the fields
         if (!$user->exists()) {
+            $query = mb_strtolower($query);
             foreach ($files as $file) {
                 if (Utils::endsWith($file, YAML_EXT)) {
-                    $find_user = $this->load(trim(pathinfo($file, PATHINFO_FILENAME)));
+                    $find_user = $this->load(trim(Utils::pathinfo($file, PATHINFO_FILENAME)));
                     foreach ($fields as $field) {
-                        if ($find_user[$field] === $query) {
+                        if (isset($find_user[$field]) && mb_strtolower($find_user[$field]) === $query) {
                             return $find_user;
                         }
                     }
@@ -109,7 +131,6 @@ public function find($query, $fields = ['username', 'email']): UserInterface
      * Remove user account.
      *
      * @param string $username
-     *
      * @return bool True if the action was performed
      */
     public function delete($username): bool
@@ -119,6 +140,9 @@ public function delete($username): bool
         return $file_path && unlink($file_path);
     }
 
+    /**
+     * @return int
+     */
     public function count(): int
     {
         // check for existence of a user account
@@ -127,4 +151,13 @@ public function count(): int
 
         return count($accounts);
     }
+
+    /**
+     * @param string $username
+     * @return string
+     */
+    protected function filterUsername(string $username): string
+    {
+        return mb_strtolower($username);
+    }
 }
diff --git a/system/src/Grav/Common/User/FlexUser/Storage/UserFileStorage.php b/system/src/Grav/Common/User/FlexUser/Storage/UserFileStorage.php
deleted file mode 100644
index 3156fc4e79..0000000000
--- a/system/src/Grav/Common/User/FlexUser/Storage/UserFileStorage.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\User
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\User\FlexUser\Storage;
-
-use Grav\Framework\Flex\Storage\FileStorage;
-
-class UserFileStorage extends FileStorage
-{
-}
diff --git a/system/src/Grav/Common/User/FlexUser/Storage/UserFolderStorage.php b/system/src/Grav/Common/User/FlexUser/Storage/UserFolderStorage.php
deleted file mode 100644
index 9b5a6646c0..0000000000
--- a/system/src/Grav/Common/User/FlexUser/Storage/UserFolderStorage.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\User
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\User\FlexUser\Storage;
-
-use Grav\Framework\Flex\Storage\FolderStorage;
-
-class UserFolderStorage extends FolderStorage
-{
-}
diff --git a/system/src/Grav/Common/User/FlexUser/User.php b/system/src/Grav/Common/User/FlexUser/User.php
deleted file mode 100644
index e95992aaec..0000000000
--- a/system/src/Grav/Common/User/FlexUser/User.php
+++ /dev/null
@@ -1,700 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\User
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\User\FlexUser;
-
-use Grav\Common\Data\Blueprint;
-use Grav\Common\Grav;
-use Grav\Common\Media\Interfaces\MediaCollectionInterface;
-use Grav\Common\Page\Media;
-use Grav\Common\Page\Medium\ImageMedium;
-use Grav\Common\Page\Medium\Medium;
-use Grav\Common\User\Authentication;
-use Grav\Common\User\Interfaces\UserInterface;
-use Grav\Common\User\Traits\UserTrait;
-use Grav\Framework\File\Formatter\JsonFormatter;
-use Grav\Framework\File\Formatter\YamlFormatter;
-use Grav\Framework\Flex\FlexDirectory;
-use Grav\Framework\Flex\FlexObject;
-use Grav\Framework\Flex\Traits\FlexAuthorizeTrait;
-use Grav\Framework\Flex\Traits\FlexMediaTrait;
-use Grav\Framework\Form\FormFlashFile;
-use Grav\Framework\Media\Interfaces\MediaManipulationInterface;
-use Psr\Http\Message\UploadedFileInterface;
-use RocketTheme\Toolbox\File\FileInterface;
-
-/**
- * Flex User
- *
- * Flex User is mostly compatible with the older User class, except on few key areas:
- *
- * - Constructor parameters have been changed. Old code creating a new user does not work.
- * - Serializer has been changed -- existing sessions will be killed.
- *
- * @package Grav\Common\User
- *
- * @property string $username
- * @property string $email
- * @property string $fullname
- * @property string $state
- * @property array $groups
- * @property array $access
- * @property bool $authenticated
- * @property bool $authorized
- */
-class User extends FlexObject implements UserInterface, MediaManipulationInterface, \Countable
-{
-    use FlexMediaTrait;
-    use FlexAuthorizeTrait;
-    use UserTrait;
-
-    protected $_uploads_original;
-
-    /**
-     * @var FileInterface|null
-     */
-    protected $_storage;
-
-    /**
-     * @return array
-     */
-    public static function getCachedMethods(): array
-    {
-        return [
-            'load' => false,
-            'find' => false,
-            'remove' => false,
-            'get' => true,
-            'set' => false,
-            'undef' => false,
-            'def' => false,
-        ] + parent::getCachedMethods();
-    }
-
-    public function __construct(array $elements, $key, FlexDirectory $directory, bool $validate = false)
-    {
-        // User can only be authenticated via login.
-        unset($elements['authenticated'], $elements['authorized']);
-
-        parent::__construct($elements, $key, $directory, $validate);
-
-        // Define username and state if they aren't set.
-        $this->defProperty('username', $key);
-        $this->defProperty('state', 'enabled');
-    }
-
-    /**
-     * Get value by using dot notation for nested arrays/objects.
-     *
-     * @example $value = $this->get('this.is.my.nested.variable');
-     *
-     * @param string  $name       Dot separated path to the requested value.
-     * @param mixed   $default    Default value (or null).
-     * @param string  $separator  Separator, defaults to '.'
-     * @return mixed  Value.
-     */
-    public function get($name, $default = null, $separator = null)
-    {
-        return $this->getNestedProperty($name, $default, $separator);
-    }
-
-    /**
-     * Set value by using dot notation for nested arrays/objects.
-     *
-     * @example $data->set('this.is.my.nested.variable', $value);
-     *
-     * @param string  $name       Dot separated path to the requested value.
-     * @param mixed   $value      New value.
-     * @param string  $separator  Separator, defaults to '.'
-     * @return $this
-     */
-    public function set($name, $value, $separator = null)
-    {
-        $this->setNestedProperty($name, $value, $separator);
-
-        return $this;
-    }
-
-    /**
-     * Unset value by using dot notation for nested arrays/objects.
-     *
-     * @example $data->undef('this.is.my.nested.variable');
-     *
-     * @param string  $name       Dot separated path to the requested value.
-     * @param string  $separator  Separator, defaults to '.'
-     * @return $this
-     */
-    public function undef($name, $separator = null)
-    {
-        $this->unsetNestedProperty($name, $separator);
-
-        return $this;
-    }
-
-    /**
-     * Set default value by using dot notation for nested arrays/objects.
-     *
-     * @example $data->def('this.is.my.nested.variable', 'default');
-     *
-     * @param string  $name       Dot separated path to the requested value.
-     * @param mixed   $default    Default value (or null).
-     * @param string  $separator  Separator, defaults to '.'
-     * @return $this
-     */
-    public function def($name, $default = null, $separator = null)
-    {
-        $this->defNestedProperty($name, $default, $separator);
-
-        return $this;
-    }
-
-    /**
-     * Get value from a page variable (used mostly for creating edit forms).
-     *
-     * @param string $name Variable name.
-     * @param mixed $default
-     * @param string|null $separator
-     * @return mixed
-     */
-    public function getFormValue(string $name, $default = null, string $separator = null)
-    {
-        $value = parent::getFormValue($name, null, $separator);
-
-        if ($name === 'avatar') {
-            return $this->parseFileProperty($value);
-        }
-
-        if (null === $value) {
-            if ($name === 'media_order') {
-                return implode(',', $this->getMediaOrder());
-            }
-        }
-
-        return $value ?? $default;
-    }
-
-    /**
-     * @param string $property
-     * @param mixed $default
-     * @return mixed
-     */
-    public function getProperty($property, $default = null)
-    {
-        $value = parent::getProperty($property, $default);
-
-        if ($property === 'avatar') {
-            $value = $this->parseFileProperty($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Convert object into an array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $array = $this->jsonSerialize();
-        $array['avatar'] = $this->parseFileProperty($array['avatar'] ?? null);
-
-        return $array;
-    }
-
-    /**
-     * Convert object into YAML string.
-     *
-     * @param  int $inline  The level where you switch to inline YAML.
-     * @param  int $indent  The amount of spaces to use for indentation of nested nodes.
-     *
-     * @return string A YAML string representing the object.
-     */
-    public function toYaml($inline = 5, $indent = 2)
-    {
-        $yaml = new YamlFormatter(['inline' => $inline, 'indent' => $indent]);
-
-        return $yaml->encode($this->toArray());
-    }
-
-    /**
-     * Convert object into JSON string.
-     *
-     * @return string
-     */
-    public function toJson()
-    {
-        $json = new JsonFormatter();
-
-        return $json->encode($this->toArray());
-    }
-
-    /**
-     * Join nested values together by using blueprints.
-     *
-     * @param string  $name       Dot separated path to the requested value.
-     * @param mixed   $value      Value to be joined.
-     * @param string  $separator  Separator, defaults to '.'
-     * @return $this
-     * @throws \RuntimeException
-     */
-    public function join($name, $value, $separator = null)
-    {
-        $separator = $separator ?? '.';
-        $old = $this->get($name, null, $separator);
-        if ($old !== null) {
-            if (!\is_array($old)) {
-                throw new \RuntimeException('Value ' . $old);
-            }
-
-            if (\is_object($value)) {
-                $value = (array) $value;
-            } elseif (!\is_array($value)) {
-                throw new \RuntimeException('Value ' . $value);
-            }
-
-            $value = $this->getBlueprint()->mergeData($old, $value, $name, $separator);
-        }
-
-        $this->set($name, $value, $separator);
-
-        return $this;
-    }
-
-    /**
-     * Get nested structure containing default values defined in the blueprints.
-     *
-     * Fields without default value are ignored in the list.
-
-     * @return array
-     */
-    public function getDefaults()
-    {
-        return $this->getBlueprint()->getDefaults();
-    }
-
-    /**
-     * Set default values by using blueprints.
-     *
-     * @param string  $name       Dot separated path to the requested value.
-     * @param mixed   $value      Value to be joined.
-     * @param string  $separator  Separator, defaults to '.'
-     * @return $this
-     */
-    public function joinDefaults($name, $value, $separator = null)
-    {
-        if (\is_object($value)) {
-            $value = (array) $value;
-        }
-
-        $old = $this->get($name, null, $separator);
-        if ($old !== null) {
-            $value = $this->getBlueprint()->mergeData($value, $old, $name, $separator);
-        }
-
-        $this->setNestedProperty($name, $value, $separator);
-
-        return $this;
-    }
-
-    /**
-     * Get value from the configuration and join it with given data.
-     *
-     * @param string  $name       Dot separated path to the requested value.
-     * @param array|object $value      Value to be joined.
-     * @param string  $separator  Separator, defaults to '.'
-     * @return array
-     * @throws \RuntimeException
-     */
-    public function getJoined($name, $value, $separator = null)
-    {
-        if (\is_object($value)) {
-            $value = (array) $value;
-        } elseif (!\is_array($value)) {
-            throw new \RuntimeException('Value ' . $value);
-        }
-
-        $old = $this->get($name, null, $separator);
-
-        if ($old === null) {
-            // No value set; no need to join data.
-            return $value;
-        }
-
-        if (!\is_array($old)) {
-            throw new \RuntimeException('Value ' . $old);
-        }
-
-        // Return joined data.
-        return $this->getBlueprint()->mergeData($old, $value, $name, $separator);
-    }
-
-    /**
-     * Set default values to the configuration if variables were not set.
-     *
-     * @param array $data
-     * @return $this
-     */
-    public function setDefaults(array $data)
-    {
-        $this->setElements($this->getBlueprint()->mergeData($data, $this->toArray()));
-
-        return $this;
-    }
-
-    /**
-     * Validate by blueprints.
-     *
-     * @return $this
-     * @throws \Exception
-     */
-    public function validate()
-    {
-        $this->getBlueprint()->validate($this->toArray());
-
-        return $this;
-    }
-
-    /**
-     * Filter all items by using blueprints.
-     * @return $this
-     */
-    public function filter()
-    {
-        $this->setElements($this->getBlueprint()->filter($this->toArray()));
-
-        return $this;
-    }
-
-    /**
-     * Get extra items which haven't been defined in blueprints.
-     *
-     * @return array
-     */
-    public function extra()
-    {
-        return $this->getBlueprint()->extra($this->toArray());
-    }
-
-    /**
-     * @param string $name
-     * @return Blueprint
-     */
-    public function getBlueprint(string $name = '')
-    {
-        $blueprint = clone parent::getBlueprint($name);
-
-        $blueprint->addDynamicHandler('flex', function (array &$field, $property, array &$call) {
-            $params = (array)$call['params'];
-            $method = array_shift($params);
-
-            if (method_exists($this, $method)) {
-                $value = $this->{$method}(...$params);
-                if (\is_array($value) && isset($field[$property]) && \is_array($field[$property])) {
-                    $field[$property] = array_merge_recursive($field[$property], $value);
-                } else {
-                    $field[$property] = $value;
-                }
-            }
-        });
-
-        return $blueprint->init();
-    }
-
-    /**
-     * Return unmodified data as raw string.
-     *
-     * NOTE: This function only returns data which has been saved to the storage.
-     *
-     * @return string
-     */
-    public function raw()
-    {
-        $file = $this->file();
-
-        return $file ? $file->raw() : '';
-    }
-
-    /**
-     * Set or get the data storage.
-     *
-     * @param FileInterface $storage Optionally enter a new storage.
-     * @return FileInterface
-     */
-    public function file(FileInterface $storage = null)
-    {
-        if (null !== $storage) {
-            $this->_storage = $storage;
-        }
-
-        return $this->_storage;
-    }
-
-    public function isValid(): bool
-    {
-        return $this->getProperty('state') !== null;
-    }
-
-    /**
-     * Save user without the username
-     */
-    public function save()
-    {
-        $password = $this->getProperty('password');
-        if (null !== $password) {
-            $this->unsetProperty('password');
-            $this->unsetProperty('password1');
-            $this->unsetProperty('password2');
-            $this->setProperty('hashed_password', Authentication::create($password));
-        }
-
-        return parent::save();
-    }
-
-    public function isAuthorized(string $action, string $scope = null, UserInterface $user = null): bool
-    {
-        if (null === $user) {
-            /** @var UserInterface $user */
-            $user = Grav::instance()['user'] ?? null;
-        }
-
-        if ($user instanceof User && $user->getStorageKey() === $this->getStorageKey()) {
-            return true;
-        }
-
-        return parent::isAuthorized($action, $scope, $user);
-    }
-
-    /**
-     * @return array
-     */
-    public function prepareStorage(): array
-    {
-        $elements = parent::prepareStorage();
-
-        // Do not save authorization information.
-        unset($elements['authenticated'], $elements['authorized']);
-
-        return $elements;
-    }
-
-    /**
-     * Merge two configurations together.
-     *
-     * @param array $data
-     * @return $this
-     * @deprecated 1.6 Use `->update($data)` instead (same but with data validation & filtering, file upload support).
-     */
-    public function merge(array $data)
-    {
-        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->update($data) method instead', E_USER_DEPRECATED);
-
-        $this->setElements($this->getBlueprint()->mergeData($this->toArray(), $data));
-
-        return $this;
-    }
-
-    /**
-     * Return media object for the User's avatar.
-     *
-     * @return ImageMedium|null
-     * @deprecated 1.6 Use ->getAvatarImage() method instead.
-     */
-    public function getAvatarMedia()
-    {
-        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->getAvatarImage() method instead', E_USER_DEPRECATED);
-
-        return $this->getAvatarImage();
-    }
-
-    /**
-     * Return the User's avatar URL
-     *
-     * @return string
-     * @deprecated 1.6 Use ->getAvatarUrl() method instead.
-     */
-    public function avatarUrl()
-    {
-        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->getAvatarUrl() method instead', E_USER_DEPRECATED);
-
-        return $this->getAvatarUrl();
-    }
-
-    /**
-     * Checks user authorization to the action.
-     * Ensures backwards compatibility
-     *
-     * @param string $action
-     * @return bool
-     * @deprecated 1.5 Use ->authorize() method instead.
-     */
-    public function authorise($action)
-    {
-        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.5, use ->authorize() method instead', E_USER_DEPRECATED);
-
-        return $this->authorize($action);
-    }
-
-    /**
-     * Implements Countable interface.
-     *
-     * @return int
-     * @deprecated 1.6 Method makes no sense for user account.
-     */
-    public function count()
-    {
-        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6', E_USER_DEPRECATED);
-
-        return \count($this->jsonSerialize());
-    }
-
-    /**
-     * Gets the associated media collection (original images).
-     *
-     * @return MediaCollectionInterface  Representation of associated media.
-     */
-    protected function getOriginalMedia()
-    {
-        return (new Media($this->getMediaFolder() . '/original', $this->getMediaOrder()))->setTimestamps();
-    }
-
-    /**
-     * @param array $files
-     */
-    protected function setUpdatedMedia(array $files): void
-    {
-        $list = [];
-        $list_original = [];
-        foreach ($files as $field => $group) {
-            foreach ($group as $filename => $file) {
-                if (strpos($field, '/original')) {
-                    // Special handling for original images.
-                    $list_original[$filename] = $file;
-                    continue;
-                }
-
-                $list[$filename] = $file;
-
-                if ($file) {
-                    /** @var FormFlashFile $file */
-                    $data = $file->jsonSerialize();
-                    $path = $file->getClientFilename();
-                    unset($data['tmp_name'], $data['path']);
-
-                    $this->setNestedProperty("{$field}\n{$path}", $data, "\n");
-                } else {
-                    $this->unsetNestedProperty("{$field}\n{$filename}", "\n");
-                }
-            }
-        }
-
-        $this->_uploads = $list;
-        $this->_uploads_original = $list_original;
-    }
-
-    protected function saveUpdatedMedia(): void
-    {
-        // Upload/delete original sized images.
-        /** @var FormFlashFile $file */
-        foreach ($this->_uploads_original ?? [] as $name => $file) {
-            $name = 'original/' . $name;
-            if ($file) {
-                $this->uploadMediaFile($file, $name);
-            } else {
-                $this->deleteMediaFile($name);
-            }
-        }
-
-        /**
-         * @var string $filename
-         * @var UploadedFileInterface $file
-         */
-        foreach ($this->getUpdatedMedia() as $filename => $file) {
-            if ($file) {
-                $this->uploadMediaFile($file, $filename);
-            } else {
-                $this->deleteMediaFile($filename);
-            }
-        }
-
-        $this->setUpdatedMedia([]);
-    }
-
-    /**
-     * @param array $value
-     * @return array
-     */
-    protected function parseFileProperty($value)
-    {
-        if (!\is_array($value)) {
-            return $value;
-        }
-
-        $originalMedia = $this->getOriginalMedia();
-        $resizedMedia = $this->getMedia();
-
-        $list = [];
-        foreach ($value as $filename => $info) {
-            if (!\is_array($info)) {
-                continue;
-            }
-
-            /** @var Medium $thumbFile */
-            $thumbFile = $resizedMedia[$filename];
-            /** @var Medium $imageFile */
-            $imageFile = $originalMedia[$filename] ?? $thumbFile;
-            if ($thumbFile) {
-                $list[$filename] = [
-                    'name' => $filename,
-                    'type' => $info['type'],
-                    'size' => $info['size'],
-                    'image_url' => $imageFile->url(),
-                    'thumb_url' =>  $thumbFile->url(),
-                    'cropData' => (object)($imageFile->metadata()['upload']['crop'] ?? [])
-                ];
-            }
-        }
-
-        return $list;
-    }
-
-    /**
-     * @return array
-     */
-    protected function doSerialize(): array
-    {
-        return [
-            'type' => 'accounts',
-            'key' => $this->getKey(),
-            'elements' => $this->jsonSerialize(),
-            'storage' => $this->getStorage()
-        ];
-    }
-
-    /**
-     * @param array $serialized
-     */
-    protected function doUnserialize(array $serialized): void
-    {
-        $grav = Grav::instance();
-
-        /** @var UserCollection $accounts */
-        $accounts = $grav['accounts'];
-
-        $directory = $accounts->getFlexDirectory();
-        if (!$directory) {
-            throw new \InvalidArgumentException('Internal error');
-        }
-
-        $this->setFlexDirectory($directory);
-        $this->setStorage($serialized['storage']);
-        $this->setKey($serialized['key']);
-        $this->setElements($serialized['elements']);
-    }
-}
diff --git a/system/src/Grav/Common/User/FlexUser/UserCollection.php b/system/src/Grav/Common/User/FlexUser/UserCollection.php
deleted file mode 100644
index 0f7a1d1f2c..0000000000
--- a/system/src/Grav/Common/User/FlexUser/UserCollection.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\User
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\User\FlexUser;
-
-use Grav\Common\User\Interfaces\UserCollectionInterface;
-use Grav\Common\User\Interfaces\UserInterface;
-use Grav\Common\Utils;
-use Grav\Framework\Flex\FlexCollection;
-
-class UserCollection extends FlexCollection implements UserCollectionInterface
-{
-    /**
-     * Load user account.
-     *
-     * Always creates user object. To check if user exists, use $this->exists().
-     *
-     * @param string $username
-     * @return User
-     */
-    public function load($username): UserInterface
-    {
-        if ($username !== '') {
-            $key = mb_strtolower($username);
-            $user = $this->get($key);
-            if ($user) {
-                return $user;
-            }
-        } else {
-            $key = '';
-        }
-
-        $directory = $this->getFlexDirectory();
-
-        /** @var User $object */
-        $object = $directory->createObject(
-            [
-                'username' => $username,
-                'state' => 'enabled'
-            ],
-            $key
-        );
-
-        return $object;
-    }
-
-    /**
-     * Find a user by username, email, etc
-     *
-     * @param string $query the query to search for
-     * @param array $fields the fields to search
-     * @return User
-     */
-    public function find($query, $fields = ['username', 'email']): UserInterface
-    {
-        foreach ((array)$fields as $field) {
-            if ($field === 'key') {
-                $user = $this->get($query);
-            } elseif ($field === 'storage_key') {
-                $user = $this->withKeyField('storage_key')->get($query);
-            } elseif ($field === 'flex_key') {
-                $user = $this->withKeyField('flex_key')->get($query);
-            } elseif ($field === 'username') {
-                $user = $this->get(mb_strtolower($query));
-            } else {
-                $user = parent::find($query, $field);
-            }
-            if ($user) {
-                return $user;
-            }
-        }
-
-        return $this->load('');
-    }
-
-    /**
-     * Delete user account.
-     *
-     * @param string $username
-     *
-     * @return bool True if user account was found and was deleted.
-     */
-    public function delete($username): bool
-    {
-        $user = $this->load($username);
-
-        $exists = $user->exists();
-        if ($exists) {
-            $user->delete();
-        }
-
-        return $exists;
-    }
-}
diff --git a/system/src/Grav/Common/User/FlexUser/UserIndex.php b/system/src/Grav/Common/User/FlexUser/UserIndex.php
deleted file mode 100644
index f95f51b0a6..0000000000
--- a/system/src/Grav/Common/User/FlexUser/UserIndex.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
- * @package    Grav\Common\User
- *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\User\FlexUser;
-
-use Grav\Common\Debugger;
-use Grav\Common\File\CompiledYamlFile;
-use Grav\Common\Grav;
-use Grav\Common\User\Interfaces\UserInterface;
-use Grav\Framework\Flex\FlexIndex;
-use Grav\Framework\Flex\Interfaces\FlexStorageInterface;
-use Monolog\Logger;
-
-class UserIndex extends FlexIndex
-{
-    /**
-     * @param FlexStorageInterface $storage
-     * @return array
-     */
-    public static function loadEntriesFromStorage(FlexStorageInterface $storage) : array
-    {
-        // Load saved index.
-        $index = static::loadEntriesFromIndex($storage);
-
-        // Load up to date index.
-        $entries = parent::loadEntriesFromStorage($storage);
-
-        return static::updateIndexFile($storage, $index, $entries);
-    }
-
-    /**
-     * Load user account.
-     *
-     * Always creates user object. To check if user exists, use $this->exists().
-     *
-     * @param string $username
-     *
-     * @return User
-     */
-    public function load($username): UserInterface
-    {
-        if ($username !== '') {
-            $key = mb_strtolower($username);
-            $user = $this->get($key);
-            if ($user) {
-                return $user;
-            }
-        } else {
-            $key = '';
-        }
-
-        $directory = $this->getFlexDirectory();
-
-        /** @var User $object */
-        $object = $directory->createObject(
-            [
-                'username' => $username,
-                'state' => 'enabled'
-            ],
-            $key
-        );
-
-        return $object;
-    }
-
-    /**
-     * Find a user by username, email, etc
-     *
-     * @param string $query the query to search for
-     * @param array $fields the fields to search
-     * @return User
-     */
-    public function find($query, $fields = ['username', 'email']): UserInterface
-    {
-        foreach ((array)$fields as $field) {
-            if ($field === 'key') {
-                $user = $this->get($query);
-            } elseif ($field === 'storage_key') {
-                $user = $this->withKeyField('storage_key')->get($query);
-            } elseif ($field === 'flex_key') {
-                $user = $this->withKeyField('flex_key')->get($query);
-            } elseif ($field === 'email') {
-                $user = $this->withKeyField('email')->get($query);
-            } elseif ($field === 'username') {
-                $user = $this->get(mb_strtolower($query));
-            } else {
-                $user = $this->__call('find', [$query, $field]);
-            }
-            if ($user) {
-                return $user;
-            }
-        }
-
-        return $this->load('');
-    }
-
-    protected static function updateIndexData(array &$entry, array $data)
-    {
-        $entry['key'] = mb_strtolower($entry['key']);
-        $entry['email'] = isset($data['email']) ? mb_strtolower($data['email']) : null;
-    }
-
-    protected static function getIndexFile(FlexStorageInterface $storage)
-    {
-        // Load saved index file.
-        $grav = Grav::instance();
-        $locator = $grav['locator'];
-        $filename = $locator->findResource('user-data://flex/indexes/accounts.yaml', true, true);
-
-        return CompiledYamlFile::instance($filename);
-    }
-
-    protected static function onChanges(array $entries, array $added, array $updated, array $removed)
-    {
-        $message = sprintf('Flex: User index updated, %d objects (%d added, %d updated, %d removed).', \count($entries), \count($added), \count($updated), \count($removed));
-
-        $grav = Grav::instance();
-
-        /** @var Logger $logger */
-        $logger = $grav['log'];
-        $logger->addDebug($message);
-
-        /** @var Debugger $debugger */
-        $debugger = $grav['debugger'];
-        $debugger->addMessage($message, 'debug');
-    }
-}
diff --git a/system/src/Grav/Common/User/Group.php b/system/src/Grav/Common/User/Group.php
index 9815c0e5e1..9be619a1ca 100644
--- a/system/src/Grav/Common/User/Group.php
+++ b/system/src/Grav/Common/User/Group.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\User
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -16,15 +16,21 @@
 use Grav\Common\Grav;
 use Grav\Common\Utils;
 
+/**
+ * @deprecated 1.7 Use $grav['user_groups'] instead of this class. In type hints, please use UserGroupInterface.
+ */
 class Group extends Data
 {
     /**
      * Get the groups list
      *
      * @return array
+     * @deprecated 1.7, use $grav['user_groups'] Flex UserGroupCollection instead
      */
-    private static function groups()
+    protected static function groups()
     {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, use $grav[\'user_groups\'] Flex UserGroupCollection instead', E_USER_DEPRECATED);
+
         return Grav::instance()['config']->get('groups', []);
     }
 
@@ -32,12 +38,15 @@ private static function groups()
      * Get the groups list
      *
      * @return array
+     * @deprecated 1.7, use $grav['user_groups'] Flex UserGroupCollection instead
      */
     public static function groupNames()
     {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, use $grav[\'user_groups\'] Flex UserGroupCollection instead', E_USER_DEPRECATED);
+
         $groups = [];
 
-        foreach(static::groups() as $groupname => $group) {
+        foreach (static::groups() as $groupname => $group) {
             $groups[$groupname] = $group['readableName'] ?? $groupname;
         }
 
@@ -48,11 +57,13 @@ public static function groupNames()
      * Checks if a group exists
      *
      * @param string $groupname
-     *
      * @return bool
+     * @deprecated 1.7, use $grav['user_groups'] Flex UserGroupCollection instead
      */
     public static function groupExists($groupname)
     {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, use $grav[\'user_groups\'] Flex UserGroupCollection instead', E_USER_DEPRECATED);
+
         return isset(self::groups()[$groupname]);
     }
 
@@ -60,11 +71,13 @@ public static function groupExists($groupname)
      * Get a group by name
      *
      * @param string $groupname
-     *
      * @return object
+     * @deprecated 1.7, use $grav['user_groups'] Flex UserGroupCollection instead
      */
     public static function load($groupname)
     {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, use $grav[\'user_groups\'] Flex UserGroupCollection instead', E_USER_DEPRECATED);
+
         $groups = self::groups();
 
         $content = $groups[$groupname] ?? [];
@@ -78,6 +91,8 @@ public static function load($groupname)
 
     /**
      * Save a group
+     *
+     * @return void
      */
     public function save()
     {
@@ -125,11 +140,13 @@ public function save()
      * Remove a group
      *
      * @param string $groupname
-     *
      * @return bool True if the action was performed
+     * @deprecated 1.7, use $grav['user_groups'] Flex UserGroupCollection instead
      */
     public static function remove($groupname)
     {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, use $grav[\'user_groups\'] Flex UserGroupCollection instead', E_USER_DEPRECATED);
+
         $grav = Grav::instance();
 
         /** @var Config $config */
diff --git a/system/src/Grav/Common/User/Interfaces/AuthorizeInterface.php b/system/src/Grav/Common/User/Interfaces/AuthorizeInterface.php
new file mode 100644
index 0000000000..1aeb004e6e
--- /dev/null
+++ b/system/src/Grav/Common/User/Interfaces/AuthorizeInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @package    Grav\Common\User
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\User\Interfaces;
+
+/**
+ * Interface AuthorizeInterface
+ * @package Grav\Common\User\Interfaces
+ */
+interface AuthorizeInterface
+{
+    /**
+     * Checks user authorization to the action.
+     *
+     * @param  string $action
+     * @param  string|null $scope
+     * @return bool|null
+     */
+    public function authorize(string $action, string $scope = null): ?bool;
+}
diff --git a/system/src/Grav/Common/User/Interfaces/UserCollectionInterface.php b/system/src/Grav/Common/User/Interfaces/UserCollectionInterface.php
index 37b9009a5d..5bcfbc0f2b 100644
--- a/system/src/Grav/Common/User/Interfaces/UserCollectionInterface.php
+++ b/system/src/Grav/Common/User/Interfaces/UserCollectionInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\User
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
diff --git a/system/src/Grav/Common/User/Interfaces/UserGroupInterface.php b/system/src/Grav/Common/User/Interfaces/UserGroupInterface.php
new file mode 100644
index 0000000000..c18388ce9c
--- /dev/null
+++ b/system/src/Grav/Common/User/Interfaces/UserGroupInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @package    Grav\Common\User
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\User\Interfaces;
+
+/**
+ * Interface UserGroupInterface
+ * @package Grav\Common\User\Interfaces
+ */
+interface UserGroupInterface extends AuthorizeInterface
+{
+}
diff --git a/system/src/Grav/Common/User/Interfaces/UserInterface.php b/system/src/Grav/Common/User/Interfaces/UserInterface.php
index 0fba6768af..dcd014c88a 100644
--- a/system/src/Grav/Common/User/Interfaces/UserInterface.php
+++ b/system/src/Grav/Common/User/Interfaces/UserInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\User
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,8 +12,9 @@
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\DataInterface;
 use Grav\Common\Media\Interfaces\MediaInterface;
-use Grav\Common\Page\Medium\ImageMedium;
+use Grav\Common\Page\Medium\Medium;
 use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
+use RuntimeException;
 
 /**
  * Interface UserInterface
@@ -29,7 +30,7 @@
  * @property bool $authenticated
  * @property bool $authorized
  */
-interface UserInterface extends DataInterface, MediaInterface, \ArrayAccess, \JsonSerializable, ExportInterface
+interface UserInterface extends AuthorizeInterface, DataInterface, MediaInterface, \ArrayAccess, \JsonSerializable, ExportInterface
 {
     /**
      * @param array $items
@@ -44,7 +45,7 @@ interface UserInterface extends DataInterface, MediaInterface, \ArrayAccess, \Js
      *
      * @param string  $name       Dot separated path to the requested value.
      * @param mixed   $default    Default value (or null).
-     * @param string  $separator  Separator, defaults to '.'
+     * @param string|null  $separator  Separator, defaults to '.'
      * @return mixed  Value.
      */
     public function get($name, $default = null, $separator = null);
@@ -56,7 +57,7 @@ public function get($name, $default = null, $separator = null);
      *
      * @param string  $name       Dot separated path to the requested value.
      * @param mixed   $value      New value.
-     * @param string  $separator  Separator, defaults to '.'
+     * @param string|null  $separator  Separator, defaults to '.'
      * @return $this
      */
     public function set($name, $value, $separator = null);
@@ -67,7 +68,7 @@ public function set($name, $value, $separator = null);
      * @example $data->undef('this.is.my.nested.variable');
      *
      * @param string  $name       Dot separated path to the requested value.
-     * @param string  $separator  Separator, defaults to '.'
+     * @param string|null  $separator  Separator, defaults to '.'
      * @return $this
      */
     public function undef($name, $separator = null);
@@ -79,7 +80,7 @@ public function undef($name, $separator = null);
      *
      * @param string  $name       Dot separated path to the requested value.
      * @param mixed   $default    Default value (or null).
-     * @param string  $separator  Separator, defaults to '.'
+     * @param string|null  $separator  Separator, defaults to '.'
      * @return $this
      */
     public function def($name, $default = null, $separator = null);
@@ -91,7 +92,7 @@ public function def($name, $default = null, $separator = null);
      * @param mixed   $value      Value to be joined.
      * @param string  $separator  Separator, defaults to '.'
      * @return $this
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function join($name, $value, $separator = '.');
 
@@ -121,7 +122,7 @@ public function joinDefaults($name, $value, $separator = '.');
      * @param array|object $value      Value to be joined.
      * @param string  $separator  Separator, defaults to '.'
      * @return array
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function getJoined($name, $value, $separator = '.');
 
@@ -166,28 +167,18 @@ public function raw();
      * If user password needs to be updated, new information will be saved.
      *
      * @param string $password Plaintext password.
-     *
      * @return bool
      */
     public function authenticate(string $password): bool;
 
-    /**
-     * Checks user authorization to the action.
-     *
-     * @param  string $action
-     * @param  string|null $scope
-     * @return bool
-     */
-    public function authorize(string $action, string $scope = null): bool;
-
     /**
      * Return media object for the User's avatar.
      *
      * Note: if there's no local avatar image for the user, you should call getAvatarUrl() to get the external avatar URL.
      *
-     * @return ImageMedium|null
+     * @return Medium|null
      */
-    public function getAvatarImage(): ?ImageMedium;
+    public function getAvatarImage(): ?Medium;
 
     /**
      * Return the User's avatar URL.
diff --git a/system/src/Grav/Common/User/Traits/UserTrait.php b/system/src/Grav/Common/User/Traits/UserTrait.php
index f711cc92be..91c41aa110 100644
--- a/system/src/Grav/Common/User/Traits/UserTrait.php
+++ b/system/src/Grav/Common/User/Traits/UserTrait.php
@@ -3,17 +3,28 @@
 /**
  * @package    Grav\Common\User
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common\User\Traits;
 
+use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
 use Grav\Common\Page\Medium\ImageMedium;
+use Grav\Common\Page\Medium\Medium;
+use Grav\Common\Page\Medium\StaticImageMedium;
 use Grav\Common\User\Authentication;
 use Grav\Common\Utils;
+use Multiavatar;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use function is_array;
+use function is_string;
 
+/**
+ * Trait UserTrait
+ * @package Grav\Common\User\Traits
+ */
 trait UserTrait
 {
     /**
@@ -63,15 +74,22 @@ public function authenticate(string $password): bool
      *
      * @param  string $action
      * @param  string|null $scope
-     * @return bool
+     * @return bool|null
      */
-    public function authorize(string $action, string $scope = null): bool
+    public function authorize(string $action, string $scope = null): ?bool
     {
+        // User needs to be enabled.
+        if ($this->get('state', 'enabled') !== 'enabled') {
+            return false;
+        }
+
+        // User needs to be logged in.
         if (!$this->get('authenticated')) {
             return false;
         }
 
-        if ($this->get('state', 'enabled') !== 'enabled') {
+        // User needs to be authorized (2FA).
+        if (strpos($action, 'login') === false && !$this->get('authorized', true)) {
             return false;
         }
 
@@ -107,19 +125,20 @@ public function authorize(string $action, string $scope = null): bool
      *
      * Note: if there's no local avatar image for the user, you should call getAvatarUrl() to get the external avatar URL.
      *
-     * @return ImageMedium|null
+     * @return ImageMedium|StaticImageMedium|null
      */
-    public function getAvatarImage(): ?ImageMedium
+    public function getAvatarImage(): ?Medium
     {
         $avatars = $this->get('avatar');
-        if (\is_array($avatars) && $avatars) {
+        if (is_array($avatars) && $avatars) {
             $avatar = array_shift($avatars);
 
             $media = $this->getMedia();
             $name = $avatar['name'] ?? null;
 
             $image = $name ? $media[$name] : null;
-            if ($image instanceof ImageMedium) {
+            if ($image instanceof ImageMedium ||
+                $image instanceof StaticImageMedium) {
                 return $image;
             }
         }
@@ -142,26 +161,69 @@ public function getAvatarUrl(): string
 
         // Try if avatar is a sting (URL).
         $avatar = $this->get('avatar');
-        if (\is_string($avatar)) {
+        if (is_string($avatar)) {
             return $avatar;
         }
 
         // Try looking for provider.
         $provider = $this->get('provider');
         $provider_options = $this->get($provider);
-        if (\is_array($provider_options)) {
-            if (isset($provider_options['avatar_url']) && \is_string($provider_options['avatar_url'])) {
+        if (is_array($provider_options)) {
+            if (isset($provider_options['avatar_url']) && is_string($provider_options['avatar_url'])) {
                 return $provider_options['avatar_url'];
             }
-            if (isset($provider_options['avatar']) && \is_string($provider_options['avatar'])) {
+            if (isset($provider_options['avatar']) && is_string($provider_options['avatar'])) {
                 return $provider_options['avatar'];
             }
         }
 
         $email = $this->get('email');
+        $avatar_generator = Grav::instance()['config']->get('system.accounts.avatar', 'multiavatar');
+        if ($avatar_generator === 'gravatar') {
+            if (!$email) {
+                return '';
+            }
+
+            $hash = md5(strtolower(trim($email)));
+
+            return 'https://www.gravatar.com/avatar/' . $hash;
+        }
+
+        $hash = $this->get('avatar_hash');
+        if (!$hash) {
+            $username = $this->get('username');
+            $hash = md5(strtolower(trim($email ?? $username)));
+        }
+
+        return $this->generateMultiavatar($hash);
+    }
+
+    /**
+     * @param string $hash
+     * @return string
+     */
+    protected function generateMultiavatar(string $hash): string
+    {
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+
+        $storage = $locator->findResource('image://multiavatar', true, true);
+        $avatar_file = "{$storage}/{$hash}.svg";
+
+        if (!file_exists($storage)) {
+            Folder::create($storage);
+        }
+
+        if (!file_exists($avatar_file)) {
+            $mavatar = new Multiavatar();
+
+            file_put_contents($avatar_file, $mavatar->generate($hash, null, null));
+        }
+
+        $avatar_url = $locator->findResource("image://multiavatar/{$hash}.svg", false, true);
+
+        return Utils::url($avatar_url);
 
-        // By default fall back to gravatar image.
-        return $email ? 'https://www.gravatar.com/avatar/' . md5(strtolower(trim($email))) : '';
     }
 
     abstract public function get($name, $default = null, $separator = null);
diff --git a/system/src/Grav/Common/User/User.php b/system/src/Grav/Common/User/User.php
index ba1dbdc324..b38c72e261 100644
--- a/system/src/Grav/Common/User/User.php
+++ b/system/src/Grav/Common/User/User.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common\User
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,7 +11,7 @@
 
 use Grav\Common\Grav;
 use Grav\Common\User\DataUser;
-use Grav\Common\User\FlexUser;
+use Grav\Common\Flex;
 use Grav\Common\User\Interfaces\UserCollectionInterface;
 use Grav\Common\User\Interfaces\UserInterface;
 
@@ -23,7 +23,7 @@
     /**
      * @deprecated 1.6 Use $grav['accounts'] instead of static calls. In type hints, please use UserInterface.
      */
-    class User extends FlexUser\User
+    class User extends Flex\Types\Users\UserObject
     {
         /**
          * Load user account.
@@ -31,7 +31,6 @@ class User extends FlexUser\User
          * Always creates user object. To check if user exists, use $this->exists().
          *
          * @param string $username
-         *
          * @return UserInterface
          * @deprecated 1.6 Use $grav['accounts']->load(...) instead.
          */
@@ -93,7 +92,6 @@ class User extends DataUser\User
          * Always creates user object. To check if user exists, use $this->exists().
          *
          * @param string $username
-         *
          * @return UserInterface
          * @deprecated 1.6 Use $grav['accounts']->load(...) instead.
          */
diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
index 56b2d891be..55e7f1dec8 100644
--- a/system/src/Grav/Common/Utils.php
+++ b/system/src/Grav/Common/Utils.php
@@ -3,22 +3,49 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use DateTime;
+use DateTimeZone;
+use Exception;
+use Grav\Common\Flex\Types\Pages\PageObject;
 use Grav\Common\Helpers\Truncator;
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Markdown\Parsedown;
 use Grav\Common\Markdown\ParsedownExtra;
 use Grav\Common\Page\Markdown\Excerpts;
+use Grav\Common\Page\Pages;
+use Grav\Framework\Flex\Flex;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use Grav\Framework\Media\Interfaces\MediaInterface;
+use InvalidArgumentException;
+use Negotiation\Accept;
+use Negotiation\Negotiator;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use function array_key_exists;
+use function array_slice;
+use function count;
+use function extension_loaded;
+use function function_exists;
+use function in_array;
+use function is_array;
+use function is_callable;
+use function is_string;
+use function strlen;
 
+/**
+ * Class Utils
+ * @package Grav\Common
+ */
 abstract class Utils
 {
+    /** @var array */
     protected static $nonces = [];
 
     protected const ROOTURL_REGEX = '{^((?:http[s]?:\/\/[^\/]+)|(?:\/\/[^\/]+))(.*)}';
@@ -31,11 +58,11 @@ abstract class Utils
      * @param string|object $input
      * @param bool $domain
      * @param bool $fail_gracefully
-     * @return bool|null|string
+     * @return string|false
      */
     public static function url($input, $domain = false, $fail_gracefully = false)
     {
-        if ((!is_string($input) && !method_exists($input, '__toString')) || !trim($input)) {
+        if ((!is_string($input) && !is_callable([$input, '__toString'])) || !trim($input)) {
             if ($fail_gracefully) {
                 $input = '/';
             } else {
@@ -54,7 +81,9 @@ public static function url($input, $domain = false, $fail_gracefully = false)
         /** @var Uri $uri */
         $uri = $grav['uri'];
 
+        $resource = false;
         if (static::contains((string)$input, '://')) {
+            // Url contains a scheme (https:// , user:// etc).
             /** @var UniformResourceLocator $locator */
             $locator = $grav['locator'];
 
@@ -85,7 +114,6 @@ public static function url($input, $domain = false, $fail_gracefully = false)
                         // Return location where the file would be if it was saved.
                         $resource = $locator->findResource("{$scheme}://{$host}{$path}", false, true);
                     }
-
                 } elseif ($host || $port) {
                     // If URL doesn't have scheme but has host or port, it is external.
                     return str_replace(' ', '%20', $input);
@@ -102,21 +130,28 @@ public static function url($input, $domain = false, $fail_gracefully = false)
                         $resource .= '#' . $parts['fragment'];
                     }
                 }
-
             } else {
                 // Not a valid URL (can still be a stream).
                 $resource = $locator->findResource($input, false);
             }
-
         } else {
-            $root = $uri->rootUrl();
+            // Just a path.
+            /** @var Pages $pages */
+            $pages = $grav['pages'];
+
+            // Is this a page?
+            $page = $pages->find($input, true);
+            if ($page && $page->routable()) {
+                return $page->url($domain);
+            }
 
-            if (static::startsWith($input, $root)) {
-                $input = static::replaceFirstOccurrence($root, '', $input);
+            $root = preg_quote($uri->rootUrl(), '#');
+            $pattern = '#(' . $root . '$|' . $root . '/)#';
+            if (!empty($root) && preg_match($pattern, $input, $matches)) {
+                $input = static::replaceFirstOccurrence($matches[0], '', $input);
             }
 
             $input = ltrim($input, '/');
-
             $resource = $input;
         }
 
@@ -126,16 +161,37 @@ public static function url($input, $domain = false, $fail_gracefully = false)
 
         $domain = $domain ?: $grav['config']->get('system.absolute_urls', false);
 
-        return rtrim($uri->rootUrl($domain), '/') . '/' . ($resource ?? '');
+        return rtrim($uri->rootUrl($domain), '/') . '/' . ($resource ?: '');
     }
 
+    /**
+     * Helper method to find the full path to a file, be it a stream, a relative path, or
+     * already a full path
+     *
+     * @param string $path
+     * @return string
+     */
+    public static function fullPath($path)
+    {
+        $locator = Grav::instance()['locator'];
+
+        if ($locator->isStream($path)) {
+            $path = $locator->findResource($path, true);
+        } elseif (!static::startsWith($path, GRAV_ROOT)) {
+            $base_url = Grav::instance()['base_url'];
+            $path = GRAV_ROOT . '/' . ltrim(static::replaceFirstOccurrence($base_url, '', $path), '/');
+        }
+
+        return $path;
+    }
+
+
     /**
      * Check if the $haystack string starts with the substring $needle
      *
-     * @param  string $haystack
-     * @param  string|string[] $needle
+     * @param string $haystack
+     * @param string|string[] $needle
      * @param bool $case_sensitive
-     *
      * @return bool
      */
     public static function startsWith($haystack, $needle, $case_sensitive = true)
@@ -157,10 +213,9 @@ public static function startsWith($haystack, $needle, $case_sensitive = true)
     /**
      * Check if the $haystack string ends with the substring $needle
      *
-     * @param  string $haystack
-     * @param  string|string[] $needle
+     * @param string $haystack
+     * @param string|string[] $needle
      * @param bool $case_sensitive
-     *
      * @return bool
      */
     public static function endsWith($haystack, $needle, $case_sensitive = true)
@@ -183,10 +238,9 @@ public static function endsWith($haystack, $needle, $case_sensitive = true)
     /**
      * Check if the $haystack string contains the substring $needle
      *
-     * @param  string $haystack
-     * @param  string|string[] $needle
-     * @param  bool $case_sensitive
-     *
+     * @param string $haystack
+     * @param string|string[] $needle
+     * @param bool $case_sensitive
      * @return bool
      */
     public static function contains($haystack, $needle, $case_sensitive = true)
@@ -219,14 +273,35 @@ public static function contains($haystack, $needle, $case_sensitive = true)
      * @param string $haystack
      * @return false|int
      */
-    public static function matchWildcard($wildcard_pattern, $haystack) {
+    public static function matchWildcard($wildcard_pattern, $haystack)
+    {
         $regex = str_replace(
             array("\*", "\?"), // wildcard chars
-            array('.*','.'),   // regexp chars
+            array('.*', '.'),   // regexp chars
             preg_quote($wildcard_pattern, '/')
         );
 
-        return preg_match('/^'.$regex.'$/is', $haystack);
+        return preg_match('/^' . $regex . '$/is', $haystack);
+    }
+
+    /**
+     * Render simple template filling up the variables in it. If value is not defined, leave it as it was.
+     *
+     * @param string $template Template string
+     * @param array $variables Variables with values
+     * @param array $brackets Optional array of opening and closing brackets or symbols
+     * @return string               Final string filled with values
+     */
+    public static function simpleTemplate(string $template, array $variables, array $brackets = ['{', '}']): string
+    {
+        $opening = $brackets[0] ?? '{';
+        $closing = $brackets[1] ?? '}';
+        $expression = '/' . preg_quote($opening, '/') . '(.*?)' . preg_quote($closing, '/') . '/';
+        $callback = static function ($match) use ($variables) {
+            return $variables[$match[1]] ?? $match[0];
+        };
+
+        return preg_replace_callback($expression, $callback, $template);
     }
 
     /**
@@ -285,8 +360,7 @@ public static function replaceLastOccurrence($search, $replace, $subject)
     {
         $pos = strrpos($subject, $search);
 
-        if($pos !== false)
-        {
+        if ($pos !== false) {
             $subject = static::mb_substr_replace($subject, $replace, $pos, mb_strlen($search));
         }
 
@@ -304,8 +378,8 @@ public static function replaceLastOccurrence($search, $replace, $subject)
      */
     public static function mb_substr_replace($original, $replacement, $position, $length)
     {
-        $startString = mb_substr($original, 0, $position, "UTF-8");
-        $endString = mb_substr($original, $position + $length, mb_strlen($original), "UTF-8");
+        $startString = mb_substr($original, 0, $position, 'UTF-8');
+        $endString = mb_substr($original, $position + $length, mb_strlen($original), 'UTF-8');
 
         return $startString . $replacement . $endString;
     }
@@ -313,8 +387,8 @@ public static function mb_substr_replace($original, $replacement, $position, $le
     /**
      * Merge two objects into one.
      *
-     * @param  object $obj1
-     * @param  object $obj2
+     * @param object $obj1
+     * @param object $obj2
      *
      * @return object
      */
@@ -323,13 +397,22 @@ public static function mergeObjects($obj1, $obj2)
         return (object)array_merge((array)$obj1, (array)$obj2);
     }
 
+    /**
+     * @param array $array
+     * @return bool
+     */
+    public static function isAssoc(array $array)
+    {
+        return (array_values($array) !== $array);
+    }
+
     /**
      * Lowercase an entire array. Useful when combined with `in_array()`
      *
      * @param array $a
      * @return array|false
      */
-    public static function arrayLower(Array $a)
+    public static function arrayLower(array $a)
     {
         return array_map('mb_strtolower', $a);
     }
@@ -337,13 +420,13 @@ public static function arrayLower(Array $a)
     /**
      * Simple function to remove item/s in an array by value
      *
-     * @param $search array
-     * @param $value string|array
+     * @param array $search
+     * @param string|array $value
      * @return array
      */
-    public static function arrayRemoveValue(Array $search, $value)
+    public static function arrayRemoveValue(array $search, $value)
     {
-        foreach ((array) $value as $val) {
+        foreach ((array)$value as $val) {
             $key = array_search($val, $search);
             if ($key !== false) {
                 unset($search[$key]);
@@ -409,8 +492,8 @@ public static function arrayDiffMultidimensional($array1, $array2)
     /**
      * Array combine but supports different array lengths
      *
-     * @param  array $arr1
-     * @param  array $arr2
+     * @param array $arr1
+     * @param array $arr2
      * @return array|false
      */
     public static function arrayCombine($arr1, $arr2)
@@ -423,7 +506,7 @@ public static function arrayCombine($arr1, $arr2)
     /**
      * Array is associative or not
      *
-     * @param  array $arr
+     * @param array $arr
      * @return bool
      */
     public static function arrayIsAssociative($arr)
@@ -442,18 +525,18 @@ public static function arrayIsAssociative($arr)
      */
     public static function dateFormats()
     {
-        $now = new \DateTime();
+        $now = new DateTime();
 
         $date_formats = [
-            'd-m-Y H:i' => 'd-m-Y H:i (e.g. '.$now->format('d-m-Y H:i').')',
-            'Y-m-d H:i' => 'Y-m-d H:i (e.g. '.$now->format('Y-m-d H:i').')',
-            'm/d/Y h:i a' => 'm/d/Y h:i a (e.g. '.$now->format('m/d/Y h:i a').')',
-            'H:i d-m-Y' => 'H:i d-m-Y (e.g. '.$now->format('H:i d-m-Y').')',
-            'h:i a m/d/Y' => 'h:i a m/d/Y (e.g. '.$now->format('h:i a m/d/Y').')',
-            ];
+            'd-m-Y H:i' => 'd-m-Y H:i (e.g. ' . $now->format('d-m-Y H:i') . ')',
+            'Y-m-d H:i' => 'Y-m-d H:i (e.g. ' . $now->format('Y-m-d H:i') . ')',
+            'm/d/Y h:i a' => 'm/d/Y h:i a (e.g. ' . $now->format('m/d/Y h:i a') . ')',
+            'H:i d-m-Y' => 'H:i d-m-Y (e.g. ' . $now->format('H:i d-m-Y') . ')',
+            'h:i a m/d/Y' => 'h:i a m/d/Y (e.g. ' . $now->format('h:i a m/d/Y') . ')',
+        ];
         $default_format = Grav::instance()['config']->get('system.pages.dateformat.default');
         if ($default_format) {
-            $date_formats = array_merge([$default_format => $default_format.' (e.g. '.$now->format($default_format).')'], $date_formats);
+            $date_formats = array_merge([$default_format => $default_format . ' (e.g. ' . $now->format($default_format) . ')'], $date_formats);
         }
 
         return $date_formats;
@@ -464,13 +547,13 @@ public static function dateFormats()
      *
      * @param string|null $default_format
      * @return string
-     * @throws \Exception
+     * @throws Exception
      */
     public static function dateNow($default_format = null)
     {
-        $now = new \DateTime();
+        $now = new DateTime();
 
-        if (is_null($default_format)) {
+        if (null === $default_format) {
             $default_format = Grav::instance()['config']->get('system.pages.dateformat.default');
         }
 
@@ -480,12 +563,11 @@ public static function dateNow($default_format = null)
     /**
      * Truncate text by number of characters but can cut off words.
      *
-     * @param  string $string
-     * @param  int    $limit       Max number of characters.
-     * @param  bool   $up_to_break truncate up to breakpoint after char count
-     * @param  string $break       Break point.
-     * @param  string $pad         Appended padding to the end of the string.
-     *
+     * @param string $string
+     * @param int $limit Max number of characters.
+     * @param bool $up_to_break truncate up to breakpoint after char count
+     * @param string $break Break point.
+     * @param string $pad Appended padding to the end of the string.
      * @return string
      */
     public static function truncate($string, $limit = 150, $up_to_break = false, $break = ' ', $pad = '&hellip;')
@@ -511,8 +593,7 @@ public static function truncate($string, $limit = 150, $up_to_break = false, $br
      * Truncate text by number of characters in a "word-safe" manor.
      *
      * @param string $string
-     * @param int    $limit
-     *
+     * @param int $limit
      * @return string
      */
     public static function safeTruncate($string, $limit = 150)
@@ -524,10 +605,9 @@ public static function safeTruncate($string, $limit = 150)
     /**
      * Truncate HTML by number of characters. not "word-safe"!
      *
-     * @param  string $text
-     * @param  int $length in characters
-     * @param  string $ellipsis
-     *
+     * @param string $text
+     * @param int $length in characters
+     * @param string $ellipsis
      * @return string
      */
     public static function truncateHtml($text, $length = 100, $ellipsis = '...')
@@ -538,10 +618,9 @@ public static function truncateHtml($text, $length = 100, $ellipsis = '...')
     /**
      * Truncate HTML by number of characters in a "word-safe" manor.
      *
-     * @param  string $text
-     * @param  int    $length in words
-     * @param  string $ellipsis
-     *
+     * @param string $text
+     * @param int $length in words
+     * @param string $ellipsis
      * @return string
      */
     public static function safeTruncateHtml($text, $length = 25, $ellipsis = '...')
@@ -553,7 +632,6 @@ public static function safeTruncateHtml($text, $length = 25, $ellipsis = '...')
      * Generate a random string of a given length
      *
      * @param int $length
-     *
      * @return string
      */
     public static function generateRandomString($length = 5)
@@ -561,29 +639,46 @@ public static function generateRandomString($length = 5)
         return substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, $length);
     }
 
+    /**
+     * Generates a random string with configurable length, prefix and suffix.
+     * Unlike the built-in `uniqid()`, this string is non-conflicting and safe
+     *
+     * @param int $length
+     * @param array $options
+     * @return string
+     * @throws Exception
+     */
+    public static function uniqueId(int $length = 13, array $options = []): string
+    {
+        $options = array_merge(['prefix' => '', 'suffix' => ''], $options);
+        $bytes = random_bytes(ceil($length / 2));
+
+        return $options['prefix'] . substr(bin2hex($bytes), 0, $length) . $options['suffix'];
+    }
+
     /**
      * Provides the ability to download a file to the browser
      *
      * @param string $file the full path to the file to be downloaded
      * @param bool $force_download as opposed to letting browser choose if to download or render
-     * @param int $sec      Throttling, try 0.1 for some speed throttling of downloads
-     * @param int $bytes    Size of chunks to send in bytes. Default is 1024
-     * @throws \Exception
+     * @param int $sec Throttling, try 0.1 for some speed throttling of downloads
+     * @param int $bytes Size of chunks to send in bytes. Default is 1024
+     * @param array $options Extra options: [mime, download_name, expires]
+     * @throws Exception
      */
-    public static function download($file, $force_download = true, $sec = 0, $bytes = 1024)
+    public static function download($file, $force_download = true, $sec = 0, $bytes = 1024, array $options = [])
     {
+        $grav = Grav::instance();
+
         if (file_exists($file)) {
             // fire download event
-            Grav::instance()->fireEvent('onBeforeDownload', new Event(['file' => $file]));
+            $grav->fireEvent('onBeforeDownload', new Event(['file' => $file, 'options' => &$options]));
 
-            $file_parts = pathinfo($file);
-            $mimetype = static::getMimeByExtension($file_parts['extension']);
-            $size   = filesize($file); // File size
+            $file_parts = static::pathinfo($file);
+            $mimetype = $options['mime'] ?? static::getMimeByExtension($file_parts['extension']);
+            $size = filesize($file); // File size
 
-            // clean all buffers
-            while (ob_get_level()) {
-                ob_end_clean();
-            }
+            $grav->cleanOutputBuffers();
 
             // required for IE, otherwise Content-Disposition may be ignored
             if (ini_get('zlib.output_compression')) {
@@ -595,14 +690,14 @@ public static function download($file, $force_download = true, $sec = 0, $bytes
 
             if ($force_download) {
                 // output the regular HTTP headers
-                header('Content-Disposition: attachment; filename="' . $file_parts['basename'] . '"');
+                header('Content-Disposition: attachment; filename="' . ($options['download_name'] ?? $file_parts['basename']) . '"');
             }
 
             // multipart-download and download resuming support
             if (isset($_SERVER['HTTP_RANGE'])) {
-                list($a, $range) = explode('=', $_SERVER['HTTP_RANGE'], 2);
-                list($range) = explode(',', $range, 2);
-                list($range, $range_end) = explode('-', $range);
+                [$a, $range] = explode('=', $_SERVER['HTTP_RANGE'], 2);
+                [$range] = explode(',', $range, 2);
+                [$range, $range_end] = explode('-', $range);
                 $range = (int)$range;
                 if (!$range_end) {
                     $range_end = $size - 1;
@@ -618,8 +713,8 @@ public static function download($file, $force_download = true, $sec = 0, $bytes
                 $new_length = $size;
                 header('Content-Length: ' . $size);
 
-                if (Grav::instance()['config']->get('system.cache.enabled')) {
-                    $expires = Grav::instance()['config']->get('system.pages.expires');
+                if ($grav['config']->get('system.cache.enabled')) {
+                    $expires = $options['expires'] ?? $grav['config']->get('system.pages.expires');
                     if ($expires > 0) {
                         $expires_date = gmdate('D, d M Y H:i:s T', time() + $expires);
                         header('Cache-Control: max-age=' . $expires);
@@ -630,8 +725,7 @@ public static function download($file, $force_download = true, $sec = 0, $bytes
 
                     // Return 304 Not Modified if the file is already cached in the browser
                     if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
-                        strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= filemtime($file))
-                    {
+                        strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= filemtime($file)) {
                         header('HTTP/1.1 304 Not Modified');
                         exit();
                     }
@@ -647,7 +741,7 @@ public static function download($file, $force_download = true, $sec = 0, $bytes
                 if ($range) {
                     fseek($fp, $range);
                 }
-                while (!feof($fp) && (!connection_aborted()) && ($bytes_send < $new_length) ) {
+                while (!feof($fp) && (!connection_aborted()) && ($bytes_send < $new_length)) {
                     $buffer = fread($fp, $chunksize);
                     echo($buffer); //echo($buffer); // is also possible
                     flush();
@@ -656,19 +750,51 @@ public static function download($file, $force_download = true, $sec = 0, $bytes
                 }
                 fclose($fp);
             } else {
-                throw new \RuntimeException('Error - can not open file.');
+                throw new RuntimeException('Error - can not open file.');
             }
 
             exit;
         }
     }
 
+    /**
+     * Returns the output render format, usually the extension provided in the URL. (e.g. `html`, `json`, `xml`, etc).
+     *
+     * @return string
+     */
+    public static function getPageFormat(): string
+    {
+        /** @var Uri $uri */
+        $uri = Grav::instance()['uri'];
+
+        // Set from uri extension
+        $uri_extension = $uri->extension();
+        if (is_string($uri_extension) && $uri->isValidExtension($uri_extension)) {
+            return ($uri_extension);
+        }
+
+        // Use content negotiation via the `accept:` header
+        $http_accept = $_SERVER['HTTP_ACCEPT'] ?? null;
+        if (is_string($http_accept)) {
+            $negotiator = new Negotiator();
+
+            $supported_types = static::getSupportPageTypes(['html', 'json']);
+            $priorities = static::getMimeTypes($supported_types);
+
+            $media_type = $negotiator->getBest($http_accept, $priorities);
+            $mimetype = $media_type instanceof Accept ? $media_type->getValue() : '';
+
+            return static::getExtensionByMime($mimetype);
+        }
+
+        return 'html';
+    }
+
     /**
      * Return the mimetype based on filename extension
      *
      * @param string $extension Extension of file (eg "txt")
      * @param string $default
-     *
      * @return string
      */
     public static function getMimeByExtension($extension, $default = 'application/octet-stream')
@@ -693,13 +819,7 @@ public static function getMimeByExtension($extension, $default = 'application/oc
 
         $media_types = Grav::instance()['config']->get('media.types');
 
-        if (isset($media_types[$extension])) {
-            if (isset($media_types[$extension]['mime'])) {
-                return $media_types[$extension]['mime'];
-            }
-        }
-
-        return $default;
+        return $media_types[$extension]['mime'] ?? $default;
     }
 
     /**
@@ -720,13 +840,37 @@ public static function getMimeTypes(array $extensions)
         return $mimetypes;
     }
 
+    /**
+     * Return all extensions for given mimetype. The first extension is the default one.
+     *
+     * @param string $mime Mime type (eg 'image/jpeg')
+     * @return string[] List of extensions eg. ['jpg', 'jpe', 'jpeg']
+     */
+    public static function getExtensionsByMime($mime)
+    {
+        $mime = strtolower($mime);
+
+        $media_types = (array)Grav::instance()['config']->get('media.types');
+
+        $list = [];
+        foreach ($media_types as $extension => $type) {
+            if ($extension === '' || $extension === 'defaults') {
+                continue;
+            }
+
+            if (isset($type['mime']) && $type['mime'] === $mime) {
+                $list[] = $extension;
+            }
+        }
+
+        return $list;
+    }
 
     /**
      * Return the mimetype based on filename extension
      *
      * @param string $mime mime type (eg "text/html")
      * @param string $default default value
-     *
      * @return string
      */
     public static function getExtensionByMime($mime, $default = 'html')
@@ -774,7 +918,7 @@ public static function getExtensions(array $mimetypes)
         $extensions = [];
         foreach ($mimetypes as $mimetype) {
             $extension = static::getExtensionByMime($mimetype, false);
-            if ($extension && !\in_array($extension, $extensions, true)) {
+            if ($extension && !in_array($extension, $extensions, true)) {
                 $extensions[] = $extension;
             }
         }
@@ -787,19 +931,18 @@ public static function getExtensions(array $mimetypes)
      *
      * @param string $filename Filename or path to file
      * @param string $default default value
-     *
      * @return string
      */
     public static function getMimeByFilename($filename, $default = 'application/octet-stream')
     {
-        return static::getMimeByExtension(pathinfo($filename, PATHINFO_EXTENSION), $default);
+        return static::getMimeByExtension(static::pathinfo($filename, PATHINFO_EXTENSION), $default);
     }
 
     /**
      * Return the mimetype based on existing local file
      *
      * @param string $filename Path to the file
-     *
+     * @param string $default
      * @return string|bool
      */
     public static function getMimeByLocalFile($filename, $default = 'application/octet-stream')
@@ -812,7 +955,7 @@ public static function getMimeByLocalFile($filename, $default = 'application/oct
         }
 
         // Prefer using finfo if it exists.
-        if (\extension_loaded('fileinfo')) {
+        if (extension_loaded('fileinfo')) {
             $finfo = finfo_open(FILEINFO_SYMLINK | FILEINFO_MIME_TYPE);
             $type = finfo_file($finfo, $filename);
             finfo_close($finfo);
@@ -837,11 +980,7 @@ public static function getMimeByLocalFile($filename, $default = 'application/oct
     public static function checkFilename($filename)
     {
         $dangerous_extensions = Grav::instance()['config']->get('security.uploads_dangerous_extensions', []);
-        array_walk($dangerous_extensions, function(&$val) {
-            $val = '.' . $val;
-        });
-
-        $extension = '.' . pathinfo($filename, PATHINFO_EXTENSION);
+        $extension = static::pathinfo($filename, PATHINFO_EXTENSION);
 
         return !(
             // Empty filenames are not allowed.
@@ -850,16 +989,55 @@ public static function checkFilename($filename)
             || strtr($filename, "\t\v\n\r\0\\/", '_______') !== $filename
             // Filename should not start or end with dot or space.
             || trim($filename, '. ') !== $filename
-            // Filename should not contain .php in it.
-            || static::contains($extension, $dangerous_extensions)
+            // File extension should not be part of configured dangerous extensions
+            || in_array($extension, $dangerous_extensions)
         );
     }
 
     /**
-     * Normalize path by processing relative `.` and `..` syntax and merging path
+     * Unicode-safe version of PHP’s pathinfo() function.
+     *
+     * @link  https://www.php.net/manual/en/function.pathinfo.php
+     *
+     * @param string $path
+     * @param int|null $flags
+     * @return array|string
+     */
+    public static function pathinfo($path, int $flags = null)
+    {
+        $path = str_replace(['%2F', '%5C'], ['/', '\\'], rawurlencode($path));
+
+        if (null === $flags) {
+            $info = pathinfo($path);
+        } else {
+            $info = pathinfo($path, $flags);
+        }
+
+        if (is_array($info)) {
+            return array_map('rawurldecode', $info);
+        }
+
+        return rawurldecode($info);
+    }
+
+    /**
+     * Unicode-safe version of the PHP basename() function.
+     *
+     * @link  https://www.php.net/manual/en/function.basename.php
      *
      * @param string $path
+     * @param string $suffix
+     * @return string
+     */
+    public static function basename($path, string $suffix = ''): string
+    {
+        return rawurldecode(basename(str_replace(['%2F', '%5C'], '/', rawurlencode($path)), $suffix));
+    }
+
+    /**
+     * Normalize path by processing relative `.` and `..` syntax and merging path
      *
+     * @param string $path
      * @return string
      */
     public static function normalizePath($path)
@@ -880,13 +1058,13 @@ public static function normalizePath($path)
         }
 
         // Strip off leading / to ensure explode is accurate
-        if (Utils::startsWith($path,'/')) {
+        if (static::startsWith($path, '/')) {
             $root .= '/';
             $path = ltrim($path, '/');
         }
 
         // If there are any relative paths (..) handle those
-        if (Utils::contains($path, '..')) {
+        if (static::contains($path, '..')) {
             $segments = explode('/', trim($path, '/'));
             $ret = [];
             foreach ($segments as $segment) {
@@ -904,19 +1082,44 @@ public static function normalizePath($path)
 
         // Stick everything back together
         $normalized = $root . $path;
+
         return $normalized;
     }
 
     /**
-     * Check whether a function is disabled in the PHP settings
+     * Check whether a function exists.
+     *
+     * Disabled functions count as non-existing functions, just like in PHP 8+.
      *
      * @param string $function the name of the function to check
+     * @return bool
+     */
+    public static function functionExists($function): bool
+    {
+        if (!function_exists($function)) {
+            return false;
+        }
+
+        // In PHP 7 we need to also exclude disabled methods.
+        return !static::isFunctionDisabled($function);
+    }
+
+    /**
+     * Check whether a function is disabled in the PHP settings
      *
+     * @param string $function the name of the function to check
      * @return bool
      */
-    public static function isFunctionDisabled($function)
+    public static function isFunctionDisabled($function): bool
     {
-        return \in_array($function, explode(',', ini_get('disable_functions')), true);
+        static $list;
+
+        if (null === $list) {
+            $str = trim(ini_get('disable_functions') . ',' . ini_get('suhosin.executor.func.blacklist'), ',');
+            $list = $str ? array_flip(preg_split('/\s*,\s*/', $str)) : [];
+        }
+
+        return array_key_exists($function, $list);
     }
 
     /**
@@ -926,12 +1129,12 @@ public static function isFunctionDisabled($function)
      */
     public static function timezones()
     {
-        $timezones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL);
+        $timezones = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
         $offsets = [];
-        $testDate = new \DateTime();
+        $testDate = new DateTime();
 
         foreach ($timezones as $zone) {
-            $tz = new \DateTimeZone($zone);
+            $tz = new DateTimeZone($zone);
             $offsets[$zone] = $tz->getOffset($testDate);
         }
 
@@ -944,7 +1147,7 @@ public static function timezones()
 
             $pretty_offset = "UTC${offset_prefix}${offset_formatted}";
 
-            $timezone_list[$timezone] = "(${pretty_offset}) ".str_replace('_', ' ', $timezone);
+            $timezone_list[$timezone] = "(${pretty_offset}) " . str_replace('_', ' ', $timezone);
         }
 
         return $timezone_list;
@@ -953,12 +1156,11 @@ public static function timezones()
     /**
      * Recursively filter an array, filtering values by processing them through the $fn function argument
      *
-     * @param array    $source the Array to filter
-     * @param callable $fn     the function to pass through each array item
-     *
+     * @param array $source the Array to filter
+     * @param callable $fn the function to pass through each array item
      * @return array
      */
-    public static function arrayFilterRecursive(Array $source, $fn)
+    public static function arrayFilterRecursive(array $source, $fn)
     {
         $result = [];
         foreach ($source as $key => $value) {
@@ -975,6 +1177,29 @@ public static function arrayFilterRecursive(Array $source, $fn)
         return $result;
     }
 
+    /**
+     * Flatten a multi-dimensional associative array into query params.
+     *
+     * @param array $array
+     * @param string $prepend
+     * @return array
+     */
+    public static function arrayToQueryParams($array, $prepend = '')
+    {
+        $results = [];
+        foreach ($array as $key => $value) {
+            $name = $prepend ? $prepend . '[' . $key . ']' : $key;
+
+            if (is_array($value)) {
+                $results = array_merge($results, static::arrayToQueryParams($value, $name));
+            } else {
+                $results[$name] = $value;
+            }
+        }
+
+        return $results;
+    }
+
     /**
      * Flatten an array
      *
@@ -983,7 +1208,7 @@ public static function arrayFilterRecursive(Array $source, $fn)
      */
     public static function arrayFlatten($array)
     {
-        $flatten = array();
+        $flatten = [];
         foreach ($array as $key => $inner) {
             if (is_array($inner)) {
                 foreach ($inner as $inner_key => $value) {
@@ -1000,8 +1225,8 @@ public static function arrayFlatten($array)
     /**
      * Flatten a multi-dimensional associative array into dot notation
      *
-     * @param  array   $array
-     * @param  string  $prepend
+     * @param array $array
+     * @param string $prepend
      * @return array
      */
     public static function arrayFlattenDotNotation($array, $prepend = '')
@@ -1009,9 +1234,9 @@ public static function arrayFlattenDotNotation($array, $prepend = '')
         $results = array();
         foreach ($array as $key => $value) {
             if (is_array($value)) {
-                $results = array_merge($results, static::arrayFlattenDotNotation($value, $prepend.$key.'.'));
+                $results = array_merge($results, static::arrayFlattenDotNotation($value, $prepend . $key . '.'));
             } else {
-                $results[$prepend.$key] = $value;
+                $results[$prepend . $key] = $value;
             }
         }
 
@@ -1019,7 +1244,17 @@ public static function arrayFlattenDotNotation($array, $prepend = '')
     }
 
     /**
-     * Opposite of flatten, convert flat dot notation array to multi dimensional array
+     * Opposite of flatten, convert flat dot notation array to multi dimensional array.
+     *
+     * If any of the parent has a scalar value, all children get ignored:
+     *
+     * admin.pages=true
+     * admin.pages.read=true
+     *
+     * becomes
+     *
+     * admin:
+     *   pages: true
      *
      * @param array $array
      * @param string $separator
@@ -1030,14 +1265,26 @@ public static function arrayUnflattenDotNotation($array, $separator = '.')
         $newArray = [];
         foreach ($array as $key => $value) {
             $dots = explode($separator, $key);
-            if (\count($dots) > 1) {
+            if (count($dots) > 1) {
                 $last = &$newArray[$dots[0]];
                 foreach ($dots as $k => $dot) {
                     if ($k === 0) {
                         continue;
                     }
+
+                    // Cannot use a scalar value as an array
+                    if (null !== $last && !is_array($last)) {
+                        continue 2;
+                    }
+
                     $last = &$last[$dot];
                 }
+
+                // Cannot use a scalar value as an array
+                if (null !== $last && !is_array($last)) {
+                    continue;
+                }
+
                 $last = $value;
             } else {
                 $newArray[$key] = $value;
@@ -1063,7 +1310,6 @@ public static function pathPrefixedByLangCode($string)
         if (count($parts) > 0 && in_array($parts[0], $languages_enabled)) {
             return $parts[0];
         }
-
         return false;
     }
 
@@ -1072,7 +1318,7 @@ public static function pathPrefixedByLangCode($string)
      *
      * @param string $date a String expressed in the system.pages.dateformat.default format, with fallback to a
      *                     strtotime argument
-     * @param string $format a date format to use if possible
+     * @param string|null $format a date format to use if possible
      * @return int the timestamp
      */
     public static function date2timestamp($date, $format = null)
@@ -1082,9 +1328,9 @@ public static function date2timestamp($date, $format = null)
 
         // try to use DateTime and default format
         if ($dateformat) {
-            $datetime = \DateTime::createFromFormat($dateformat, $date);
+            $datetime = DateTime::createFromFormat($dateformat, $date);
         } else {
-            $datetime = new \DateTime($date);
+            $datetime = new DateTime($date);
         }
 
         // fallback to strtotime() if DateTime approach failed
@@ -1111,25 +1357,34 @@ public static function resolve(array $array, $path, $default = null)
     }
 
     /**
-     * Checks if a value is positive
+     * Checks if a value is positive (true)
      *
      * @param string $value
-     *
-     * @return boolean
+     * @return bool
      */
     public static function isPositive($value)
     {
         return in_array($value, [true, 1, '1', 'yes', 'on', 'true'], true);
     }
 
+    /**
+     * Checks if a value is negative (false)
+     *
+     * @param string $value
+     * @return bool
+     */
+    public static function isNegative($value)
+    {
+        return in_array($value, [false, 0, '0', 'no', 'off', 'false'], true);
+    }
+
     /**
      * Generates a nonce string to be hashed. Called by self::getNonce()
      * We removed the IP portion in this version because it causes too many inconsistencies
      * with reverse proxy setups.
      *
      * @param string $action
-     * @param bool   $previousTick if true, generates the token for the previous tick (the previous 12 hours)
-     *
+     * @param bool $previousTick if true, generates the token for the previous tick (the previous 12 hours)
      * @return string the nonce string
      */
     private static function generateNonceString($action, $previousTick = false)
@@ -1166,9 +1421,8 @@ private static function nonceTick()
      * Creates a hashed nonce tied to the passed action. Tied to the current user and time. The nonce for a given
      * action is the same for 12 hours.
      *
-     * @param string $action      the action the nonce is tied to (e.g. save-user-admin or move-page-homepage)
-     * @param bool   $previousTick if true, generates the token for the previous tick (the previous 12 hours)
-     *
+     * @param string $action the action the nonce is tied to (e.g. save-user-admin or move-page-homepage)
+     * @param bool $previousTick if true, generates the token for the previous tick (the previous 12 hours)
      * @return string the nonce
      */
     public static function getNonce($action, $previousTick = false)
@@ -1186,9 +1440,8 @@ public static function getNonce($action, $previousTick = false)
     /**
      * Verify the passed nonce for the give action
      *
-     * @param string|string[] $nonce  the nonce to verify
+     * @param string|string[] $nonce the nonce to verify
      * @param string $action the action to verify the nonce to
-     *
      * @return boolean verified or not
      */
     public static function verifyNonce($nonce, $action)
@@ -1204,9 +1457,7 @@ public static function verifyNonce($nonce, $action)
         }
 
         //Nonce generated 12-24 hours ago
-        $previousTick = true;
-
-        return $nonce === self::getNonce($action, $previousTick);
+        return $nonce === self::getNonce($action, true);
     }
 
     /**
@@ -1216,18 +1467,14 @@ public static function verifyNonce($nonce, $action)
      */
     public static function isAdminPlugin()
     {
-        if (isset(Grav::instance()['admin'])) {
-            return true;
-        }
-
-        return false;
+        return isset(Grav::instance()['admin']);
     }
 
     /**
      * Get a portion of an array (passed by reference) with dot-notation key
      *
      * @param array $array
-     * @param string|int $key
+     * @param string|int|null $key
      * @param null $default
      * @return mixed
      */
@@ -1256,10 +1503,10 @@ public static function getDotNotation($array, $key, $default = null)
      * Set portion of array (passed by reference) for a dot-notation key
      * and set the value
      *
-     * @param array      $array
-     * @param string|int $key
-     * @param mixed      $value
-     * @param bool       $merge
+     * @param array $array
+     * @param string|int|null $key
+     * @param mixed $value
+     * @param bool $merge
      *
      * @return mixed
      */
@@ -1274,8 +1521,7 @@ public static function setDotNotation(&$array, $key, $value, $merge = false)
         while (count($keys) > 1) {
             $key = array_shift($keys);
 
-            if ( ! isset($array[$key]) || ! is_array($array[$key]))
-            {
+            if (!isset($array[$key]) || !is_array($array[$key])) {
                 $array[$key] = array();
             }
 
@@ -1308,7 +1554,8 @@ public static function isWindows()
      *
      * @return bool
      */
-    public static function isApache() {
+    public static function isApache()
+    {
         return isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false;
     }
 
@@ -1321,7 +1568,7 @@ public static function isApache() {
      */
     public static function sortArrayByArray(array $array, array $orderArray)
     {
-        $ordered = array();
+        $ordered = [];
         foreach ($orderArray as $key) {
             if (array_key_exists($key, $array)) {
                 $ordered[$key] = $array[$key];
@@ -1358,58 +1605,136 @@ public static function sortArrayByKey($array, $array_key, $direction = SORT_DESC
     }
 
     /**
-     * Get path based on a token
+     * Get relative page path based on a token.
      *
      * @param string $path
      * @param PageInterface|null $page
      * @return string
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public static function getPagePathFromToken($path, PageInterface $page = null)
     {
-        $path_parts = pathinfo($path);
-        $grav       = Grav::instance();
+        return static::getPathFromToken($path, $page);
+    }
 
-        $basename = '';
-        if (isset($path_parts['extension'])) {
-            $basename = '/' . $path_parts['basename'];
-            $path     = rtrim($path_parts['dirname'], ':');
+    /**
+     * Get relative path based on a token.
+     *
+     * Path supports following syntaxes:
+     *
+     * 'self@', 'self@/path'
+     * 'page@:/route', 'page@:/route/filename.ext'
+     * 'theme@:', 'theme@:/path'
+     *
+     * @param string $path
+     * @param FlexObjectInterface|PageInterface|null $object
+     * @return string
+     * @throws RuntimeException
+     */
+    public static function getPathFromToken($path, $object = null)
+    {
+        $matches = static::resolveTokenPath($path);
+        if (null === $matches) {
+            return $path;
         }
 
-        $regex = '/(@self|self@)|((?:@page|page@):(?:.*))|((?:@theme|theme@):(?:.*))/';
-        preg_match($regex, $path, $matches);
+        $grav = Grav::instance();
 
-        if ($matches) {
-            if ($matches[1]) {
-                if (null === $page) {
-                    throw new \RuntimeException('Page not available for this self@ reference');
+        switch ($matches[0]) {
+            case 'self':
+                if (!$object instanceof MediaInterface) {
+                    throw new RuntimeException(sprintf('Page not available for self@ reference: %s', $path));
+                }
+
+                if ($matches[2] === '') {
+                    if ($object->exists()) {
+                        $route = '/' . $matches[1];
+
+                        if ($object instanceof PageInterface) {
+                            return trim($object->relativePagePath() . $route, '/');
+                        }
+
+                        $folder = $object->getMediaFolder();
+                        if ($folder) {
+                            return trim($folder . $route, '/');
+                        }
+                    } else {
+                        return '';
+                    }
+                }
+
+                break;
+            case 'page':
+                if ($matches[1] === '') {
+                    $route = '/' . $matches[2];
+
+                    // Exclude filename from the page lookup.
+                    if (static::pathinfo($route, PATHINFO_EXTENSION)) {
+                        $basename = '/' . static::basename($route);
+                        $route = \dirname($route);
+                    } else {
+                        $basename = '';
+                    }
+
+                    $key = trim($route === '/' ? $grav['config']->get('system.home.alias') : $route, '/');
+                    if ($object instanceof PageObject) {
+                        $object = $object->getFlexDirectory()->getObject($key);
+                    } elseif (static::isAdminPlugin()) {
+                        /** @var Flex|null $flex */
+                        $flex = $grav['flex'] ?? null;
+                        $object = $flex ? $flex->getObject($key, 'pages') : null;
+                    } else {
+                        /** @var Pages $pages */
+                        $pages = $grav['pages'];
+                        $object = $pages->find($route);
+                    }
+
+                    if ($object instanceof PageInterface) {
+                        return trim($object->relativePagePath() . $basename, '/');
+                    }
+                }
+
+                break;
+            case 'theme':
+                if ($matches[1] === '') {
+                    $route = '/' . $matches[2];
+                    $theme = $grav['locator']->findResource('theme://', false);
+                    if (false !== $theme) {
+                        return trim($theme . $route, '/');
+                    }
                 }
-            } elseif ($matches[2]) {
-                // page@
-                $parts = explode(':', $path);
-                $route = $parts[1];
-                $page  = $grav['page']->find($route);
-            } elseif ($matches[3]) {
-                // theme@
-                $parts = explode(':', $path);
-                $route = $parts[1];
-                $theme = str_replace(ROOT_DIR, '', $grav['locator']->findResource("theme://"));
-
-                return $theme . $route . $basename;
-            }
-        } else {
-            return $path . $basename;
-        }
 
-        if (!$page) {
-            throw new \RuntimeException('Page route not found: ' . $path);
+                break;
         }
 
-        $path = str_replace($matches[0], rtrim($page->relativePagePath(), '/'), $path);
+        throw new RuntimeException(sprintf('Token path not found: %s', $path));
+    }
+
+    /**
+     * Returns [token, route, path] from '@token/route:/path'. Route and path are optional. If pattern does not match, return null.
+     *
+     * @param string $path
+     * @return string[]|null
+     */
+    protected static function resolveTokenPath(string $path): ?array
+    {
+        if (strpos($path, '@') !== false) {
+            $regex = '/^(@\w+|\w+@|@\w+@)([^:]*)(.*)$/u';
+            if (preg_match($regex, $path, $matches)) {
+                return [
+                    trim($matches[1], '@'),
+                    trim($matches[2], '/'),
+                    trim($matches[3], ':/')
+                ];
+            }
+        }
 
-        return $path . $basename;
+        return null;
     }
 
+    /**
+     * @return int
+     */
     public static function getUploadLimit()
     {
         static $max_size = -1;
@@ -1437,7 +1762,6 @@ public static function getUploadLimit()
      * @param int $bytes The filesize in Bytes.
      * @param string $to The unit type to convert to. Accepts K, M, or G for Kilobytes, Megabytes, or Gigabytes, respectively.
      * @param int $decimal_places The number of decimal places to return.
-     *
      * @return int Returns only the number of units, not the type letter. Returns 0 if the $to unit type is out of scope.
      *
      */
@@ -1476,19 +1800,19 @@ public static function prettySize($bytes, $precision = 2)
     /**
      * Parse a readable file size and return a value in bytes
      *
-     * @param string|int $size
+     * @param string|int|float $size
      * @return int
      */
     public static function parseSize($size)
     {
         $unit = preg_replace('/[^bkmgtpezy]/i', '', $size);
-        $size = preg_replace('/[^0-9\.]/', '', $size);
+        $size = (float)preg_replace('/[^0-9\.]/', '', $size);
 
         if ($unit) {
-            $size = $size * pow(1024, stripos('bkmgtpezy', $unit[0]));
+            $size *= 1024 ** stripos('bkmgtpezy', $unit[0]);
         }
 
-        return (int) abs(round($size));
+        return (int)abs(round($size));
     }
 
     /**
@@ -1496,13 +1820,13 @@ public static function parseSize($size)
      *
      * @param string $url
      * @return array
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function multibyteParseUrl($url)
     {
         $enc_url = preg_replace_callback(
             '%[^:/@?&=#]+%usD',
-            function ($matches) {
+            static function ($matches) {
                 return urlencode($matches[0]);
             },
             $url
@@ -1510,11 +1834,11 @@ function ($matches) {
 
         $parts = parse_url($enc_url);
 
-        if($parts === false) {
-            throw new \InvalidArgumentException('Malformed URL: ' . $url);
+        if ($parts === false) {
+            throw new InvalidArgumentException('Malformed URL: ' . $url);
         }
 
-        foreach($parts as $name => $value) {
+        foreach ($parts as $name => $value) {
             $parts[$name] = urldecode($value);
         }
 
@@ -1525,16 +1849,15 @@ function ($matches) {
      * Process a string as markdown
      *
      * @param string $string
-     *
      * @param bool $block Block or Line processing
-     * @param null $page
+     * @param PageInterface|null $page
      * @return string
-     * @throws \Exception
+     * @throws Exception
      */
     public static function processMarkdown($string, $block = true, $page = null)
     {
         $grav = Grav::instance();
-        $page     = $page ?? $grav['page'] ?? null;
+        $page = $page ?? $grav['page'] ?? null;
         $defaults = [
             'markdown' => $grav['config']->get('system.pages.markdown', []),
             'images' => $grav['config']->get('system.images', [])
@@ -1564,7 +1887,6 @@ public static function processMarkdown($string, $block = true, $page = null)
      *
      * @param string $ip
      * @param int $prefix
-     *
      * @return string
      */
     public static function getSubnet($ip, $prefix = 64)
@@ -1574,21 +1896,28 @@ public static function getSubnet($ip, $prefix = 64)
         }
 
         // Packed representation of IP
-        $ip = inet_pton($ip);
+        $ip = (string)inet_pton($ip);
 
         // Maximum netmask length = same as packed address
-        $len = 8*strlen($ip);
-        if ($prefix > $len) $prefix = $len;
+        $len = 8 * strlen($ip);
+        if ($prefix > $len) {
+            $prefix = $len;
+        }
 
-        $mask  = str_repeat('f', $prefix>>2);
+        $mask = str_repeat('f', $prefix >> 2);
 
-        switch($prefix & 3)
-        {
-            case 3: $mask .= 'e'; break;
-            case 2: $mask .= 'c'; break;
-            case 1: $mask .= '8'; break;
+        switch ($prefix & 3) {
+            case 3:
+                $mask .= 'e';
+                break;
+            case 2:
+                $mask .= 'c';
+                break;
+            case 1:
+                $mask .= '8';
+                break;
         }
-        $mask = str_pad($mask, $len>>2, '0');
+        $mask = str_pad($mask, $len >> 2, '0');
 
         // Packed representation of netmask
         $mask = pack('H*', $mask);
@@ -1602,11 +1931,14 @@ public static function getSubnet($ip, $prefix = 64)
      * Wrapper to ensure html, htm in the front of the supported page types
      *
      * @param array|null $defaults
-     * @return array|mixed
+     * @return array
      */
     public static function getSupportPageTypes(array $defaults = null)
     {
         $types = Grav::instance()['config']->get('system.pages.types', $defaults);
+        if (!is_array($types)) {
+            return [];
+        }
 
         // remove html/htm
         $types = static::arrayRemoveValue($types, ['html', 'htm']);
@@ -1616,4 +1948,244 @@ public static function getSupportPageTypes(array $defaults = null)
 
         return $types;
     }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public static function isDangerousFunction(string $name): bool
+    {
+        static $commandExecutionFunctions = [
+            'exec',
+            'passthru',
+            'system',
+            'shell_exec',
+            'popen',
+            'proc_open',
+            'pcntl_exec',
+        ];
+
+        static $codeExecutionFunctions = [
+            'assert',
+            'preg_replace',
+            'create_function',
+            'include',
+            'include_once',
+            'require',
+            'require_once'
+        ];
+
+        static $callbackFunctions = [
+            'ob_start' => 0,
+            'array_diff_uassoc' => -1,
+            'array_diff_ukey' => -1,
+            'array_filter' => 1,
+            'array_intersect_uassoc' => -1,
+            'array_intersect_ukey' => -1,
+            'array_map' => 0,
+            'array_reduce' => 1,
+            'array_udiff_assoc' => -1,
+            'array_udiff_uassoc' => [-1, -2],
+            'array_udiff' => -1,
+            'array_uintersect_assoc' => -1,
+            'array_uintersect_uassoc' => [-1, -2],
+            'array_uintersect' => -1,
+            'array_walk_recursive' => 1,
+            'array_walk' => 1,
+            'assert_options' => 1,
+            'uasort' => 1,
+            'uksort' => 1,
+            'usort' => 1,
+            'preg_replace_callback' => 1,
+            'spl_autoload_register' => 0,
+            'iterator_apply' => 1,
+            'call_user_func' => 0,
+            'call_user_func_array' => 0,
+            'register_shutdown_function' => 0,
+            'register_tick_function' => 0,
+            'set_error_handler' => 0,
+            'set_exception_handler' => 0,
+            'session_set_save_handler' => [0, 1, 2, 3, 4, 5],
+            'sqlite_create_aggregate' => [2, 3],
+            'sqlite_create_function' => 2,
+        ];
+
+        static $informationDiscosureFunctions = [
+            'phpinfo',
+            'posix_mkfifo',
+            'posix_getlogin',
+            'posix_ttyname',
+            'getenv',
+            'get_current_user',
+            'proc_get_status',
+            'get_cfg_var',
+            'disk_free_space',
+            'disk_total_space',
+            'diskfreespace',
+            'getcwd',
+            'getlastmo',
+            'getmygid',
+            'getmyinode',
+            'getmypid',
+            'getmyuid'
+        ];
+
+        static $otherFunctions = [
+            'extract',
+            'parse_str',
+            'putenv',
+            'ini_set',
+            'mail',
+            'header',
+            'proc_nice',
+            'proc_terminate',
+            'proc_close',
+            'pfsockopen',
+            'fsockopen',
+            'apache_child_terminate',
+            'posix_kill',
+            'posix_mkfifo',
+            'posix_setpgid',
+            'posix_setsid',
+            'posix_setuid',
+        ];
+
+        if (in_array($name, $commandExecutionFunctions)) {
+            return true;
+        }
+
+        if (in_array($name, $codeExecutionFunctions)) {
+            return true;
+        }
+
+        if (isset($callbackFunctions[$name])) {
+            return true;
+        }
+
+        if (in_array($name, $informationDiscosureFunctions)) {
+            return true;
+        }
+
+        if (in_array($name, $otherFunctions)) {
+            return true;
+        }
+
+        return static::isFilesystemFunction($name);
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public static function isFilesystemFunction(string $name): bool
+    {
+        static $fileWriteFunctions = [
+            'fopen',
+            'tmpfile',
+            'bzopen',
+            'gzopen',
+            // write to filesystem (partially in combination with reading)
+            'chgrp',
+            'chmod',
+            'chown',
+            'copy',
+            'file_put_contents',
+            'lchgrp',
+            'lchown',
+            'link',
+            'mkdir',
+            'move_uploaded_file',
+            'rename',
+            'rmdir',
+            'symlink',
+            'tempnam',
+            'touch',
+            'unlink',
+            'imagepng',
+            'imagewbmp',
+            'image2wbmp',
+            'imagejpeg',
+            'imagexbm',
+            'imagegif',
+            'imagegd',
+            'imagegd2',
+            'iptcembed',
+            'ftp_get',
+            'ftp_nb_get',
+        ];
+
+        static $fileContentFunctions = [
+            'file_get_contents',
+            'file',
+            'filegroup',
+            'fileinode',
+            'fileowner',
+            'fileperms',
+            'glob',
+            'is_executable',
+            'is_uploaded_file',
+            'parse_ini_file',
+            'readfile',
+            'readlink',
+            'realpath',
+            'gzfile',
+            'readgzfile',
+            'stat',
+            'imagecreatefromgif',
+            'imagecreatefromjpeg',
+            'imagecreatefrompng',
+            'imagecreatefromwbmp',
+            'imagecreatefromxbm',
+            'imagecreatefromxpm',
+            'ftp_put',
+            'ftp_nb_put',
+            'hash_update_file',
+            'highlight_file',
+            'show_source',
+            'php_strip_whitespace',
+        ];
+
+        static $filesystemFunctions = [
+            // read from filesystem
+            'file_exists',
+            'fileatime',
+            'filectime',
+            'filemtime',
+            'filesize',
+            'filetype',
+            'is_dir',
+            'is_file',
+            'is_link',
+            'is_readable',
+            'is_writable',
+            'is_writeable',
+            'linkinfo',
+            'lstat',
+            //'pathinfo',
+            'getimagesize',
+            'exif_read_data',
+            'read_exif_data',
+            'exif_thumbnail',
+            'exif_imagetype',
+            'hash_file',
+            'hash_hmac_file',
+            'md5_file',
+            'sha1_file',
+            'get_meta_tags',
+        ];
+
+        if (in_array($name, $fileWriteFunctions)) {
+            return true;
+        }
+
+        if (in_array($name, $fileContentFunctions)) {
+            return true;
+        }
+
+        if (in_array($name, $filesystemFunctions)) {
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/system/src/Grav/Common/Yaml.php b/system/src/Grav/Common/Yaml.php
index ad6d81b07a..0758599dc0 100644
--- a/system/src/Grav/Common/Yaml.php
+++ b/system/src/Grav/Common/Yaml.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,11 +11,19 @@
 
 use Grav\Framework\File\Formatter\YamlFormatter;
 
+/**
+ * Class Yaml
+ * @package Grav\Common
+ */
 abstract class Yaml
 {
-    /** @var YamlFormatter */
-    private static $yaml;
+    /** @var YamlFormatter|null */
+    protected static $yaml;
 
+    /**
+     * @param string $data
+     * @return array
+     */
     public static function parse($data)
     {
         if (null === static::$yaml) {
@@ -25,6 +33,12 @@ public static function parse($data)
         return static::$yaml->decode($data);
     }
 
+    /**
+     * @param array $data
+     * @param int|null $inline
+     * @param int|null $indent
+     * @return string
+     */
     public static function dump($data, $inline = null, $indent = null)
     {
         if (null === static::$yaml) {
@@ -34,7 +48,10 @@ public static function dump($data, $inline = null, $indent = null)
         return static::$yaml->encode($data, $inline, $indent);
     }
 
-    private static function init()
+    /**
+     * @return void
+     */
+    protected static function init()
     {
         $config = [
             'inline' => 5,
diff --git a/system/src/Grav/Console/Application/Application.php b/system/src/Grav/Console/Application/Application.php
new file mode 100644
index 0000000000..873b94e4f4
--- /dev/null
+++ b/system/src/Grav/Console/Application/Application.php
@@ -0,0 +1,138 @@
+<?php
+
+/**
+ * @package    Grav\Console
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Console\Application;
+
+use Grav\Common\Grav;
+use Symfony\Component\Console\ConsoleEvents;
+use Symfony\Component\Console\Event\ConsoleCommandEvent;
+use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+
+/**
+ * Class GpmApplication
+ * @package Grav\Console\Application
+ */
+class Application extends \Symfony\Component\Console\Application
+{
+    /** @var string|null */
+    protected $environment;
+    /** @var string|null */
+    protected $language;
+    /** @var bool */
+    protected $initialized = false;
+
+    /**
+     * PluginApplication constructor.
+     * @param string $name
+     * @param string $version
+     */
+    public function __construct(string $name = 'UNKNOWN', string $version = 'UNKNOWN')
+    {
+        parent::__construct($name, $version);
+
+        // Add listener to prepare environment.
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addListener(ConsoleEvents::COMMAND, [$this, 'prepareEnvironment']);
+
+        $this->setDispatcher($dispatcher);
+    }
+
+    /**
+     * @param InputInterface $input
+     * @return string|null
+     */
+    public function getCommandName(InputInterface $input): ?string
+    {
+        if ($input->hasParameterOption('--env', true)) {
+            $this->environment = $input->getParameterOption('--env');
+        }
+        if ($input->hasParameterOption('--lang', true)) {
+            $this->language = $input->getParameterOption('--lang');
+        }
+
+        $this->init();
+
+        return parent::getCommandName($input);
+    }
+
+    /**
+     * @param ConsoleCommandEvent $event
+     * @return void
+     */
+    public function prepareEnvironment(ConsoleCommandEvent $event): void
+    {
+    }
+
+    /**
+     * @return void
+     */
+    protected function init(): void
+    {
+        if ($this->initialized) {
+            return;
+        }
+
+        $this->initialized = true;
+
+        $grav = Grav::instance();
+        $grav->setup($this->environment);
+    }
+
+    /**
+     * Add global --env and --lang options.
+     *
+     * @return InputDefinition
+     */
+    protected function getDefaultInputDefinition(): InputDefinition
+    {
+        $inputDefinition = parent::getDefaultInputDefinition();
+        $inputDefinition->addOption(
+            new InputOption(
+                '--env',
+                '',
+                InputOption::VALUE_OPTIONAL,
+                'Use environment configuration (defaults to localhost)'
+            )
+        );
+        $inputDefinition->addOption(
+            new InputOption(
+                '--lang',
+                '',
+                InputOption::VALUE_OPTIONAL,
+                'Language to be used (defaults to en)'
+            )
+        );
+
+        return $inputDefinition;
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return void
+     */
+    protected function configureIO(InputInterface $input, OutputInterface $output)
+    {
+        $formatter = $output->getFormatter();
+        $formatter->setStyle('normal', new OutputFormatterStyle('white'));
+        $formatter->setStyle('yellow', new OutputFormatterStyle('yellow', null, ['bold']));
+        $formatter->setStyle('red', new OutputFormatterStyle('red', null, ['bold']));
+        $formatter->setStyle('cyan', new OutputFormatterStyle('cyan', null, ['bold']));
+        $formatter->setStyle('green', new OutputFormatterStyle('green', null, ['bold']));
+        $formatter->setStyle('magenta', new OutputFormatterStyle('magenta', null, ['bold']));
+        $formatter->setStyle('white', new OutputFormatterStyle('white', null, ['bold']));
+
+        parent::configureIO($input, $output);
+    }
+}
diff --git a/system/src/Grav/Console/Application/CommandLoader/PluginCommandLoader.php b/system/src/Grav/Console/Application/CommandLoader/PluginCommandLoader.php
new file mode 100644
index 0000000000..adf6447307
--- /dev/null
+++ b/system/src/Grav/Console/Application/CommandLoader/PluginCommandLoader.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * @package    Grav\Console
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Console\Application\CommandLoader;
+
+use Grav\Common\Filesystem\Folder;
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
+use Symfony\Component\Console\Exception\CommandNotFoundException;
+
+/**
+ * Class GpmApplication
+ * @package Grav\Console\Application
+ */
+class PluginCommandLoader implements CommandLoaderInterface
+{
+    /** @var array */
+    private $commands;
+
+    /**
+     * PluginCommandLoader constructor.
+     *
+     * @param string $name
+     */
+    public function __construct(string $name)
+    {
+        $this->commands = [];
+
+        try {
+            $path = "plugins://{$name}/cli";
+            $pattern = '([A-Z]\w+Command\.php)';
+
+            $commands = is_dir($path) ? Folder::all($path, ['compare' => 'Filename', 'pattern' => '/' . $pattern . '$/usm', 'levels' => 1]) : [];
+        } catch (RuntimeException $e) {
+            throw new RuntimeException("Failed to load console commands for plugin {$name}");
+        }
+
+        $grav = Grav::instance();
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $grav['locator'];
+        foreach ($commands as $command_path) {
+            $full_path = $locator->findResource("plugins://{$name}/cli/{$command_path}");
+            require_once $full_path;
+
+            $command_class = 'Grav\Plugin\Console\\' . preg_replace('/.php$/', '', $command_path);
+            if (class_exists($command_class)) {
+                $command = new $command_class();
+                if ($command instanceof Command) {
+                    $this->commands[$command->getName()] = $command;
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $name
+     * @return Command
+     */
+    public function get($name): Command
+    {
+        $command = $this->commands[$name] ?? null;
+        if (null === $command) {
+            throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $name));
+        }
+
+        return $command;
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public function has($name): bool
+    {
+        return isset($this->commands[$name]);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getNames(): array
+    {
+        return array_keys($this->commands);
+    }
+}
diff --git a/system/src/Grav/Console/Application/GpmApplication.php b/system/src/Grav/Console/Application/GpmApplication.php
new file mode 100644
index 0000000000..f9e6b616e6
--- /dev/null
+++ b/system/src/Grav/Console/Application/GpmApplication.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @package    Grav\Console
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Console\Application;
+
+use Grav\Console\Gpm\DirectInstallCommand;
+use Grav\Console\Gpm\IndexCommand;
+use Grav\Console\Gpm\InfoCommand;
+use Grav\Console\Gpm\InstallCommand;
+use Grav\Console\Gpm\SelfupgradeCommand;
+use Grav\Console\Gpm\UninstallCommand;
+use Grav\Console\Gpm\UpdateCommand;
+use Grav\Console\Gpm\VersionCommand;
+
+/**
+ * Class GpmApplication
+ * @package Grav\Console\Application
+ */
+class GpmApplication extends Application
+{
+    public function __construct(string $name = 'UNKNOWN', string $version = 'UNKNOWN')
+    {
+        parent::__construct($name, $version);
+
+        $this->addCommands([
+            new IndexCommand(),
+            new VersionCommand(),
+            new InfoCommand(),
+            new InstallCommand(),
+            new UninstallCommand(),
+            new UpdateCommand(),
+            new SelfupgradeCommand(),
+            new DirectInstallCommand(),
+        ]);
+    }
+}
diff --git a/system/src/Grav/Console/Application/GravApplication.php b/system/src/Grav/Console/Application/GravApplication.php
new file mode 100644
index 0000000000..f06dae650d
--- /dev/null
+++ b/system/src/Grav/Console/Application/GravApplication.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @package    Grav\Console
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Console\Application;
+
+use Grav\Console\Cli\BackupCommand;
+use Grav\Console\Cli\CleanCommand;
+use Grav\Console\Cli\ClearCacheCommand;
+use Grav\Console\Cli\ComposerCommand;
+use Grav\Console\Cli\InstallCommand;
+use Grav\Console\Cli\LogViewerCommand;
+use Grav\Console\Cli\NewProjectCommand;
+use Grav\Console\Cli\PageSystemValidatorCommand;
+use Grav\Console\Cli\SandboxCommand;
+use Grav\Console\Cli\SchedulerCommand;
+use Grav\Console\Cli\SecurityCommand;
+use Grav\Console\Cli\ServerCommand;
+use Grav\Console\Cli\YamlLinterCommand;
+
+/**
+ * Class GravApplication
+ * @package Grav\Console\Application
+ */
+class GravApplication extends Application
+{
+    public function __construct(string $name = 'UNKNOWN', string $version = 'UNKNOWN')
+    {
+        parent::__construct($name, $version);
+
+        $this->addCommands([
+            new InstallCommand(),
+            new ComposerCommand(),
+            new SandboxCommand(),
+            new CleanCommand(),
+            new ClearCacheCommand(),
+            new BackupCommand(),
+            new NewProjectCommand(),
+            new SchedulerCommand(),
+            new SecurityCommand(),
+            new LogViewerCommand(),
+            new YamlLinterCommand(),
+            new ServerCommand(),
+            new PageSystemValidatorCommand(),
+        ]);
+    }
+}
diff --git a/system/src/Grav/Console/Application/PluginApplication.php b/system/src/Grav/Console/Application/PluginApplication.php
new file mode 100644
index 0000000000..e365b1e082
--- /dev/null
+++ b/system/src/Grav/Console/Application/PluginApplication.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * @package    Grav\Console
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Console\Application;
+
+use Grav\Common\Grav;
+use Grav\Common\Plugins;
+use Grav\Console\Application\CommandLoader\PluginCommandLoader;
+use Grav\Console\Plugin\PluginListCommand;
+use Symfony\Component\Console\Exception\NamespaceNotFoundException;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Throwable;
+
+/**
+ * Class PluginApplication
+ * @package Grav\Console\Application
+ */
+class PluginApplication extends Application
+{
+    /** @var string|null */
+    protected $pluginName;
+
+    /**
+     * PluginApplication constructor.
+     * @param string $name
+     * @param string $version
+     */
+    public function __construct(string $name = 'UNKNOWN', string $version = 'UNKNOWN')
+    {
+        parent::__construct($name, $version);
+
+        $this->addCommands([
+            new PluginListCommand(),
+        ]);
+    }
+
+    /**
+     * @param string $pluginName
+     * @return void
+     */
+    public function setPluginName(string $pluginName): void
+    {
+        $this->pluginName = $pluginName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPluginName(): string
+    {
+        return $this->pluginName;
+    }
+
+    /**
+     * @param InputInterface|null $input
+     * @param OutputInterface|null $output
+     * @return int
+     * @throws Throwable
+     */
+    public function run(InputInterface $input = null, OutputInterface $output = null): int
+    {
+        if (null === $input) {
+            $argv = $_SERVER['argv'] ?? [];
+
+            $bin = array_shift($argv);
+            $this->pluginName = array_shift($argv);
+            $argv = array_merge([$bin], $argv);
+
+            $input = new ArgvInput($argv);
+        }
+
+        return parent::run($input, $output);
+    }
+
+    /**
+     * @return void
+     */
+    protected function init(): void
+    {
+        if ($this->initialized) {
+            return;
+        }
+
+        parent::init();
+
+        if (null === $this->pluginName) {
+            $this->setDefaultCommand('plugins:list');
+
+            return;
+        }
+
+        $grav = Grav::instance();
+        $grav->initializeCli();
+
+        /** @var Plugins $plugins */
+        $plugins = $grav['plugins'];
+
+        $plugin = $this->pluginName ? $plugins::get($this->pluginName) : null;
+        if (null === $plugin) {
+            throw new NamespaceNotFoundException("Plugin \"{$this->pluginName}\" is not installed.");
+        }
+        if (!$plugin->enabled) {
+            throw new NamespaceNotFoundException("Plugin \"{$this->pluginName}\" is not enabled.");
+        }
+
+        $this->setCommandLoader(new PluginCommandLoader($this->pluginName));
+    }
+}
diff --git a/system/src/Grav/Console/Cli/BackupCommand.php b/system/src/Grav/Console/Cli/BackupCommand.php
index 54a26cff16..1fe84ea01d 100644
--- a/system/src/Grav/Console/Cli/BackupCommand.php
+++ b/system/src/Grav/Console/Cli/BackupCommand.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Console\Cli
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,21 +11,28 @@
 
 use Grav\Common\Backup\Backups;
 use Grav\Common\Grav;
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GravCommand;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Question\ChoiceQuestion;
-use Symfony\Component\Console\Style\SymfonyStyle;
+use ZipArchive;
+use function count;
 
-class BackupCommand extends ConsoleCommand
+/**
+ * Class BackupCommand
+ * @package Grav\Console\Cli
+ */
+class BackupCommand extends GravCommand
 {
     /** @var string $source */
     protected $source;
-
     /** @var ProgressBar $progress */
     protected $progress;
 
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('backup')
@@ -33,7 +40,6 @@ protected function configure()
                 'id',
                 InputArgument::OPTIONAL,
                 'The ID of the backup profile to perform without prompting'
-
             )
             ->setDescription('Creates a backup of the Grav instance')
             ->setHelp('The <info>backup</info> creates a zipped backup.');
@@ -41,39 +47,50 @@ protected function configure()
         $this->source = getcwd();
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
-        $this->progress = new ProgressBar($this->output);
-        $this->progress->setFormat('Archiving <cyan>%current%</cyan> files [<green>%bar%</green>] <white>%percent:3s%%</white> %elapsed:6s% <yellow>%message%</yellow>');
-        $this->progress->setBarWidth(100);
+        $this->initializeGrav();
 
-        Grav::instance()['config']->init();
+        $input = $this->getInput();
+        $io = $this->getIO();
 
-        $io = new SymfonyStyle($this->input, $this->output);
         $io->title('Grav Backup');
 
+        if (!class_exists(ZipArchive::class)) {
+            $io->error('php-zip extension needs to be enabled!');
+            return 1;
+        }
+
+        ProgressBar::setFormatDefinition('zip', 'Archiving <cyan>%current%</cyan> files [<green>%bar%</green>] <white>%percent:3s%%</white> %elapsed:6s% <yellow>%message%</yellow>');
+
+        $this->progress = new ProgressBar($this->output, 100);
+        $this->progress->setFormat('zip');
+
+
         /** @var Backups $backups */
         $backups = Grav::instance()['backups'];
-        $backups_list = $backups->getBackupProfiles();
+        $backups_list = $backups::getBackupProfiles();
         $backups_names = $backups->getBackupNames();
 
         $id = null;
 
-        $inline_id = $this->input->getArgument('id');
+        $inline_id = $input->getArgument('id');
         if (null !== $inline_id && is_numeric($inline_id)) {
             $id = $inline_id;
         }
 
         if (null === $id) {
-            if (\count($backups_list) > 1) {
-                $helper = $this->getHelper('question');
+            if (count($backups_list) > 1) {
                 $question = new ChoiceQuestion(
                     'Choose a backup?',
                     $backups_names,
                     0
                 );
                 $question->setErrorMessage('Option %s is invalid.');
-                $backup_name = $helper->ask($this->input, $this->output, $question);
+                $backup_name = $io->askQuestion($question);
                 $id = array_search($backup_name, $backups_names, true);
 
                 $io->newLine();
@@ -83,16 +100,19 @@ protected function serve()
             }
         }
 
-        $backup = $backups->backup($id, [$this, 'outputProgress']);
+        $backup = $backups::backup($id, function($args) { $this->outputProgress($args); });
 
         $io->newline(2);
         $io->success('Backup Successfully Created: ' . $backup);
+
+        return 0;
     }
 
     /**
      * @param array $args
+     * @return void
      */
-    public function outputProgress($args)
+    public function outputProgress(array $args): void
     {
         switch ($args['type']) {
             case 'count':
@@ -115,6 +135,4 @@ public function outputProgress($args)
                 break;
         }
     }
-
 }
-
diff --git a/system/src/Grav/Console/Cli/CleanCommand.php b/system/src/Grav/Console/Cli/CleanCommand.php
index a905973737..e6b8f9875e 100644
--- a/system/src/Grav/Console/Cli/CleanCommand.php
+++ b/system/src/Grav/Console/Cli/CleanCommand.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Console\Cli
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,14 +14,18 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
+/**
+ * Class CleanCommand
+ * @package Grav\Console\Cli
+ */
 class CleanCommand extends Command
 {
-    /* @var InputInterface $output */
+    /** @var InputInterface */
     protected $input;
-
-    /* @var OutputInterface $output */
-    protected $output;
+    /** @var SymfonyStyle */
+    protected $io;
 
     /** @var array */
     protected $paths_to_remove = [
@@ -60,6 +64,11 @@ class CleanCommand extends Command
         'user/plugins/email/vendor/swiftmailer/swiftmailer/doc',
         'user/themes/antimatter/.sass-cache',
         'vendor/antoligy/dom-string-iterators/composer.json',
+        'vendor/composer/ca-bundle/composer.json',
+        'vendor/composer/ca-bundle/phpstan.neon.dist',
+        'vendor/composer/semver/CHANGELOG.md',
+        'vendor/composer/semver/composer.json',
+        'vendor/composer/semver/phpstan.neon.dist',
         'vendor/doctrine/cache/.travis.yml',
         'vendor/doctrine/cache/build.properties',
         'vendor/doctrine/cache/build.xml',
@@ -69,20 +78,34 @@ class CleanCommand extends Command
         'vendor/doctrine/cache/.gitignore',
         'vendor/doctrine/cache/.git',
         'vendor/doctrine/cache/tests',
+        'vendor/doctrine/cache/UPGRADE.md',
+        'vendor/doctrine/collections/docs',
+        'vendor/doctrine/collections/.doctrine-project.json',
+        'vendor/doctrine/collections/CONTRIBUTING.md',
+        'vendor/doctrine/collections/psalm.xml.dist',
         'vendor/doctrine/collections/composer.json',
         'vendor/doctrine/collections/phpunit.xml.dist',
         'vendor/doctrine/collections/tests',
         'vendor/donatj/phpuseragentparser/.git',
+        'vendor/donatj/phpuseragentparser/.github',
         'vendor/donatj/phpuseragentparser/.gitignore',
         'vendor/donatj/phpuseragentparser/.editorconfig',
         'vendor/donatj/phpuseragentparser/.travis.yml',
         'vendor/donatj/phpuseragentparser/composer.json',
         'vendor/donatj/phpuseragentparser/phpunit.xml.dist',
-        'vendor/donatj/phpuseragentparser/Tests',
+        'vendor/donatj/phpuseragentparser/tests',
         'vendor/donatj/phpuseragentparser/Tools',
+        'vendor/donatj/phpuseragentparser/CONTRIBUTING.md',
+        'vendor/donatj/phpuseragentparser/Makefile',
+        'vendor/donatj/phpuseragentparser/.mddoc.xml',
         'vendor/dragonmantank/cron-expression/.editorconfig',
         'vendor/dragonmantank/cron-expression/composer.json',
         'vendor/dragonmantank/cron-expression/tests',
+        'vendor/dragonmantank/cron-expression/CHANGELOG.md',
+        'vendor/rhukster/dom-sanitizer/tests',
+        'vendor/rhukster/dom-sanitizer/.gitignore',
+        'vendor/rhukster/dom-sanitizer/composer.json',
+        'vendor/rhukster/dom-sanitizer/composer.lock',
         'vendor/erusev/parsedown/composer.json',
         'vendor/erusev/parsedown/phpunit.xml.dist',
         'vendor/erusev/parsedown/.travis.yml',
@@ -98,10 +121,12 @@ class CleanCommand extends Command
         'vendor/filp/whoops/examples',
         'vendor/filp/whoops/tests',
         'vendor/filp/whoops/.git',
+        'vendor/filp/whoops/.github',
         'vendor/filp/whoops/.gitignore',
         'vendor/filp/whoops/.scrutinizer.yml',
         'vendor/filp/whoops/.travis.yml',
         'vendor/filp/whoops/phpunit.xml.dist',
+        'vendor/filp/whoops/CHANGELOG.md',
         'vendor/gregwar/image/Gregwar/Image/composer.json',
         'vendor/gregwar/image/Gregwar/Image/phpunit.xml',
         'vendor/gregwar/image/Gregwar/Image/phpunit.xml.dist',
@@ -124,20 +149,23 @@ class CleanCommand extends Command
         'vendor/gregwar/cache/Gregwar/Cache/tests',
         'vendor/guzzlehttp/psr7/composer.json',
         'vendor/guzzlehttp/psr7/.editorconfig',
-        'vendor/kodus/psr7-server/composer.json',
-        'vendor/ircmaxell/password-compat/composer.json',
-        'vendor/ircmaxell/password-compat/phpunit.xml.dist',
-        'vendor/ircmaxell/password-compat/version-test.php',
-        'vendor/ircmaxell/password-compat/.travis.yml',
-        'vendor/ircmaxell/password-compat/test',
+        'vendor/guzzlehttp/psr7/CHANGELOG.md',
+        'vendor/itsgoingd/clockwork/.gitattributes',
+        'vendor/itsgoingd/clockwork/CHANGELOG.md',
+        'vendor/itsgoingd/clockwork/composer.json',
         'vendor/league/climate/composer.json',
+        'vendor/league/climate/CHANGELOG.md',
+        'vendor/league/climate/CONTRIBUTING.md',
+        'vendor/league/climate/Dockerfile',
         'vendor/league/climate/CODE_OF_CONDUCT.md',
+        'vendor/matthiasmullie/minify/.github',
         'vendor/matthiasmullie/minify/bin',
         'vendor/matthiasmullie/minify/composer.json',
         'vendor/matthiasmullie/minify/docker-compose.yml',
         'vendor/matthiasmullie/minify/Dockerfile',
         'vendor/matthiasmullie/minify/CONTRIBUTING.md',
         'vendor/matthiasmullie/path-converter/composer.json',
+        'vendor/maximebf/debugbar/.github',
         'vendor/maximebf/debugbar/bower.json',
         'vendor/maximebf/debugbar/composer.json',
         'vendor/maximebf/debugbar/.bowerrc',
@@ -154,13 +182,21 @@ class CleanCommand extends Command
         'vendor/miljar/php-exif/phpunit.xml.dist',
         'vendor/miljar/php-exif/Resources',
         'vendor/miljar/php-exif/tests',
+        'vendor/miljar/php-exif/CHANGELOG.rst',
         'vendor/monolog/monolog/composer.json',
         'vendor/monolog/monolog/doc',
         'vendor/monolog/monolog/phpunit.xml.dist',
         'vendor/monolog/monolog/.php_cs',
         'vendor/monolog/monolog/tests',
+        'vendor/monolog/monolog/CHANGELOG.md',
+        'vendor/monolog/monolog/phpstan.neon.dist',
         'vendor/nyholm/psr7/composer.json',
         'vendor/nyholm/psr7/phpstan.neon.dist',
+        'vendor/nyholm/psr7/CHANGELOG.md',
+        'vendor/nyholm/psr7/psalm.xml',
+        'vendor/nyholm/psr7-server/.github',
+        'vendor/nyholm/psr7-server/composer.json',
+        'vendor/nyholm/psr7-server/CHANGELOG.md',
         'vendor/phive/twig-extensions-deferred/.gitignore',
         'vendor/phive/twig-extensions-deferred/.travis.yml',
         'vendor/phive/twig-extensions-deferred/composer.json',
@@ -168,18 +204,24 @@ class CleanCommand extends Command
         'vendor/phive/twig-extensions-deferred/tests',
         'vendor/php-http/message-factory/composer.json',
         'vendor/php-http/message-factory/puli.json',
+        'vendor/php-http/message-factory/CHANGELOG.md',
         'vendor/pimple/pimple/.gitignore',
         'vendor/pimple/pimple/.travis.yml',
         'vendor/pimple/pimple/composer.json',
         'vendor/pimple/pimple/ext',
         'vendor/pimple/pimple/phpunit.xml.dist',
         'vendor/pimple/pimple/src/Pimple/Tests',
+        'vendor/pimple/pimple/.php_cs.dist',
+        'vendor/pimple/pimple/CHANGELOG',
+        'vendor/psr/cache/CHANGELOG.md',
+        'vendor/psr/cache/composer.json',
         'vendor/psr/container/composer.json',
         'vendor/psr/container/.gitignore',
         'vendor/psr/http-factory/.gitignore',
         'vendor/psr/http-factory/.pullapprove.yml',
         'vendor/psr/http-factory/composer.json',
         'vendor/psr/http-message/composer.json',
+        'vendor/psr/http-message/CHANGELOG.md',
         'vendor/psr/http-server-handler/composer.json',
         'vendor/psr/http-server-middleware/composer.json',
         'vendor/psr/simple-cache/.editorconfig',
@@ -197,25 +239,47 @@ class CleanCommand extends Command
         'vendor/rockettheme/toolbox/.travis.yml',
         'vendor/rockettheme/toolbox/composer.json',
         'vendor/rockettheme/toolbox/phpunit.xml',
+        'vendor/rockettheme/toolbox/CHANGELOG.md',
+        'vendor/rockettheme/toolbox/Blueprints/tests',
+        'vendor/rockettheme/toolbox/ResourceLocator/tests',
+        'vendor/rockettheme/toolbox/Session/tests',
+        'vendor/rockettheme/toolbox/tests',
         'vendor/seld/cli-prompt/composer.json',
         'vendor/seld/cli-prompt/.gitignore',
+        'vendor/seld/cli-prompt/.github',
+        'vendor/seld/cli-prompt/phpstan.neon.dist',
         'vendor/symfony/console/composer.json',
         'vendor/symfony/console/phpunit.xml.dist',
         'vendor/symfony/console/.gitignore',
         'vendor/symfony/console/.git',
         'vendor/symfony/console/Tester',
         'vendor/symfony/console/Tests',
-        'vendor/symfony/debug/.gitignore',
-        'vendor/symfony/debug/.git',
-        'vendor/symfony/debug/phpunit.xml.dist',
-        'vendor/symfony/debug/composer.json',
-        'vendor/symfony/debug/Tests',
-        'vendor/symfony/debug/Resources',
+        'vendor/symfony/console/CHANGELOG.md',
+        'vendor/symfony/contracts/Cache/.gitignore',
+        'vendor/symfony/contracts/Cache/composer.json',
+        'vendor/symfony/contracts/EventDispatcher/.gitignore',
+        'vendor/symfony/contracts/EventDispatcher/composer.json',
+        'vendor/symfony/contracts/HttpClient/.gitignore',
+        'vendor/symfony/contracts/HttpClient/composer.json',
+        'vendor/symfony/contracts/HttpClient/Test',
+        'vendor/symfony/contracts/Service/.gitignore',
+        'vendor/symfony/contracts/Service/composer.json',
+        'vendor/symfony/contracts/Service/Test',
+        'vendor/symfony/contracts/Tests',
+        'vendor/symfony/contracts/Translation/.gitignore',
+        'vendor/symfony/contracts/Translation/composer.json',
+        'vendor/symfony/contracts/Translation/Test',
+        'vendor/symfony/contracts/.gitignore',
+        'vendor/symfony/contracts/composer.json',
+        'vendor/symfony/contracts/phpunit.xml.dist',
         'vendor/symfony/event-dispatcher/.git',
         'vendor/symfony/event-dispatcher/.gitignore',
         'vendor/symfony/event-dispatcher/composer.json',
         'vendor/symfony/event-dispatcher/phpunit.xml.dist',
         'vendor/symfony/event-dispatcher/Tests',
+        'vendor/symfony/event-dispatcher/CHANGELOG.md',
+        'vendor/symfony/http-client/CHANGELOG.md',
+        'vendor/symfony/http-client/composer.json',
         'vendor/symfony/polyfill-ctype/composer.json',
         'vendor/symfony/polyfill-iconv/.git',
         'vendor/symfony/polyfill-iconv/.gitignore',
@@ -229,38 +293,49 @@ class CleanCommand extends Command
         'vendor/symfony/process/composer.json',
         'vendor/symfony/process/phpunit.xml.dist',
         'vendor/symfony/process/Tests',
+        'vendor/symfony/process/CHANGELOG.md',
         'vendor/symfony/var-dumper/.git',
         'vendor/symfony/var-dumper/.gitignore',
         'vendor/symfony/var-dumper/composer.json',
         'vendor/symfony/var-dumper/phpunit.xml.dist',
         'vendor/symfony/var-dumper/Test',
         'vendor/symfony/var-dumper/Tests',
+        'vendor/symfony/var-dumper/CHANGELOG.md',
         'vendor/symfony/yaml/composer.json',
         'vendor/symfony/yaml/phpunit.xml.dist',
         'vendor/symfony/yaml/.gitignore',
         'vendor/symfony/yaml/.git',
         'vendor/symfony/yaml/Tests',
+        'vendor/symfony/yaml/CHANGELOG.md',
         'vendor/twig/twig/.editorconfig',
         'vendor/twig/twig/.php_cs.dist',
         'vendor/twig/twig/.travis.yml',
         'vendor/twig/twig/.gitignore',
         'vendor/twig/twig/.git',
+        'vendor/twig/twig/.github',
         'vendor/twig/twig/composer.json',
         'vendor/twig/twig/phpunit.xml.dist',
         'vendor/twig/twig/doc',
         'vendor/twig/twig/ext',
         'vendor/twig/twig/test',
+        'vendor/twig/twig/.gitattributes',
+        'vendor/twig/twig/CHANGELOG',
+        'vendor/twig/twig/drupal_test.sh',
         'vendor/willdurand/negotiation/.gitignore',
         'vendor/willdurand/negotiation/.travis.yml',
         'vendor/willdurand/negotiation/appveyor.yml',
         'vendor/willdurand/negotiation/composer.json',
         'vendor/willdurand/negotiation/phpunit.xml.dist',
         'vendor/willdurand/negotiation/tests',
+        'vendor/willdurand/negotiation/CONTRIBUTING.md',
         'user/config/security.yaml',
         'cache/compiled/',
     ];
 
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('clean')
@@ -271,33 +346,46 @@ protected function configure()
     /**
      * @param InputInterface  $input
      * @param OutputInterface $output
+     * @return int
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->setupConsole($input, $output);
 
-        $this->cleanPaths();
+        return $this->cleanPaths() ? 0 : 1;
     }
 
-    private function cleanPaths()
+    /**
+     * @return bool
+     */
+    private function cleanPaths(): bool
     {
-        $this->output->writeln('');
-        $this->output->writeln('<red>DELETING</red>');
+        $success = true;
+
+        $this->io->writeln('');
+        $this->io->writeln('<red>DELETING</red>');
         $anything = false;
         foreach ($this->paths_to_remove as $path) {
-            $path = ROOT_DIR . $path;
-            if (is_dir($path) && @Folder::delete($path)) {
-                $anything = true;
-                $this->output->writeln('<red>dir:  </red>' . $path);
-            } elseif (is_file($path) && @unlink($path)) {
-                $anything = true;
-                $this->output->writeln('<red>file: </red>' . $path);
+            $path = GRAV_ROOT . DS . $path;
+            try {
+                if (is_dir($path) && Folder::delete($path)) {
+                    $anything = true;
+                    $this->io->writeln('<red>dir:  </red>' . $path);
+                } elseif (is_file($path) && @unlink($path)) {
+                    $anything = true;
+                    $this->io->writeln('<red>file: </red>' . $path);
+                }
+            } catch (\Exception $e) {
+                $success = false;
+                $this->io->error(sprintf('Failed to delete %s: %s', $path, $e->getMessage()));
             }
         }
         if (!$anything) {
-            $this->output->writeln('');
-            $this->output->writeln('<green>Nothing to clean...</green>');
+            $this->io->writeln('');
+            $this->io->writeln('<green>Nothing to clean...</green>');
         }
+
+        return $success;
     }
 
     /**
@@ -305,19 +393,19 @@ private function cleanPaths()
      *
      * @param InputInterface  $input
      * @param OutputInterface $output
+     * @return void
      */
-    public function setupConsole(InputInterface $input, OutputInterface $output)
+    public function setupConsole(InputInterface $input, OutputInterface $output): void
     {
         $this->input = $input;
-        $this->output = $output;
+        $this->io = new SymfonyStyle($input, $output);
 
-        $this->output->getFormatter()->setStyle('normal', new OutputFormatterStyle('white'));
-        $this->output->getFormatter()->setStyle('yellow', new OutputFormatterStyle('yellow', null, ['bold']));
-        $this->output->getFormatter()->setStyle('red', new OutputFormatterStyle('red', null, ['bold']));
-        $this->output->getFormatter()->setStyle('cyan', new OutputFormatterStyle('cyan', null, ['bold']));
-        $this->output->getFormatter()->setStyle('green', new OutputFormatterStyle('green', null, ['bold']));
-        $this->output->getFormatter()->setStyle('magenta', new OutputFormatterStyle('magenta', null, ['bold']));
-        $this->output->getFormatter()->setStyle('white', new OutputFormatterStyle('white', null, ['bold']));
+        $this->io->getFormatter()->setStyle('normal', new OutputFormatterStyle('white'));
+        $this->io->getFormatter()->setStyle('yellow', new OutputFormatterStyle('yellow', null, ['bold']));
+        $this->io->getFormatter()->setStyle('red', new OutputFormatterStyle('red', null, ['bold']));
+        $this->io->getFormatter()->setStyle('cyan', new OutputFormatterStyle('cyan', null, ['bold']));
+        $this->io->getFormatter()->setStyle('green', new OutputFormatterStyle('green', null, ['bold']));
+        $this->io->getFormatter()->setStyle('magenta', new OutputFormatterStyle('magenta', null, ['bold']));
+        $this->io->getFormatter()->setStyle('white', new OutputFormatterStyle('white', null, ['bold']));
     }
-
 }
diff --git a/system/src/Grav/Console/Cli/ClearCacheCommand.php b/system/src/Grav/Console/Cli/ClearCacheCommand.php
index 8ef6f4ff69..7550dd938c 100644
--- a/system/src/Grav/Console/Cli/ClearCacheCommand.php
+++ b/system/src/Grav/Console/Cli/ClearCacheCommand.php
@@ -3,19 +3,26 @@
 /**
  * @package    Grav\Console\Cli
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Cli;
 
 use Grav\Common\Cache;
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GravCommand;
 use Symfony\Component\Console\Input\InputOption;
 
-class ClearCacheCommand extends ConsoleCommand
+/**
+ * Class ClearCacheCommand
+ * @package Grav\Console\Cli
+ */
+class ClearCacheCommand extends GravCommand
 {
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('cache')
@@ -32,49 +39,66 @@ protected function configure()
             ->setHelp('The <info>cache</info> command allows you to interact with Grav cache');
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
+        // Old versions of Grav called this command after grav upgrade.
+        // We need make this command to work with older GravCommand instance:
+        if (!method_exists($this, 'initializePlugins')) {
+            Cache::clearCache('all');
+
+            return 0;
+        }
+
+        $this->initializePlugins();
         $this->cleanPaths();
+
+        return 0;
     }
 
     /**
      * loops over the array of paths and deletes the files/folders
+     *
+     * @return void
      */
-    private function cleanPaths()
+    private function cleanPaths(): void
     {
-        $this->output->writeln('');
+        $input = $this->getInput();
+        $io = $this->getIO();
 
+        $io->newLine();
 
-        if ($this->input->getOption('purge')) {
-            $this->output->writeln('<magenta>Purging old cache</magenta>');
-            $this->output->writeln('');
+        if ($input->getOption('purge')) {
+            $io->writeln('<magenta>Purging old cache</magenta>');
+            $io->newLine();
 
             $msg = Cache::purgeJob();
-            $this->output->writeln($msg);
+            $io->writeln($msg);
         } else {
-            $this->output->writeln('<magenta>Clearing cache</magenta>');
-            $this->output->writeln('');
+            $io->writeln('<magenta>Clearing cache</magenta>');
+            $io->newLine();
 
-            if ($this->input->getOption('all')) {
+            if ($input->getOption('all')) {
                 $remove = 'all';
-            } elseif ($this->input->getOption('assets-only')) {
+            } elseif ($input->getOption('assets-only')) {
                 $remove = 'assets-only';
-            } elseif ($this->input->getOption('images-only')) {
+            } elseif ($input->getOption('images-only')) {
                 $remove = 'images-only';
-            } elseif ($this->input->getOption('cache-only')) {
+            } elseif ($input->getOption('cache-only')) {
                 $remove = 'cache-only';
-            } elseif ($this->input->getOption('tmp-only')) {
+            } elseif ($input->getOption('tmp-only')) {
                 $remove = 'tmp-only';
-            } elseif ($this->input->getOption('invalidate')) {
+            } elseif ($input->getOption('invalidate')) {
                 $remove = 'invalidate';
             } else {
                 $remove = 'standard';
             }
 
             foreach (Cache::clearCache($remove) as $result) {
-                $this->output->writeln($result);
+                $io->writeln($result);
             }
         }
     }
 }
-
diff --git a/system/src/Grav/Console/Cli/ComposerCommand.php b/system/src/Grav/Console/Cli/ComposerCommand.php
index ffb4e998c5..0dc9bcd156 100644
--- a/system/src/Grav/Console/Cli/ComposerCommand.php
+++ b/system/src/Grav/Console/Cli/ComposerCommand.php
@@ -3,21 +3,28 @@
 /**
  * @package    Grav\Console\Cli
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Cli;
 
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GravCommand;
 use Symfony\Component\Console\Input\InputOption;
 
-class ComposerCommand extends ConsoleCommand
+/**
+ * Class ComposerCommand
+ * @package Grav\Console\Cli
+ */
+class ComposerCommand extends GravCommand
 {
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
-            ->setName("composer")
+            ->setName('composer')
             ->addOption(
                 'install',
                 'i',
@@ -30,21 +37,28 @@ protected function configure()
                 InputOption::VALUE_NONE,
                 'update the dependencies'
             )
-            ->setDescription("Updates the composer vendor dependencies needed by Grav.")
+            ->setDescription('Updates the composer vendor dependencies needed by Grav.')
             ->setHelp('The <info>composer</info> command updates the composer vendor dependencies needed by Grav');
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
-        $action = $this->input->getOption('install') ? 'install' : ($this->input->getOption('update') ? 'update' : 'install');
+        $input = $this->getInput();
+        $io = $this->getIO();
+
+        $action = $input->getOption('install') ? 'install' : ($input->getOption('update') ? 'update' : 'install');
 
-        if ($this->input->getOption('install')) {
+        if ($input->getOption('install')) {
             $action = 'install';
         }
 
         // Updates composer first
-        $this->output->writeln("\nInstalling vendor dependencies");
-        $this->output->writeln($this->composerUpdate(GRAV_ROOT, $action));
-    }
+        $io->writeln("\nInstalling vendor dependencies");
+        $io->writeln($this->composerUpdate(GRAV_ROOT, $action));
 
+        return 0;
+    }
 }
diff --git a/system/src/Grav/Console/Cli/InstallCommand.php b/system/src/Grav/Console/Cli/InstallCommand.php
index 05f281e786..ae38253303 100644
--- a/system/src/Grav/Console/Cli/InstallCommand.php
+++ b/system/src/Grav/Console/Cli/InstallCommand.php
@@ -3,32 +3,37 @@
 /**
  * @package    Grav\Console\Cli
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Cli;
 
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GravCommand;
+use Grav\Framework\File\Formatter\JsonFormatter;
+use Grav\Framework\File\JsonFile;
 use RocketTheme\Toolbox\File\YamlFile;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
+use function is_array;
 
-class InstallCommand extends ConsoleCommand
+/**
+ * Class InstallCommand
+ * @package Grav\Console\Cli
+ */
+class InstallCommand extends GravCommand
 {
     /** @var array */
     protected $config;
-
-    /** @var array */
-    protected $local_config;
-
     /** @var string */
     protected $destination;
-
     /** @var string */
     protected $user_path;
 
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('install')
@@ -38,6 +43,18 @@ protected function configure()
                 InputOption::VALUE_NONE,
                 'Symlink the required bits'
             )
+            ->addOption(
+                'plugin',
+                'p',
+                InputOption::VALUE_REQUIRED,
+                'Install plugin (symlink)'
+            )
+            ->addOption(
+                'theme',
+                't',
+                InputOption::VALUE_REQUIRED,
+                'Install theme (symlink)'
+            )
             ->addArgument(
                 'destination',
                 InputArgument::OPTIONAL,
@@ -47,16 +64,22 @@ protected function configure()
             ->setHelp('The <info>install</info> command installs the dependencies needed by Grav. Optionally can create symbolic links');
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
+        $input = $this->getInput();
+        $io = $this->getIO();
+
         $dependencies_file = '.dependencies';
-        $this->destination = $this->input->getArgument('destination') ?: ROOT_DIR;
+        $this->destination = $input->getArgument('destination') ?: GRAV_WEBROOT;
 
         // fix trailing slash
         $this->destination = rtrim($this->destination, DS) . DS;
-        $this->user_path = $this->destination . USER_PATH;
+        $this->user_path = $this->destination . GRAV_USER_PATH . DS;
         if ($local_config_file = $this->loadLocalConfig()) {
-            $this->output->writeln('Read local config from <cyan>' . $local_config_file . '</cyan>');
+            $io->writeln('Read local config from <cyan>' . $local_config_file . '</cyan>');
         }
 
         // Look for dependencies file in ROOT and USER dir
@@ -65,112 +88,215 @@ protected function serve()
         } elseif (file_exists($this->destination . $dependencies_file)) {
             $file = YamlFile::instance($this->destination . $dependencies_file);
         } else {
-            $this->output->writeln('<red>ERROR</red> Missing .dependencies file in <cyan>user/</cyan> folder');
-            if ($this->input->getArgument('destination')) {
-                $this->output->writeln('<yellow>HINT</yellow> <info>Are you trying to install a plugin or a theme? Make sure you use <cyan>bin/gpm install <something></cyan>, not <cyan>bin/grav install</cyan>. This command is only used to install Grav skeletons.');
+            $io->writeln('<red>ERROR</red> Missing .dependencies file in <cyan>user/</cyan> folder');
+            if ($input->getArgument('destination')) {
+                $io->writeln('<yellow>HINT</yellow> <info>Are you trying to install a plugin or a theme? Make sure you use <cyan>bin/gpm install <something></cyan>, not <cyan>bin/grav install</cyan>. This command is only used to install Grav skeletons.');
             } else {
-                $this->output->writeln('<yellow>HINT</yellow> <info>Are you trying to install Grav? Grav is already installed. You need to run this command only if you download a skeleton from GitHub directly.');
+                $io->writeln('<yellow>HINT</yellow> <info>Are you trying to install Grav? Grav is already installed. You need to run this command only if you download a skeleton from GitHub directly.');
             }
 
-            return;
+            return 1;
         }
 
         $this->config = $file->content();
         $file->free();
 
-        // If yaml config, process
-        if ($this->config) {
-            if (!$this->input->getOption('symlink')) {
-                // Updates composer first
-                $this->output->writeln("\nInstalling vendor dependencies");
-                $this->output->writeln($this->composerUpdate(GRAV_ROOT, 'install'));
+        // If no config, fail.
+        if (!$this->config) {
+            $io->writeln('<red>ERROR</red> invalid YAML in ' . $dependencies_file);
 
-                $this->gitclone();
-            } else {
-                $this->symlink();
-            }
-        } else {
-            $this->output->writeln('<red>ERROR</red> invalid YAML in ' . $dependencies_file);
+            return 1;
         }
 
+        $plugin = $input->getOption('plugin');
+        $theme = $input->getOption('theme');
+        $name = $plugin ?? $theme;
+        $symlink = $name || $input->getOption('symlink');
+
+        if (!$symlink) {
+            // Updates composer first
+            $io->writeln("\nInstalling vendor dependencies");
+            $io->writeln($this->composerUpdate(GRAV_ROOT, 'install'));
+
+            $error = $this->gitclone();
+        } else {
+            $type = $name ? ($plugin ? 'plugin' : 'theme') : null;
+
+            $error = $this->symlink($name, $type);
+        }
 
+        return $error;
     }
 
     /**
      * Clones from Git
+     *
+     * @return int
      */
-    private function gitclone()
+    private function gitclone(): int
     {
-        $this->output->writeln('');
-        $this->output->writeln('<green>Cloning Bits</green>');
-        $this->output->writeln('============');
-        $this->output->writeln('');
+        $io = $this->getIO();
 
+        $io->newLine();
+        $io->writeln('<green>Cloning Bits</green>');
+        $io->writeln('============');
+        $io->newLine();
+
+        $error = 0;
+        $this->destination = rtrim($this->destination, DS);
         foreach ($this->config['git'] as $repo => $data) {
-            $this->destination = rtrim($this->destination, DS);
             $path = $this->destination . DS . $data['path'];
             if (!file_exists($path)) {
-                exec('cd "' . $this->destination . '" && git clone -b ' . $data['branch'] . ' --depth 1 ' . $data['url'] . ' ' . $data['path'], $output, $return);
+                exec('cd ' . escapeshellarg($this->destination) . ' && git clone -b ' . $data['branch'] . ' --depth 1 ' . $data['url'] . ' ' . $data['path'], $output, $return);
 
                 if (!$return) {
-                    $this->output->writeln('<green>SUCCESS</green> cloned <magenta>' . $data['url'] . '</magenta> -> <cyan>' . $path . '</cyan>');
+                    $io->writeln('<green>SUCCESS</green> cloned <magenta>' . $data['url'] . '</magenta> -> <cyan>' . $path . '</cyan>');
                 } else {
-                    $this->output->writeln('<red>ERROR</red> cloning <magenta>' . $data['url']);
-
+                    $io->writeln('<red>ERROR</red> cloning <magenta>' . $data['url']);
+                    $error = 1;
                 }
 
-                $this->output->writeln('');
+                $io->newLine();
             } else {
-                $this->output->writeln('<red>' . $path . ' already exists, skipping...</red>');
-                $this->output->writeln('');
+                $io->writeln('<yellow>' . $path . ' already exists, skipping...</yellow>');
+                $io->newLine();
             }
-
         }
+
+        return $error;
     }
 
     /**
      * Symlinks
+     *
+     * @param string|null $name
+     * @param string|null $type
+     * @return int
      */
-    private function symlink()
+    private function symlink(string $name = null, string $type = null): int
     {
-        $this->output->writeln('');
-        $this->output->writeln('<green>Symlinking Bits</green>');
-        $this->output->writeln('===============');
-        $this->output->writeln('');
+        $io = $this->getIO();
+
+        $io->newLine();
+        $io->writeln('<green>Symlinking Bits</green>');
+        $io->writeln('===============');
+        $io->newLine();
 
         if (!$this->local_config) {
-            $this->output->writeln('<red>No local configuration available, aborting...</red>');
-            $this->output->writeln('');
-            return;
+            $io->writeln('<red>No local configuration available, aborting...</red>');
+            $io->newLine();
+
+            return 1;
         }
 
-        exec('cd ' . $this->destination);
-        foreach ($this->config['links'] as $repo => $data) {
-            $repos = (array) $this->local_config[$data['scm'] . '_repos'];
-            $from = false;
-            $to = $this->destination . $data['path'];
+        $error = 0;
+        $this->destination = rtrim($this->destination, DS);
+
+        if ($name) {
+            $src = "grav-{$type}-{$name}";
+            $links = [
+                $name => [
+                    'scm' => 'github', // TODO: make configurable
+                    'src' => $src,
+                    'path' => "user/{$type}s/{$name}"
+                ]
+            ];
+        } else {
+            $links = $this->config['links'];
+        }
+
+        foreach ($links as $name => $data) {
+            $scm = $data['scm'] ?? null;
+            $src = $data['src'] ?? null;
+            $path = $data['path'] ?? null;
+            if (!isset($scm, $src, $path)) {
+                $io->writeln("<red>Dependency '$name' has broken configuration, skipping...</red>");
+                $io->newLine();
+                $error = 1;
+
+                continue;
+            }
+
+            $locations = (array) $this->local_config["{$scm}_repos"];
+            $to = $this->destination . DS . $path;
 
-            foreach ($repos as $repo) {
-                $path = $repo . $data['src'];
-                if (file_exists($path)) {
-                    $from = $path;
+            $from = null;
+            foreach ($locations as $location) {
+                $test = rtrim($location, '\\/') . DS . $src;
+                if (file_exists($test)) {
+                    $from = $test;
                     continue;
                 }
             }
 
-            if (!$from) {
-                $this->output->writeln('<red>source for ' . $data['src'] . ' does not exists, skipping...</red>');
-                $this->output->writeln('');
+            if (is_link($to) && !realpath($to)) {
+                $io->writeln('<yellow>Removed broken symlink '. $path .'</yellow>');
+                unlink($to);
+            }
+            if (null === $from) {
+                $io->writeln('<red>source for ' . $src . ' does not exists, skipping...</red>');
+                $io->newLine();
+                $error = 1;
+            } elseif (!file_exists($to)) {
+                $error = $this->addSymlinks($from, $to, ['name' => $name, 'src' => $src, 'path' => $path]);
+                $io->newLine();
             } else {
-                if (!file_exists($to)) {
-                    symlink($from, $to);
-                    $this->output->writeln('<green>SUCCESS</green> symlinked <magenta>' . $data['src'] . '</magenta> -> <cyan>' . $data['path'] . '</cyan>');
-                    $this->output->writeln('');
-                } else {
-                    $this->output->writeln('<red>destination: ' . $to . ' already exists, skipping...</red>');
-                    $this->output->writeln('');
+                $io->writeln('<yellow>destination: ' . $path . ' already exists, skipping...</yellow>');
+                $io->newLine();
+            }
+        }
+
+        return $error;
+    }
+
+    private function addSymlinks(string $from, string $to, array $options): int
+    {
+        $io = $this->getIO();
+
+        $hebe = $this->readHebe($from);
+        if (null === $hebe) {
+            symlink($from, $to);
+
+            $io->writeln('<green>SUCCESS</green> symlinked <magenta>' . $options['src'] . '</magenta> -> <cyan>' . $options['path'] . '</cyan>');
+        } else {
+            $to = GRAV_ROOT;
+            $name = $options['name'];
+            $io->writeln("Processing <magenta>{$name}</magenta>");
+            foreach ($hebe as $section => $symlinks) {
+                foreach ($symlinks as $symlink) {
+                    $src = trim($symlink['source'], '/');
+                    $dst = trim($symlink['destination'], '/');
+                    $s = "{$from}/{$src}";
+                    $d = "{$to}/{$dst}";
+
+                    if (is_link($d) && !realpath($d)) {
+                        unlink($d);
+                        $io->writeln('    <yellow>Removed broken symlink '. $dst .'</yellow>');
+                    }
+                    if (!file_exists($d)) {
+                        symlink($s, $d);
+                        $io->writeln('    symlinked <magenta>' . $src . '</magenta> -> <cyan>' . $dst . '</cyan>');
+                    }
                 }
             }
+            $io->writeln('<green>SUCCESS</green>');
         }
+
+        return 0;
+    }
+
+    private function readHebe(string $folder): ?array
+    {
+        $filename = "{$folder}/hebe.json";
+        if (!is_file($filename)) {
+            return null;
+        }
+
+        $formatter = new JsonFormatter();
+        $file = new JsonFile($filename, $formatter);
+        $hebe = $file->load();
+        $paths = $hebe['platforms']['grav']['nodes'] ?? null;
+
+        return is_array($paths) ? $paths : null;
     }
 }
diff --git a/system/src/Grav/Console/Cli/LogViewerCommand.php b/system/src/Grav/Console/Cli/LogViewerCommand.php
index f9e93a3ece..d7e127e5fa 100644
--- a/system/src/Grav/Console/Cli/LogViewerCommand.php
+++ b/system/src/Grav/Console/Cli/LogViewerCommand.php
@@ -3,22 +3,28 @@
 /**
  * @package    Grav\Console\Cli
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Cli;
 
+use DateTime;
 use Grav\Common\Grav;
 use Grav\Common\Helpers\LogViewer;
-use Grav\Common\Utils;
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GravCommand;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Style\SymfonyStyle;
 
-class LogViewerCommand extends ConsoleCommand
+/**
+ * Class LogViewerCommand
+ * @package Grav\Console\Cli
+ */
+class LogViewerCommand extends GravCommand
 {
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('logviewer')
@@ -35,19 +41,20 @@ protected function configure()
                 'number of lines (default = 10)'
             )
             ->setDescription('Display the last few entries of Grav log')
-            ->setHelp("Display the last few entries of Grav log");
+            ->setHelp('Display the last few entries of Grav log');
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
-        $grav = Grav::instance();
-        $grav->setup();
+        $input = $this->getInput();
+        $io = $this->getIO();
 
-        $file = $this->input->getOption('file') ?? 'grav.log';
-        $lines = $this->input->getOption('lines') ?? 20;
-        $verbose = $this->input->getOption('verbose', false);
-
-        $io = new SymfonyStyle($this->input, $this->output);
+        $file = $input->getOption('file') ?? 'grav.log';
+        $lines = $input->getOption('lines') ?? 20;
+        $verbose = $input->getOption('verbose') ?? false;
 
         $io->title('Log Viewer');
 
@@ -56,30 +63,34 @@ protected function serve()
 
         $viewer = new LogViewer();
 
-        $logfile = $grav['locator']->findResource("log://" . $file);
+        $grav = Grav::instance();
+
+        $logfile = $grav['locator']->findResource('log://' . $file);
+        if (!$logfile) {
+            $io->error('cannot find the log file: logs/' . $file);
 
-        if ($logfile) {
-            $rows = $viewer->objectTail($logfile, $lines, true);
-            foreach ($rows as $log) {
-                $date = $log['date'];
-                $level_color = LogViewer::levelColor($log['level']);
+            return 1;
+        }
 
-                if ($date instanceof \DateTime) {
-                    $output = "<yellow>{$log['date']->format('Y-m-d h:i:s')}</yellow> [<{$level_color}>{$log['level']}</{$level_color}>]";
-                    if ($log['trace'] && $verbose) {
-                        $output .= " <white>{$log['message']}</white>\n";
-                        foreach ((array) $log['trace'] as $index => $tracerow) {
-                            $output .= "<white>{$index}</white>${tracerow}\n";
-                        }
-                    } else {
-                        $output .= " {$log['message']}";
+        $rows = $viewer->objectTail($logfile, $lines, true);
+        foreach ($rows as $log) {
+            $date = $log['date'];
+            $level_color = LogViewer::levelColor($log['level']);
+
+            if ($date instanceof DateTime) {
+                $output = "<yellow>{$log['date']->format('Y-m-d h:i:s')}</yellow> [<{$level_color}>{$log['level']}</{$level_color}>]";
+                if ($log['trace'] && $verbose) {
+                    $output .= " <white>{$log['message']}</white>\n";
+                    foreach ((array) $log['trace'] as $index => $tracerow) {
+                        $output .= "<white>{$index}</white>${tracerow}\n";
                     }
-                    $io->writeln($output);
+                } else {
+                    $output .= " {$log['message']}";
                 }
+                $io->writeln($output);
             }
-        } else {
-            $io->error('cannot find the log file: logs/' . $file);
         }
 
+        return 0;
     }
 }
diff --git a/system/src/Grav/Console/Cli/NewProjectCommand.php b/system/src/Grav/Console/Cli/NewProjectCommand.php
index 90583f0e13..7abbc4ed33 100644
--- a/system/src/Grav/Console/Cli/NewProjectCommand.php
+++ b/system/src/Grav/Console/Cli/NewProjectCommand.php
@@ -3,20 +3,27 @@
 /**
  * @package    Grav\Console\Cli
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Cli;
 
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GravCommand;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
-class NewProjectCommand extends ConsoleCommand
+/**
+ * Class NewProjectCommand
+ * @package Grav\Console\Cli
+ */
+class NewProjectCommand extends GravCommand
 {
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('new-project')
@@ -36,8 +43,13 @@ protected function configure()
             ->setHelp("The <info>new-project</info> command is a combination of the `setup` and `install` commands.\nCreates a new Grav instance and performs the installation of all the required dependencies.");
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
+        $io = $this->getIO();
+
         $sandboxCommand = $this->getApplication()->find('sandbox');
         $installCommand = $this->getApplication()->find('install');
 
@@ -53,7 +65,11 @@ protected function serve()
             '-s'          => $this->input->getOption('symlink')
         ]);
 
-        $sandboxCommand->run($sandboxArguments, $this->output);
-        $installCommand->run($installArguments, $this->output);
+        $error = $sandboxCommand->run($sandboxArguments, $io);
+        if ($error === 0) {
+            $error = $installCommand->run($installArguments, $io);
+        }
+
+        return $error;
     }
 }
diff --git a/system/src/Grav/Console/Cli/PageSystemValidatorCommand.php b/system/src/Grav/Console/Cli/PageSystemValidatorCommand.php
new file mode 100644
index 0000000000..3a6960077d
--- /dev/null
+++ b/system/src/Grav/Console/Cli/PageSystemValidatorCommand.php
@@ -0,0 +1,299 @@
+<?php
+
+/**
+ * @package    Grav\Console\Cli
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Console\Cli;
+
+use Grav\Common\Config\Config;
+use Grav\Common\File\CompiledYamlFile;
+use Grav\Common\Grav;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\Page\Pages;
+use Grav\Console\GravCommand;
+use RocketTheme\Toolbox\Event\Event;
+use Symfony\Component\Console\Input\InputOption;
+use function in_array;
+use function is_object;
+
+/**
+ * Class PageSystemValidatorCommand
+ * @package Grav\Console\Cli
+ */
+class PageSystemValidatorCommand extends GravCommand
+{
+    /** @var array */
+    protected $tests = [
+        // Content
+        'header' => [[]],
+        'summary' => [[], [200], [200, true]],
+        'content' => [[]],
+        'getRawContent' => [[]],
+        'rawMarkdown' => [[]],
+        'value' => [['content'], ['route'], ['order'], ['ordering'], ['folder'], ['slug'], ['name'], /*['frontmatter'],*/ ['header.menu'], ['header.slug']],
+        'title' => [[]],
+        'menu' => [[]],
+        'visible' => [[]],
+        'published' => [[]],
+        'publishDate' => [[]],
+        'unpublishDate' => [[]],
+        'process' => [[]],
+        'slug' => [[]],
+        'order' => [[]],
+        //'id' => [[]],
+        'modified' => [[]],
+        'lastModified' => [[]],
+        'folder' => [[]],
+        'date' => [[]],
+        'dateformat' => [[]],
+        'taxonomy' => [[]],
+        'shouldProcess' => [['twig'], ['markdown']],
+        'isPage' => [[]],
+        'isDir' => [[]],
+        'exists' => [[]],
+
+        // Forms
+        'forms' => [[]],
+
+        // Routing
+        'urlExtension' => [[]],
+        'routable' => [[]],
+        'link' => [[], [false], [true]],
+        'permalink' => [[]],
+        'canonical' => [[], [false], [true]],
+        'url' => [[], [true], [true, true], [true, true, false], [false, false, true, false]],
+        'route' => [[]],
+        'rawRoute' => [[]],
+        'routeAliases' => [[]],
+        'routeCanonical' => [[]],
+        'redirect' => [[]],
+        'relativePagePath' => [[]],
+        'path' => [[]],
+        //'folder' => [[]],
+        'parent' => [[]],
+        'topParent' => [[]],
+        'currentPosition' => [[]],
+        'active' => [[]],
+        'activeChild' => [[]],
+        'home' => [[]],
+        'root' => [[]],
+
+        // Translations
+        'translatedLanguages' => [[], [false], [true]],
+        'untranslatedLanguages' => [[], [false], [true]],
+        'language' => [[]],
+
+        // Legacy
+        'raw' => [[]],
+        'frontmatter' => [[]],
+        'httpResponseCode' => [[]],
+        'httpHeaders' => [[]],
+        'blueprintName' => [[]],
+        'name' => [[]],
+        'childType' => [[]],
+        'template' => [[]],
+        'templateFormat' => [[]],
+        'extension' => [[]],
+        'expires' => [[]],
+        'cacheControl' => [[]],
+        'ssl' => [[]],
+        'metadata' => [[]],
+        'eTag' => [[]],
+        'filePath' => [[]],
+        'filePathClean' => [[]],
+        'orderDir' => [[]],
+        'orderBy' => [[]],
+        'orderManual' => [[]],
+        'maxCount' => [[]],
+        'modular' => [[]],
+        'modularTwig' => [[]],
+        //'children' => [[]],
+        'isFirst' => [[]],
+        'isLast' => [[]],
+        'prevSibling' => [[]],
+        'nextSibling' => [[]],
+        'adjacentSibling' => [[]],
+        'ancestor' => [[]],
+        //'inherited' => [[]],
+        //'inheritedField' => [[]],
+        'find' => [['/']],
+        //'collection' => [[]],
+        //'evaluate' => [[]],
+        'folderExists' => [[]],
+        //'getOriginal' => [[]],
+        //'getAction' => [[]],
+    ];
+
+    /** @var Grav */
+    protected $grav;
+
+    /**
+     * @return void
+     */
+    protected function configure(): void
+    {
+        $this
+            ->setName('page-system-validator')
+            ->setDescription('Page validator can be used to compare site before/after update and when migrating to Flex Pages.')
+            ->addOption('record', 'r', InputOption::VALUE_NONE, 'Record results')
+            ->addOption('check', 'c', InputOption::VALUE_NONE, 'Compare site against previously recorded results')
+            ->setHelp('The <info>page-system-validator</info> command can be used to test the pages before and after upgrade');
+    }
+
+    /**
+     * @return int
+     */
+    protected function serve(): int
+    {
+        $input = $this->getInput();
+        $io = $this->getIO();
+
+        $this->setLanguage('en');
+        $this->initializePages();
+
+        $io->newLine();
+
+        $this->grav = $grav = Grav::instance();
+
+        $grav->fireEvent('onPageInitialized', new Event(['page' => $grav['page']]));
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
+        if ($input->getOption('record')) {
+            $io->writeln('Pages: ' . $config->get('system.pages.type', 'page'));
+
+            $io->writeln('<magenta>Record tests</magenta>');
+            $io->newLine();
+
+            $results = $this->record();
+            $file = $this->getFile('pages-old');
+            $file->save($results);
+
+            $io->writeln('Recorded tests to ' . $file->filename());
+        } elseif ($input->getOption('check')) {
+            $io->writeln('Pages: ' . $config->get('system.pages.type', 'page'));
+
+            $io->writeln('<magenta>Run tests</magenta>');
+            $io->newLine();
+
+            $new = $this->record();
+            $file = $this->getFile('pages-new');
+            $file->save($new);
+            $io->writeln('Recorded tests to ' . $file->filename());
+
+            $file = $this->getFile('pages-old');
+            $old = $file->content();
+
+            $results = $this->check($old, $new);
+            $file = $this->getFile('diff');
+            $file->save($results);
+            $io->writeln('Recorded results to ' . $file->filename());
+        } else {
+            $io->writeln('<green>page-system-validator [-r|--record] [-c|--check]</green>');
+        }
+        $io->newLine();
+
+        return 0;
+    }
+
+    /**
+     * @return array
+     */
+    private function record(): array
+    {
+        $io = $this->getIO();
+
+        /** @var Pages $pages */
+        $pages = $this->grav['pages'];
+        $all = $pages->all();
+
+        $results = [];
+        $results[''] = $this->recordRow($pages->root());
+        foreach ($all as $path => $page) {
+            if (null === $page) {
+                $io->writeln('<red>Error on page ' . $path . '</red>');
+                continue;
+            }
+
+            $results[$page->rawRoute()] = $this->recordRow($page);
+        }
+
+        return json_decode(json_encode($results), true);
+    }
+
+    /**
+     * @param PageInterface $page
+     * @return array
+     */
+    private function recordRow(PageInterface $page): array
+    {
+        $results = [];
+
+        foreach ($this->tests as $method => $params) {
+            $params = $params ?: [[]];
+            foreach ($params as $p) {
+                $result = $page->$method(...$p);
+                if (in_array($method, ['summary', 'content', 'getRawContent'], true)) {
+                    $result = preg_replace('/name="(form-nonce|__unique_form_id__)" value="[^"]+"/',
+                        'name="\\1" value="DYNAMIC"', $result);
+                    $result = preg_replace('`src=("|\'|&quot;)/images/./././././[^"]+\\1`',
+                        'src="\\1images/GENERATED\\1', $result);
+                    $result = preg_replace('/\?\d{10}/', '?1234567890', $result);
+                } elseif ($method === 'httpHeaders' && isset($result['Expires'])) {
+                    $result['Expires'] = 'Thu, 19 Sep 2019 13:10:24 GMT (REPLACED AS DYNAMIC)';
+                } elseif ($result instanceof PageInterface) {
+                    $result = $result->rawRoute();
+                } elseif (is_object($result)) {
+                    $result = json_decode(json_encode($result), true);
+                }
+
+                $ps = [];
+                foreach ($p as $val) {
+                    $ps[] = (string)var_export($val, true);
+                }
+                $pstr = implode(', ', $ps);
+                $call = "->{$method}({$pstr})";
+                $results[$call] = $result;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * @param array $old
+     * @param array $new
+     * @return array
+     */
+    private function check(array $old, array $new): array
+    {
+        $errors = [];
+        foreach ($old as $path => $page) {
+            if (!isset($new[$path])) {
+                $errors[$path] = 'PAGE REMOVED';
+                continue;
+            }
+            foreach ($page as $method => $test) {
+                if (($new[$path][$method] ?? null) !== $test) {
+                    $errors[$path][$method] = ['old' => $test, 'new' => $new[$path][$method]];
+                }
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * @param string $name
+     * @return CompiledYamlFile
+     */
+    private function getFile(string $name): CompiledYamlFile
+    {
+        return CompiledYamlFile::instance('cache://tests/' . $name . '.yaml');
+    }
+}
diff --git a/system/src/Grav/Console/Cli/SandboxCommand.php b/system/src/Grav/Console/Cli/SandboxCommand.php
index f961412875..0ba2850de7 100644
--- a/system/src/Grav/Console/Cli/SandboxCommand.php
+++ b/system/src/Grav/Console/Cli/SandboxCommand.php
@@ -3,18 +3,25 @@
 /**
  * @package    Grav\Console\Cli
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Cli;
 
-use Grav\Console\ConsoleCommand;
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\Utils;
+use Grav\Console\GravCommand;
+use RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
+use function count;
 
-class SandboxCommand extends ConsoleCommand
+/**
+ * Class SandboxCommand
+ * @package Grav\Console\Cli
+ */
+class SandboxCommand extends GravCommand
 {
     /** @var array */
     protected $directories = [
@@ -57,12 +64,14 @@ class SandboxCommand extends ConsoleCommand
     ];
 
     /** @var string */
-    protected $default_file = "---\ntitle: HomePage\n---\n# HomePage\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque porttitor eu felis sed ornare. Sed a mauris venenatis, pulvinar velit vel, dictum enim. Phasellus ac rutrum velit. Nunc lorem purus, hendrerit sit amet augue aliquet, iaculis ultricies nisl. Suspendisse tincidunt euismod risus, quis feugiat arcu tincidunt eget. Nulla eros mi, commodo vel ipsum vel, aliquet congue odio. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Pellentesque velit orci, laoreet at adipiscing eu, interdum quis nibh. Nunc a accumsan purus.";
-
     protected $source;
+    /** @var string */
     protected $destination;
 
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('sandbox')
@@ -79,39 +88,62 @@ protected function configure()
                 'Symlink the base grav system'
             )
             ->setHelp("The <info>sandbox</info> command help create a development environment that can optionally use symbolic links to link the core of grav to the git cloned repository.\nGood for development, playing around or starting fresh");
-        $this->source = getcwd();
+
+        $source = getcwd();
+        if ($source === false) {
+            throw new RuntimeException('Internal Error');
+        }
+        $this->source = $source;
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
-        $this->destination = $this->input->getArgument('destination');
+        $input = $this->getInput();
 
-        // Symlink the Core Stuff
-        if ($this->input->getOption('symlink')) {
-            // Create Some core stuff if it doesn't exist
-            $this->createDirectories();
+        $this->destination = $input->getArgument('destination');
 
-            // Loop through the symlink mappings and create the symlinks
-            $this->symlink();
+        // Create Some core stuff if it doesn't exist
+        $error = $this->createDirectories();
+        if ($error) {
+            return $error;
+        }
+
+        // Copy files or create symlinks
+        $error = $input->getOption('symlink') ? $this->symlink() : $this->copy();
+        if ($error) {
+            return $error;
+        }
 
-            // Copy the Core STuff
-        } else {
-            // Create Some core stuff if it doesn't exist
-            $this->createDirectories();
+        $error = $this->pages();
+        if ($error) {
+            return $error;
+        }
+
+        $error = $this->initFiles();
+        if ($error) {
+            return $error;
+        }
 
-            // Loop through the symlink mappings and copy what otherwise would be symlinks
-            $this->copy();
+        $error = $this->perms();
+        if ($error) {
+            return $error;
         }
 
-        $this->pages();
-        $this->initFiles();
-        $this->perms();
+        return 0;
     }
 
-    private function createDirectories()
+    /**
+     * @return int
+     */
+    private function createDirectories(): int
     {
-        $this->output->writeln('');
-        $this->output->writeln('<comment>Creating Directories</comment>');
+        $io = $this->getIO();
+
+        $io->newLine();
+        $io->writeln('<comment>Creating Directories</comment>');
         $dirs_created = false;
 
         if (!file_exists($this->destination)) {
@@ -121,20 +153,27 @@ private function createDirectories()
         foreach ($this->directories as $dir) {
             if (!file_exists($this->destination . $dir)) {
                 $dirs_created = true;
-                $this->output->writeln('    <cyan>' . $dir . '</cyan>');
+                $io->writeln('    <cyan>' . $dir . '</cyan>');
                 Folder::create($this->destination . $dir);
             }
         }
 
         if (!$dirs_created) {
-            $this->output->writeln('    <red>Directories already exist</red>');
+            $io->writeln('    <red>Directories already exist</red>');
         }
+
+        return 0;
     }
 
-    private function copy()
+    /**
+     * @return int
+     */
+    private function copy(): int
     {
-        $this->output->writeln('');
-        $this->output->writeln('<comment>Copying Files</comment>');
+        $io = $this->getIO();
+
+        $io->newLine();
+        $io->writeln('<comment>Copying Files</comment>');
 
 
         foreach ($this->mappings as $source => $target) {
@@ -145,16 +184,27 @@ private function copy()
             $from = $this->source . $source;
             $to = $this->destination . $target;
 
-            $this->output->writeln('    <cyan>' . $source . '</cyan> <comment>-></comment> ' . $to);
+            $io->writeln('    <cyan>' . $source . '</cyan> <comment>-></comment> ' . $to);
             @Folder::rcopy($from, $to);
         }
+
+        return 0;
     }
 
-    private function symlink()
+    /**
+     * @return int
+     */
+    private function symlink(): int
     {
-        $this->output->writeln('');
-        $this->output->writeln('<comment>Resetting Symbolic Links</comment>');
+        $io = $this->getIO();
+
+        $io->newLine();
+        $io->writeln('<comment>Resetting Symbolic Links</comment>');
 
+        // Symlink also tests if using git.
+        if (is_dir($this->source . '/tests')) {
+            $this->mappings['/tests'] = '/tests';
+        }
 
         foreach ($this->mappings as $source => $target) {
             if ((string)(int)$source === (string)$source) {
@@ -164,7 +214,7 @@ private function symlink()
             $from = $this->source . $source;
             $to = $this->destination . $target;
 
-            $this->output->writeln('    <cyan>' . $source . '</cyan> <comment>-></comment> ' . $to);
+            $io->writeln('    <cyan>' . $source . '</cyan> <comment>-></comment> ' . $to);
 
             if (is_dir($to)) {
                 @Folder::delete($to);
@@ -173,14 +223,45 @@ private function symlink()
             }
             symlink($from, $to);
         }
+
+        return 0;
+    }
+
+    /**
+     * @return int
+     */
+    private function pages(): int
+    {
+        $io = $this->getIO();
+
+        $io->newLine();
+        $io->writeln('<comment>Pages Initializing</comment>');
+
+        // get pages files and initialize if no pages exist
+        $pages_dir = $this->destination . '/user/pages';
+        $pages_files = array_diff(scandir($pages_dir), ['..', '.']);
+
+        if (count($pages_files) === 0) {
+            $destination = $this->source . '/user/pages';
+            Folder::rcopy($destination, $pages_dir);
+            $io->writeln('    <cyan>' . $destination . '</cyan> <comment>-></comment> Created');
+        }
+
+        return 0;
     }
 
-    private function initFiles()
+    /**
+     * @return int
+     */
+    private function initFiles(): int
     {
-        $this->check();
+        if (!$this->check()) {
+            return 1;
+        }
 
-        $this->output->writeln('');
-        $this->output->writeln('<comment>File Initializing</comment>');
+        $io = $this->getIO();
+        $io->newLine();
+        $io->writeln('<comment>File Initializing</comment>');
         $files_init = false;
 
         // Copy files if they do not exist
@@ -195,36 +276,25 @@ private function initFiles()
             if (!file_exists($to)) {
                 $files_init = true;
                 copy($from, $to);
-                $this->output->writeln('    <cyan>' . $target . '</cyan> <comment>-></comment> Created');
+                $io->writeln('    <cyan>' . $target . '</cyan> <comment>-></comment> Created');
             }
         }
 
         if (!$files_init) {
-            $this->output->writeln('    <red>Files already exist</red>');
+            $io->writeln('    <red>Files already exist</red>');
         }
-    }
 
-    private function pages()
-    {
-        $this->output->writeln('');
-        $this->output->writeln('<comment>Pages Initializing</comment>');
-
-        // get pages files and initialize if no pages exist
-        $pages_dir = $this->destination . '/user/pages';
-        $pages_files = array_diff(scandir($pages_dir), ['..', '.']);
-
-        if (\count($pages_files) === 0) {
-            $destination = $this->source . '/user/pages';
-            Folder::rcopy($destination, $pages_dir);
-            $this->output->writeln('    <cyan>' . $destination . '</cyan> <comment>-></comment> Created');
-
-        }
+        return 0;
     }
 
-    private function perms()
+    /**
+     * @return int
+     */
+    private function perms(): int
     {
-        $this->output->writeln('');
-        $this->output->writeln('<comment>Permissions Initializing</comment>');
+        $io = $this->getIO();
+        $io->newLine();
+        $io->writeln('<comment>Permissions Initializing</comment>');
 
         $dir_perms = 0755;
 
@@ -232,39 +302,46 @@ private function perms()
 
         foreach ($binaries as $bin) {
             chmod($bin, $dir_perms);
-            $this->output->writeln('    <cyan>bin/' . basename($bin) . '</cyan> permissions reset to ' . decoct($dir_perms));
+            $io->writeln('    <cyan>bin/' . Utils::basename($bin) . '</cyan> permissions reset to ' . decoct($dir_perms));
         }
 
-        $this->output->writeln("");
+        $io->newLine();
+
+        return 0;
     }
 
-    private function check()
+    /**
+     * @return bool
+     */
+    private function check(): bool
     {
         $success = true;
+        $io = $this->getIO();
 
         if (!file_exists($this->destination)) {
-            $this->output->writeln('    file: <red>$this->destination</red> does not exist!');
+            $io->writeln('    file: <red>' . $this->destination . '</red> does not exist!');
             $success = false;
         }
 
         foreach ($this->directories as $dir) {
             if (!file_exists($this->destination . $dir)) {
-                $this->output->writeln('    directory: <red>' . $dir . '</red> does not exist!');
+                $io->writeln('    directory: <red>' . $dir . '</red> does not exist!');
                 $success = false;
             }
         }
 
         foreach ($this->mappings as $target => $link) {
             if (!file_exists($this->destination . $target)) {
-                $this->output->writeln('    mappings: <red>' . $target . '</red> does not exist!');
+                $io->writeln('    mappings: <red>' . $target . '</red> does not exist!');
                 $success = false;
             }
         }
 
         if (!$success) {
-            $this->output->writeln('');
-            $this->output->writeln('<comment>install should be run with --symlink|--s to symlink first</comment>');
-            exit;
+            $io->newLine();
+            $io->writeln('<comment>install should be run with --symlink|--s to symlink first</comment>');
         }
+
+        return $success;
     }
 }
diff --git a/system/src/Grav/Console/Cli/SchedulerCommand.php b/system/src/Grav/Console/Cli/SchedulerCommand.php
index eaf45cdd51..91fc57d140 100644
--- a/system/src/Grav/Console/Cli/SchedulerCommand.php
+++ b/system/src/Grav/Console/Cli/SchedulerCommand.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Console\Cli
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,15 +13,22 @@
 use Grav\Common\Grav;
 use Grav\Common\Utils;
 use Grav\Common\Scheduler\Scheduler;
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GravCommand;
 use RocketTheme\Toolbox\Event\Event;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Style\SymfonyStyle;
+use function is_null;
 
-class SchedulerCommand extends ConsoleCommand
+/**
+ * Class SchedulerCommand
+ * @package Grav\Console\Cli
+ */
+class SchedulerCommand extends GravCommand
 {
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('scheduler')
@@ -43,41 +50,47 @@ protected function configure()
                 InputOption::VALUE_NONE,
                 'Show Job Details'
             )
+            ->addOption(
+                'run',
+                'r',
+                InputOption::VALUE_OPTIONAL,
+                'Force run all jobs or a specific job if you specify a specific Job ID',
+                false
+            )
             ->setDescription('Run the Grav Scheduler.  Best when integrated with system cron')
             ->setHelp("Running without any options will force the Scheduler to run through it's jobs and process them");
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
-//        error_reporting(1);
-        $grav = Grav::instance();
-        $grav->setup();
+        $this->initializePlugins();
 
-        $grav['uri']->init();
-        $grav['config']->init();
-        $grav['plugins']->init();
-        $grav['themes']->init();
+        $grav = Grav::instance();
         $grav['backups']->init();
-
-        // Initialize Plugins
-        $grav->fireEvent('onPluginsInitialized');
+        $this->initializePages();
+        $this->initializeThemes();
 
         /** @var Scheduler $scheduler */
         $scheduler = $grav['scheduler'];
         $grav->fireEvent('onSchedulerInitialized', new Event(['scheduler' => $scheduler]));
 
-        $this->setHelp('foo');
+        $input = $this->getInput();
+        $io = $this->getIO();
+        $error = 0;
 
-        $io = new SymfonyStyle($this->input, $this->output);
+        $run = $input->getOption('run');
 
-        if ($this->input->getOption('jobs')) {
+        if ($input->getOption('jobs')) {
             // Show jobs list
 
             $jobs = $scheduler->getAllJobs();
-            $job_states = $scheduler->getJobStates()->content();
+            $job_states = (array)$scheduler->getJobStates()->content();
             $rows = [];
 
-            $table = new Table($this->output);
+            $table = new Table($io);
             $table->setStyle('box');
             $headers = ['Job ID', 'Command', 'Run At', 'Status', 'Last Run', 'State'];
 
@@ -111,13 +124,13 @@ protected function serve()
             $io->newLine();
             $io->note('For error details run "bin/grav scheduler -d"');
             $io->newLine();
-        } elseif ($this->input->getOption('details')) {
+        } elseif ($input->getOption('details')) {
             $jobs = $scheduler->getAllJobs();
-            $job_states = $scheduler->getJobStates()->content();
+            $job_states = (array)$scheduler->getJobStates()->content();
 
             $io->title('Job Details');
 
-            $table = new Table($this->output);
+            $table = new Table($io);
             $table->setStyle('box');
             $table->setHeaders(['Job ID', 'Last Run', 'Next Run', 'Errors']);
             $rows = [];
@@ -149,31 +162,62 @@ protected function serve()
 
             $table->setRows($rows);
             $table->render();
+        } elseif ($run !== false && $run !== null) {
+            $io->title('Force Run Job: ' . $run);
+
+            $job = $scheduler->getJob($run);
+
+            if ($job) {
+                $job->inForeground()->run();
 
-        } elseif ($this->input->getOption('install')) {
+                if ($job->isSuccessful()) {
+                    $io->success('Job ran successfully...');
+                } else {
+                    $error = 1;
+                    $io->error('Job failed to run successfully...');
+                }
+
+                $output = $job->getOutput();
+
+                if ($output) {
+                    $io->write($output);
+                }
+            } else {
+                $error = 1;
+                $io->error('Could not find a job with id: ' . $run);
+            }
+        } elseif ($input->getOption('install')) {
             $io->title('Install Scheduler');
 
+            $verb = 'install';
+
             if ($scheduler->isCrontabSetup()) {
-                $io->success('All Ready! You have already set up Grav\'s Scheduler in your crontab');
+                $io->success('All Ready! You have already set up Grav\'s Scheduler in your crontab. You can validate this by running "crontab -l" to list your current crontab entries.');
+                $verb = 'reinstall';
             } else {
-                $io->error('You still need to set up Grav\'s Scheduler in your crontab');
+                $user = $scheduler->whoami();
+                $error = 1;
+                $io->error('Can\'t find a crontab for ' . $user . '. You need to set up Grav\'s Scheduler in your crontab');
             }
             if (!Utils::isWindows()) {
-                $io->note('To install, run the following command from your terminal:');
+                $io->note("To $verb, run the following command from your terminal:");
                 $io->newLine();
                 $io->text(trim($scheduler->getCronCommand()));
             } else {
-                $io->note('To install, create a scheduled task in Windows.');
+                $io->note("To $verb, create a scheduled task in Windows.");
                 $io->text('Learn more at https://learn.getgrav.org/advanced/scheduler');
             }
         } else {
             // Run scheduler
-            $scheduler->run();
+            $force = $run === null;
+            $scheduler->run(null, $force);
 
-            if ($this->input->getOption('verbose')) {
+            if ($input->getOption('verbose')) {
                 $io->title('Running Scheduled Jobs');
                 $io->text($scheduler->getVerboseOutput());
             }
         }
+
+        return $error;
     }
 }
diff --git a/system/src/Grav/Console/Cli/SecurityCommand.php b/system/src/Grav/Console/Cli/SecurityCommand.php
index 7f73086538..b6cb662e0b 100644
--- a/system/src/Grav/Console/Cli/SecurityCommand.php
+++ b/system/src/Grav/Console/Cli/SecurityCommand.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Console\Cli
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,79 +11,77 @@
 
 use Grav\Common\Grav;
 use Grav\Common\Security;
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GravCommand;
 use Symfony\Component\Console\Helper\ProgressBar;
-use Symfony\Component\Console\Style\SymfonyStyle;
+use function count;
 
-class SecurityCommand extends ConsoleCommand
+/**
+ * Class SecurityCommand
+ * @package Grav\Console\Cli
+ */
+class SecurityCommand extends GravCommand
 {
     /** @var ProgressBar $progress */
     protected $progress;
 
-    protected $source;
-
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('security')
             ->setDescription('Capable of running various Security checks')
             ->setHelp('The <info>security</info> runs various security checks on your Grav site');
-
-        $this->source = getcwd();
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
-        /** @var Grav $grav */
-        $grav = Grav::instance();
-        $grav->setup();
-
-        $grav['uri']->init();
-        $grav['config']->init();
-        $grav['debugger']->enabled(false);
-        $grav['plugins']->init();
-        $grav['themes']->init();
+        $this->initializePages();
 
-        $grav['twig']->init();
-        $grav['pages']->init();
+        $io = $this->getIO();
 
-        $this->progress = new ProgressBar($this->output, \count($grav['pages']->routes()) - 1);
+        /** @var Grav $grav */
+        $grav = Grav::instance();
+        $this->progress = new ProgressBar($this->output, count($grav['pages']->routes()) - 1);
         $this->progress->setFormat('Scanning <cyan>%current%</cyan> pages [<green>%bar%</green>] <white>%percent:3s%%</white> %elapsed:6s%');
         $this->progress->setBarWidth(100);
 
-        $io = new SymfonyStyle($this->input, $this->output);
         $io->title('Grav Security Check');
+        $io->newline(2);
 
         $output = Security::detectXssFromPages($grav['pages'], false, [$this, 'outputProgress']);
 
-        $io->newline(2);
-
+        $error = 0;
         if (!empty($output)) {
-
             $counter = 1;
             foreach ($output as $route => $results) {
-
-                $results_parts = array_map(function($value, $key) {
+                $results_parts = array_map(static function ($value, $key) {
                     return $key.': \''.$value . '\'';
                 }, array_values($results), array_keys($results));
 
                 $io->writeln($counter++ .' - <cyan>' . $route . '</cyan> → <red>' . implode(', ', $results_parts) . '</red>');
             }
 
-            $io->error('Security Scan complete: ' . \count($output) . ' potential XSS issues found...');
-
+            $error = 1;
+            $io->error('Security Scan complete: ' . count($output) . ' potential XSS issues found...');
         } else {
             $io->success('Security Scan complete: No issues found...');
         }
 
         $io->newline(1);
 
+        return $error;
     }
 
     /**
      * @param array $args
+     * @return void
      */
-    public function outputProgress($args)
+    public function outputProgress(array $args): void
     {
         switch ($args['type']) {
             case 'count':
@@ -101,6 +99,4 @@ public function outputProgress($args)
                 break;
         }
     }
-
 }
-
diff --git a/system/src/Grav/Console/Cli/ServerCommand.php b/system/src/Grav/Console/Cli/ServerCommand.php
new file mode 100644
index 0000000000..29b423ecd7
--- /dev/null
+++ b/system/src/Grav/Console/Cli/ServerCommand.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * @package    Grav\Console\Cli
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Console\Cli;
+
+use Grav\Common\Utils;
+use Grav\Console\GravCommand;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Process\PhpExecutableFinder;
+use Symfony\Component\Process\Process;
+
+/**
+ * Class ServerCommand
+ * @package Grav\Console\Cli
+ */
+class ServerCommand extends GravCommand
+{
+    const SYMFONY_SERVER = 'Symfony Server';
+    const PHP_SERVER = 'Built-in PHP Server';
+
+    /** @var string */
+    protected $ip;
+    /** @var int */
+    protected $port;
+
+    /**
+     * @return void
+     */
+    protected function configure(): void
+    {
+        $this
+            ->setName('server')
+            ->addOption('port', 'p', InputOption::VALUE_OPTIONAL, 'Preferred HTTP port rather than auto-find (default is 8000-9000')
+            ->addOption('symfony', null, InputOption::VALUE_NONE, 'Force using Symfony server')
+            ->addOption('php', null, InputOption::VALUE_NONE, 'Force using built-in PHP server')
+            ->setDescription("Runs built-in web-server, Symfony first, then tries PHP's")
+            ->setHelp("Runs built-in web-server, Symfony first, then tries PHP's");
+    }
+
+    /**
+     * @return int
+     */
+    protected function serve(): int
+    {
+        $input = $this->getInput();
+        $io = $this->getIO();
+
+        $io->title('Grav Web Server');
+
+        // Ensure CLI colors are on
+        ini_set('cli_server.color', 'on');
+
+        // Options
+        $force_symfony = $input->getOption('symfony');
+        $force_php = $input->getOption('php');
+
+        // Find PHP
+        $executableFinder = new PhpExecutableFinder();
+        $php = $executableFinder->find(false);
+
+        $this->ip = '127.0.0.1';
+        $this->port = (int)($input->getOption('port') ?? 8000);
+
+        // Get an open port
+        while (!$this->portAvailable($this->ip, $this->port)) {
+            $this->port++;
+        }
+
+        // Setup the commands
+        $symfony_cmd = ['symfony', 'server:start', '--ansi', '--port=' . $this->port];
+        $php_cmd = [$php, '-S', $this->ip.':'.$this->port, 'system/router.php'];
+
+        $commands = [
+            self::SYMFONY_SERVER => $symfony_cmd,
+            self::PHP_SERVER => $php_cmd
+        ];
+
+        if ($force_symfony) {
+            unset($commands[self::PHP_SERVER]);
+        } elseif ($force_php) {
+            unset($commands[self::SYMFONY_SERVER]);
+        }
+
+        $error = 0;
+        foreach ($commands as $name => $command) {
+            $process = $this->runProcess($name, $command);
+            if (!$process) {
+                $io->note('Starting ' . $name . '...');
+            }
+
+            // Should only get here if there's an error running
+            if (!$process->isRunning() && (($name === self::SYMFONY_SERVER && $force_symfony) || ($name === self::PHP_SERVER))) {
+                $error = 1;
+                $io->error('Could not start ' . $name);
+            }
+        }
+
+        return $error;
+    }
+
+    /**
+     * @param string $name
+     * @param array $cmd
+     * @return Process
+     */
+    protected function runProcess(string $name, array $cmd): Process
+    {
+        $io = $this->getIO();
+
+        $process = new Process($cmd);
+        $process->setTimeout(0);
+        $process->start();
+
+        if ($name === self::SYMFONY_SERVER && Utils::contains($process->getErrorOutput(), 'symfony: not found')) {
+            $io->error('The symfony binary could not be found, please install the CLI tools: https://symfony.com/download');
+            $io->warning('Falling back to PHP web server...');
+        }
+
+        if ($name === self::PHP_SERVER) {
+            $io->success('Built-in PHP web server listening on http://' . $this->ip . ':' . $this->port . ' (PHP v' . PHP_VERSION . ')');
+        }
+
+        $process->wait(function ($type, $buffer) {
+            $this->getIO()->write($buffer);
+        });
+
+        return $process;
+    }
+
+    /**
+     * Simple function test the port
+     *
+     * @param string $ip
+     * @param int $port
+     * @return bool
+     */
+    protected function portAvailable(string $ip, int $port): bool
+    {
+        $fp = @fsockopen($ip, $port, $errno, $errstr, 0.1);
+        if (!$fp) {
+            return true;
+        }
+
+        fclose($fp);
+
+        return false;
+    }
+}
diff --git a/system/src/Grav/Console/Cli/YamlLinterCommand.php b/system/src/Grav/Console/Cli/YamlLinterCommand.php
index 894f1c02d7..75a75594f5 100644
--- a/system/src/Grav/Console/Cli/YamlLinterCommand.php
+++ b/system/src/Grav/Console/Cli/YamlLinterCommand.php
@@ -3,80 +3,122 @@
 /**
  * @package    Grav\Console\Cli
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Cli;
 
-use Grav\Common\Grav;
-use Grav\Common\Helpers\LogViewer;
 use Grav\Common\Helpers\YamlLinter;
-use Grav\Common\Utils;
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GravCommand;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
-class YamlLinterCommand extends ConsoleCommand
+/**
+ * Class YamlLinterCommand
+ * @package Grav\Console\Cli
+ */
+class YamlLinterCommand extends GravCommand
 {
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('yamllinter')
             ->addOption(
-                'env',
-                'e',
+                'all',
+                'a',
+                InputOption::VALUE_NONE,
+                'Go through the whole Grav installation'
+            )
+            ->addOption(
+                'folder',
+                'f',
                 InputOption::VALUE_OPTIONAL,
-                'The environment to trigger a specific configuration. For example: localhost, mysite.dev, www.mysite.com'
+                'Go through specific folder'
             )
             ->setDescription('Checks various files for YAML errors')
-            ->setHelp("Checks various files for YAML errors");
+            ->setHelp('Checks various files for YAML errors');
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
-        $grav = Grav::instance();
-        $grav->setup();
-
-        $io = new SymfonyStyle($this->input, $this->output);
+        $input = $this->getInput();
+        $io = $this->getIO();
 
         $io->title('Yaml Linter');
 
-        $io->section('User Configuration');
-        $errors = YamlLinter::lintConfig();
-
-        if (empty($errors)) {
-            $io->success('No YAML Linting issues with configuration');
-        } else {
-            $this->displayErrors($errors, $io);
-        }
-
-
-        $io->section('Pages Frontmatter');
-        $errors = YamlLinter::lintPages();
-
-        if (empty($errors)) {
-            $io->success('No YAML Linting issues with pages');
-        } else {
-            $this->displayErrors($errors, $io);
-        }
-
-        $io->section('Page Blueprints');
-        $errors = YamlLinter::lintBlueprints();
-
-        if (empty($errors)) {
-            $io->success('No YAML Linting issues with blueprints');
+        $error = 0;
+        if ($input->getOption('all')) {
+            $io->section('All');
+            $errors = YamlLinter::lint('');
+
+            if (empty($errors)) {
+                $io->success('No YAML Linting issues found');
+            } else {
+                $error = 1;
+                $this->displayErrors($errors, $io);
+            }
+        } elseif ($folder = $input->getOption('folder')) {
+            $io->section($folder);
+            $errors = YamlLinter::lint($folder);
+
+            if (empty($errors)) {
+                $io->success('No YAML Linting issues found');
+            } else {
+                $error = 1;
+                $this->displayErrors($errors, $io);
+            }
         } else {
-            $this->displayErrors($errors, $io);
+            $io->section('User Configuration');
+            $errors = YamlLinter::lintConfig();
+
+            if (empty($errors)) {
+                $io->success('No YAML Linting issues with configuration');
+            } else {
+                $error = 1;
+                $this->displayErrors($errors, $io);
+            }
+
+            $io->section('Pages Frontmatter');
+            $errors = YamlLinter::lintPages();
+
+            if (empty($errors)) {
+                $io->success('No YAML Linting issues with pages');
+            } else {
+                $error = 1;
+                $this->displayErrors($errors, $io);
+            }
+
+            $io->section('Page Blueprints');
+            $errors = YamlLinter::lintBlueprints();
+
+            if (empty($errors)) {
+                $io->success('No YAML Linting issues with blueprints');
+            } else {
+                $error = 1;
+                $this->displayErrors($errors, $io);
+            }
         }
 
+        return $error;
     }
 
-    protected function displayErrors($errors, $io)
+    /**
+     * @param array $errors
+     * @param SymfonyStyle $io
+     * @return void
+     */
+    protected function displayErrors(array $errors, SymfonyStyle $io): void
     {
-        $io->error("YAML Linting issues found...");
+        $io->error('YAML Linting issues found...');
         foreach ($errors as $path => $error) {
-            $io->writeln("<yellow>$path</yellow> - $error");
+            $io->writeln("<yellow>{$path}</yellow> - {$error}");
         }
     }
 }
diff --git a/system/src/Grav/Console/ConsoleCommand.php b/system/src/Grav/Console/ConsoleCommand.php
index 2c63eaf54e..c522c88b32 100644
--- a/system/src/Grav/Console/ConsoleCommand.php
+++ b/system/src/Grav/Console/ConsoleCommand.php
@@ -3,17 +3,20 @@
 /**
  * @package    Grav\Console
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console;
 
-use Grav\Common\Grav;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+/**
+ * Class ConsoleCommand
+ * @package Grav\Console
+ */
 class ConsoleCommand extends Command
 {
     use ConsoleTrait;
@@ -21,27 +24,23 @@ class ConsoleCommand extends Command
     /**
      * @param InputInterface  $input
      * @param OutputInterface $output
-     *
-     * @return int|null|void
+     * @return int
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->setupConsole($input, $output);
-        $this->serve();
+
+        return $this->serve();
     }
 
     /**
+     * Override with your implementation.
      *
+     * @return int
      */
     protected function serve()
     {
+        // Return error.
+        return 1;
     }
-
-    protected function displayGPMRelease()
-    {
-        $this->output->writeln('');
-        $this->output->writeln('GPM Releases Configuration: <yellow>' . ucfirst(Grav::instance()['config']->get('system.gpm.releases')) . '</yellow>');
-        $this->output->writeln('');
-    }
-
 }
diff --git a/system/src/Grav/Console/ConsoleTrait.php b/system/src/Grav/Console/ConsoleTrait.php
index 1901095175..d35fc7cfe6 100644
--- a/system/src/Grav/Console/ConsoleTrait.php
+++ b/system/src/Grav/Console/ConsoleTrait.php
@@ -3,103 +3,298 @@
 /**
  * @package    Grav\Console
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console;
 
+use Exception;
 use Grav\Common\Cache;
 use Grav\Common\Grav;
 use Grav\Common\Composer;
-use Grav\Common\GravTrait;
+use Grav\Common\Language\Language;
+use Grav\Common\Processors\InitializeProcessor;
 use Grav\Console\Cli\ClearCacheCommand;
+use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\File\YamlFile;
-use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
+/**
+ * Trait ConsoleTrait
+ * @package Grav\Console
+ */
 trait ConsoleTrait
 {
+    /** @var string */
     protected $argv;
-
-    /* @var InputInterface $output */
+    /** @var InputInterface */
     protected $input;
-
-    /* @var OutputInterface $output */
+    /** @var SymfonyStyle */
     protected $output;
-
     /** @var array */
     protected $local_config;
 
+    /** @var bool */
+    private $plugins_initialized = false;
+    /** @var bool */
+    private $themes_initialized = false;
+    /** @var bool */
+    private $pages_initialized = false;
+
     /**
      * Set colors style definition for the formatter.
      *
      * @param InputInterface  $input
      * @param OutputInterface $output
+     * @return void
      */
     public function setupConsole(InputInterface $input, OutputInterface $output)
     {
+        $this->argv = $_SERVER['argv'][0];
+        $this->input = $input;
+        $this->output = new SymfonyStyle($input, $output);
+
+        $this->setupGrav();
+    }
+
+    public function getInput(): InputInterface
+    {
+        return $this->input;
+    }
+
+    /**
+     * @return SymfonyStyle
+     */
+    public function getIO(): SymfonyStyle
+    {
+        return $this->output;
+    }
+
+    /**
+     * Adds an option.
+     *
+     * @param string                        $name        The option name
+     * @param string|array|null             $shortcut    The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
+     * @param int|null                      $mode        The option mode: One of the InputOption::VALUE_* constants
+     * @param string                        $description A description text
+     * @param string|string[]|int|bool|null $default     The default value (must be null for InputOption::VALUE_NONE)
+     * @return $this
+     * @throws InvalidArgumentException If option mode is invalid or incompatible
+     */
+    public function addOption($name, $shortcut = null, $mode = null, $description = '', $default = null)
+    {
+        if ($name !== 'env' && $name !== 'lang') {
+            parent::addOption($name, $shortcut, $mode, $description, $default);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return void
+     */
+    final protected function setupGrav(): void
+    {
+        try {
+            $language = $this->input->getOption('lang');
+            if ($language) {
+                // Set used language.
+                $this->setLanguage($language);
+            }
+        } catch (InvalidArgumentException $e) {}
+
         // Initialize cache with CLI compatibility
-        Grav::instance()['config']->set('system.cache.cli_compatibility', true);
-        Grav::instance()['cache'];
+        $grav = Grav::instance();
+        $grav['config']->set('system.cache.cli_compatibility', true);
+    }
 
-        $this->argv = $_SERVER['argv'][0];
-        $this->input  = $input;
-        $this->output = $output;
-
-        $this->output->getFormatter()->setStyle('normal', new OutputFormatterStyle('white'));
-        $this->output->getFormatter()->setStyle('yellow', new OutputFormatterStyle('yellow', null, array('bold')));
-        $this->output->getFormatter()->setStyle('red', new OutputFormatterStyle('red', null, array('bold')));
-        $this->output->getFormatter()->setStyle('cyan', new OutputFormatterStyle('cyan', null, array('bold')));
-        $this->output->getFormatter()->setStyle('green', new OutputFormatterStyle('green', null, array('bold')));
-        $this->output->getFormatter()->setStyle('magenta', new OutputFormatterStyle('magenta', null, array('bold')));
-        $this->output->getFormatter()->setStyle('white', new OutputFormatterStyle('white', null, array('bold')));
+    /**
+     * Initialize Grav.
+     *
+     * - Load configuration
+     * - Initialize logger
+     * - Disable debugger
+     * - Set timezone, locale
+     * - Load plugins (call PluginsLoadedEvent)
+     * - Set Pages and Users type to be used in the site
+     *
+     * Safe to be called multiple times.
+     *
+     * @return $this
+     */
+    final protected function initializeGrav()
+    {
+        InitializeProcessor::initializeCli(Grav::instance());
+
+        return $this;
+    }
+
+    /**
+     * Set language to be used in CLI.
+     *
+     * @param string|null $code
+     * @return $this
+     */
+    final protected function setLanguage(string $code = null)
+    {
+        $this->initializeGrav();
+
+        $grav = Grav::instance();
+        /** @var Language $language */
+        $language = $grav['language'];
+        if ($language->enabled()) {
+            if ($code && $language->validate($code)) {
+                $language->setActive($code);
+            } else {
+                $language->setActive($language->getDefault());
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Properly initialize plugins.
+     *
+     * - call $this->initializeGrav()
+     * - call onPluginsInitialized event
+     *
+     * Safe to be called multiple times.
+     *
+     * @return $this
+     */
+    final protected function initializePlugins()
+    {
+        if (!$this->plugins_initialized) {
+            $this->plugins_initialized = true;
+
+            $this->initializeGrav();
+
+            // Initialize plugins.
+            $grav = Grav::instance();
+            $grav['plugins']->init();
+            $grav->fireEvent('onPluginsInitialized');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Properly initialize themes.
+     *
+     * - call $this->initializePlugins()
+     * - initialize theme (call onThemeInitialized event)
+     *
+     * Safe to be called multiple times.
+     *
+     * @return $this
+     */
+    final protected function initializeThemes()
+    {
+        if (!$this->themes_initialized) {
+            $this->themes_initialized = true;
+
+            $this->initializePlugins();
+
+            // Initialize themes.
+            $grav = Grav::instance();
+            $grav['themes']->init();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Properly initialize pages.
+     *
+     * - call $this->initializeThemes()
+     * - initialize assets (call onAssetsInitialized event)
+     * - initialize twig (calls the twig events)
+     * - initialize pages (calls onPagesInitialized event)
+     *
+     * Safe to be called multiple times.
+     *
+     * @return $this
+     */
+    final protected function initializePages()
+    {
+        if (!$this->pages_initialized) {
+            $this->pages_initialized = true;
+
+            $this->initializeThemes();
+
+            $grav = Grav::instance();
+
+            // Initialize assets.
+            $grav['assets']->init();
+            $grav->fireEvent('onAssetsInitialized');
+
+            // Initialize twig.
+            $grav['twig']->init();
+
+            // Initialize pages.
+            $pages = $grav['pages'];
+            $pages->init();
+            $grav->fireEvent('onPagesInitialized', new Event(['pages' => $pages]));
+        }
+
+        return $this;
     }
 
     /**
      * @param string $path
+     * @return void
      */
     public function isGravInstance($path)
     {
+        $io = $this->getIO();
+
         if (!file_exists($path)) {
-            $this->output->writeln('');
-            $this->output->writeln("<red>ERROR</red>: Destination doesn't exist:");
-            $this->output->writeln("       <white>$path</white>");
-            $this->output->writeln('');
+            $io->writeln('');
+            $io->writeln("<red>ERROR</red>: Destination doesn't exist:");
+            $io->writeln("       <white>$path</white>");
+            $io->writeln('');
             exit;
         }
 
         if (!is_dir($path)) {
-            $this->output->writeln('');
-            $this->output->writeln("<red>ERROR</red>: Destination chosen to install is not a directory:");
-            $this->output->writeln("       <white>$path</white>");
-            $this->output->writeln('');
+            $io->writeln('');
+            $io->writeln("<red>ERROR</red>: Destination chosen to install is not a directory:");
+            $io->writeln("       <white>$path</white>");
+            $io->writeln('');
             exit;
         }
 
         if (!file_exists($path . DS . 'index.php') || !file_exists($path . DS . '.dependencies') || !file_exists($path . DS . 'system' . DS . 'config' . DS . 'system.yaml')) {
-            $this->output->writeln('');
-            $this->output->writeln('<red>ERROR</red>: Destination chosen to install does not appear to be a Grav instance:');
-            $this->output->writeln("       <white>$path</white>");
-            $this->output->writeln('');
+            $io->writeln('');
+            $io->writeln('<red>ERROR</red>: Destination chosen to install does not appear to be a Grav instance:');
+            $io->writeln("       <white>$path</white>");
+            $io->writeln('');
             exit;
         }
     }
 
+    /**
+     * @param string $path
+     * @param string $action
+     * @return string|false
+     */
     public function composerUpdate($path, $action = 'install')
     {
         $composer = Composer::getComposerExecutor();
 
-        return system($composer . ' --working-dir="'.$path.'" --no-interaction --no-dev --prefer-dist -o '. $action);
+        return system($composer . ' --working-dir=' . escapeshellarg($path) . ' --no-interaction --no-dev --prefer-dist -o '. $action);
     }
 
     /**
      * @param array $all
-     *
      * @return int
-     * @throws \Exception
+     * @throws Exception
      */
     public function clearCache($all = [])
     {
@@ -112,6 +307,9 @@ public function clearCache($all = [])
         return $command->run($input, $this->output);
     }
 
+    /**
+     * @return void
+     */
     public function invalidateCache()
     {
         Cache::invalidateCache();
@@ -120,7 +318,7 @@ public function invalidateCache()
     /**
      * Load the local config file
      *
-     * @return mixed string the local config file name. false if local config does not exist
+     * @return string|false The local config file name. false if local config does not exist
      */
     public function loadLocalConfig()
     {
@@ -131,6 +329,7 @@ public function loadLocalConfig()
             $file = YamlFile::instance($local_config_file);
             $this->local_config = $file->content();
             $file->free();
+
             return $local_config_file;
         }
 
diff --git a/system/src/Grav/Console/Gpm/DirectInstallCommand.php b/system/src/Grav/Console/Gpm/DirectInstallCommand.php
index bd27651622..881d6f9508 100644
--- a/system/src/Grav/Console/Gpm/DirectInstallCommand.php
+++ b/system/src/Grav/Console/Gpm/DirectInstallCommand.php
@@ -3,32 +3,42 @@
 /**
  * @package    Grav\Console\Gpm
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Gpm;
 
-use Grav\Common\Cache;
+use Exception;
 use Grav\Common\Grav;
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\HTTP\Response;
 use Grav\Common\GPM\GPM;
 use Grav\Common\GPM\Installer;
-use Grav\Common\GPM\Response;
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GpmCommand;
+use RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
+use ZipArchive;
+use function is_array;
+use function is_callable;
 
-class DirectInstallCommand extends ConsoleCommand
+/**
+ * Class DirectInstallCommand
+ * @package Grav\Console\Gpm
+ */
+class DirectInstallCommand extends GpmCommand
 {
     /** @var string */
     protected $all_yes;
-
     /** @var string */
     protected $destination;
 
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('direct-install')
@@ -56,96 +66,108 @@ protected function configure()
     }
 
     /**
-     * @return bool
+     * @return int
      */
-    protected function serve()
+    protected function serve(): int
     {
+        $input = $this->getInput();
+        $io = $this->getIO();
+
+        if (!class_exists(ZipArchive::class)) {
+            $io->title('Direct Install');
+            $io->error('php-zip extension needs to be enabled!');
+
+            return 1;
+        }
+
         // Making sure the destination is usable
-        $this->destination = realpath($this->input->getOption('destination'));
+        $this->destination = realpath($input->getOption('destination'));
 
-        if (
-            !Installer::isGravInstance($this->destination) ||
+        if (!Installer::isGravInstance($this->destination) ||
             !Installer::isValidDestination($this->destination, [Installer::EXISTS, Installer::IS_LINK])
         ) {
-            $this->output->writeln('<red>ERROR</red>: ' . Installer::lastErrorMsg());
-            exit;
-        }
+            $io->writeln('<red>ERROR</red>: ' . Installer::lastErrorMsg());
 
+            return 1;
+        }
 
-        $this->all_yes = $this->input->getOption('all-yes');
+        $this->all_yes = $input->getOption('all-yes');
 
-        $package_file = $this->input->getArgument('package-file');
+        $package_file = $input->getArgument('package-file');
 
-        $helper = $this->getHelper('question');
         $question = new ConfirmationQuestion("Are you sure you want to direct-install <cyan>{$package_file}</cyan> [y|N] ", false);
 
-        $answer = $this->all_yes ? true : $helper->ask($this->input, $this->output, $question);
+        $answer = $this->all_yes ? true : $io->askQuestion($question);
 
         if (!$answer) {
-            $this->output->writeln('exiting...');
-            $this->output->writeln('');
-            exit;
+            $io->writeln('exiting...');
+            $io->newLine();
+
+            return 1;
         }
 
         $tmp_dir = Grav::instance()['locator']->findResource('tmp://', true, true);
-        $tmp_zip = $tmp_dir . '/Grav-' . uniqid();
-
-        $this->output->writeln('');
-        $this->output->writeln("Preparing to install <cyan>{$package_file}</cyan>");
+        $tmp_zip = $tmp_dir . uniqid('/Grav-', false);
 
+        $io->newLine();
+        $io->writeln("Preparing to install <cyan>{$package_file}</cyan>");
 
+        $zip = null;
         if (Response::isRemote($package_file)) {
-            $this->output->write('  |- Downloading package...     0%');
+            $io->write('  |- Downloading package...     0%');
             try {
                 $zip = GPM::downloadPackage($package_file, $tmp_zip);
-            } catch (\RuntimeException $e) {
-                $this->output->writeln('');
-                $this->output->writeln("  `- <red>ERROR: {$e->getMessage()}</red>");
-                $this->output->writeln('');
-                exit;
+            } catch (RuntimeException $e) {
+                $io->newLine();
+                $io->writeln("  `- <red>ERROR: {$e->getMessage()}</red>");
+                $io->newLine();
+
+                return 1;
             }
 
             if ($zip) {
-                $this->output->write("\x0D");
-                $this->output->write('  |- Downloading package...   100%');
-                $this->output->writeln('');
+                $io->write("\x0D");
+                $io->write('  |- Downloading package...   100%');
+                $io->newLine();
             }
-        } else {
-            $this->output->write('  |- Copying package...         0%');
+        } elseif (is_file($package_file)) {
+            $io->write('  |- Copying package...         0%');
             $zip = GPM::copyPackage($package_file, $tmp_zip);
             if ($zip) {
-                $this->output->write("\x0D");
-                $this->output->write('  |- Copying package...       100%');
-                $this->output->writeln('');
+                $io->write("\x0D");
+                $io->write('  |- Copying package...       100%');
+                $io->newLine();
             }
         }
 
-        if (file_exists($zip)) {
-            $tmp_source = $tmp_dir . '/Grav-' . uniqid();
+        if ($zip && file_exists($zip)) {
+            $tmp_source = $tmp_dir . uniqid('/Grav-', false);
 
-            $this->output->write('  |- Extracting package...    ');
+            $io->write('  |- Extracting package...    ');
             $extracted = Installer::unZip($zip, $tmp_source);
 
             if (!$extracted) {
-                $this->output->write("\x0D");
-                $this->output->writeln('  |- Extracting package...    <red>failed</red>');
+                $io->write("\x0D");
+                $io->writeln('  |- Extracting package...    <red>failed</red>');
                 Folder::delete($tmp_source);
                 Folder::delete($tmp_zip);
-                exit;
+
+                return 1;
             }
 
-            $this->output->write("\x0D");
-            $this->output->writeln('  |- Extracting package...    <green>ok</green>');
+            $io->write("\x0D");
+            $io->writeln('  |- Extracting package...    <green>ok</green>');
 
 
             $type = GPM::getPackageType($extracted);
 
             if (!$type) {
-                $this->output->writeln("  '- <red>ERROR: Not a valid Grav package</red>");
-                $this->output->writeln('');
+                $io->writeln("  '- <red>ERROR: Not a valid Grav package</red>");
+                $io->newLine();
                 Folder::delete($tmp_source);
                 Folder::delete($tmp_zip);
-                exit;
+
+                return 1;
             }
 
             $blueprint = GPM::getBlueprints($extracted);
@@ -153,84 +175,86 @@ protected function serve()
                 if (isset($blueprint['dependencies'])) {
                     $dependencies = [];
                     foreach ($blueprint['dependencies'] as $dependency) {
-                        if (is_array($dependency)){
-                           if (isset($dependency['name'])) {
-                              $dependencies[] = $dependency['name'];
-                           }
-                           if (isset($dependency['github'])) {
-                               $dependencies[] = $dependency['github'];
-                           }
+                        if (is_array($dependency)) {
+                            if (isset($dependency['name'])) {
+                                $dependencies[] = $dependency['name'];
+                            }
+                            if (isset($dependency['github'])) {
+                                $dependencies[] = $dependency['github'];
+                            }
                         } else {
                             $dependencies[] = $dependency;
                         }
                     }
-                    $this->output->writeln('  |- Dependencies found...    <cyan>[' . implode(',', $dependencies) . ']</cyan>');
+                    $io->writeln('  |- Dependencies found...    <cyan>[' . implode(',', $dependencies) . ']</cyan>');
 
                     $question = new ConfirmationQuestion("  |  '- Dependencies will not be satisfied. Continue ? [y|N] ", false);
-                    $answer = $this->all_yes ? true : $helper->ask($this->input, $this->output, $question);
+                    $answer = $this->all_yes ? true : $io->askQuestion($question);
 
                     if (!$answer) {
-                        $this->output->writeln('exiting...');
-                        $this->output->writeln('');
+                        $io->writeln('exiting...');
+                        $io->newLine();
                         Folder::delete($tmp_source);
                         Folder::delete($tmp_zip);
-                        exit;
+
+                        return 1;
                     }
                 }
             }
 
             if ($type === 'grav') {
-
-                $this->output->write('  |- Checking destination...  ');
+                $io->write('  |- Checking destination...  ');
                 Installer::isValidDestination(GRAV_ROOT . '/system');
                 if (Installer::IS_LINK === Installer::lastErrorCode()) {
-                    $this->output->write("\x0D");
-                    $this->output->writeln('  |- Checking destination...  <yellow>symbolic link</yellow>');
-                    $this->output->writeln("  '- <red>ERROR: symlinks found...</red> <yellow>" . GRAV_ROOT . '</yellow>');
-                    $this->output->writeln('');
+                    $io->write("\x0D");
+                    $io->writeln('  |- Checking destination...  <yellow>symbolic link</yellow>');
+                    $io->writeln("  '- <red>ERROR: symlinks found...</red> <yellow>" . GRAV_ROOT . '</yellow>');
+                    $io->newLine();
                     Folder::delete($tmp_source);
                     Folder::delete($tmp_zip);
-                    exit;
+
+                    return 1;
                 }
 
-                $this->output->write("\x0D");
-                $this->output->writeln('  |- Checking destination...  <green>ok</green>');
+                $io->write("\x0D");
+                $io->writeln('  |- Checking destination...  <green>ok</green>');
 
-                $this->output->write('  |- Installing package...  ');
+                $io->write('  |- Installing package...  ');
 
-                static::upgradeGrav($zip, $extracted);
+                $this->upgradeGrav($zip, $extracted);
             } else {
                 $name = GPM::getPackageName($extracted);
 
                 if (!$name) {
-                    $this->output->writeln('<red>ERROR: Name could not be determined.</red> Please specify with --name|-n');
-                    $this->output->writeln('');
+                    $io->writeln('<red>ERROR: Name could not be determined.</red> Please specify with --name|-n');
+                    $io->newLine();
                     Folder::delete($tmp_source);
                     Folder::delete($tmp_zip);
-                    exit;
+
+                    return 1;
                 }
 
                 $install_path = GPM::getInstallPath($type, $name);
                 $is_update = file_exists($install_path);
 
-                $this->output->write('  |- Checking destination...  ');
+                $io->write('  |- Checking destination...  ');
 
                 Installer::isValidDestination(GRAV_ROOT . DS . $install_path);
-                if (Installer::lastErrorCode() == Installer::IS_LINK) {
-                    $this->output->write("\x0D");
-                    $this->output->writeln('  |- Checking destination...  <yellow>symbolic link</yellow>');
-                    $this->output->writeln("  '- <red>ERROR: symlink found...</red>  <yellow>" . GRAV_ROOT . DS . $install_path . '</yellow>');
-                    $this->output->writeln('');
+                if (Installer::lastErrorCode() === Installer::IS_LINK) {
+                    $io->write("\x0D");
+                    $io->writeln('  |- Checking destination...  <yellow>symbolic link</yellow>');
+                    $io->writeln("  '- <red>ERROR: symlink found...</red>  <yellow>" . GRAV_ROOT . DS . $install_path . '</yellow>');
+                    $io->newLine();
                     Folder::delete($tmp_source);
                     Folder::delete($tmp_zip);
-                    exit;
 
+                    return 1;
                 }
 
-                $this->output->write("\x0D");
-                $this->output->writeln('  |- Checking destination...  <green>ok</green>');
+                $io->write("\x0D");
+                $io->writeln('  |- Checking destination...  <green>ok</green>');
 
-                $this->output->write('  |- Installing package...  ');
+                $io->write('  |- Installing package...  ');
 
                 Installer::install(
                     $zip,
@@ -242,46 +266,42 @@ protected function serve()
                     ],
                     $extracted
                 );
+
+                // clear cache after successful upgrade
+                $this->clearCache();
             }
 
             Folder::delete($tmp_source);
 
-            $this->output->write("\x0D");
+            $io->write("\x0D");
 
-            if(Installer::lastErrorCode()) {
-                $this->output->writeln("  '- <red>" . Installer::lastErrorMsg() . '</red>');
-                $this->output->writeln('');
+            if (Installer::lastErrorCode()) {
+                $io->writeln("  '- <red>" . Installer::lastErrorMsg() . '</red>');
+                $io->newLine();
             } else {
-                $this->output->writeln('  |- Installing package...    <green>ok</green>');
-                $this->output->writeln("  '- <green>Success!</green>  ");
-                $this->output->writeln('');
+                $io->writeln('  |- Installing package...    <green>ok</green>');
+                $io->writeln("  '- <green>Success!</green>  ");
+                $io->newLine();
             }
-
         } else {
-            $this->output->writeln("  '- <red>ERROR: ZIP package could not be found</red>");
+            $io->writeln("  '- <red>ERROR: ZIP package could not be found</red>");
+            Folder::delete($tmp_zip);
+
+            return 1;
         }
 
         Folder::delete($tmp_zip);
 
-        // clear cache after successful upgrade
-        $this->clearCache();
-
-        return true;
+        return 0;
     }
 
-    private function upgradeGrav($zip, $folder, $keepFolder = false)
+    /**
+     * @param string $zip
+     * @param string $folder
+     * @return void
+     */
+    private function upgradeGrav(string $zip, string $folder): void
     {
-        static $ignores = [
-            'backup',
-            'cache',
-            'images',
-            'logs',
-            'tmp',
-            'user',
-            '.htaccess',
-            'robots.txt'
-        ];
-
         if (!is_dir($folder)) {
             Installer::setError('Invalid source folder');
         }
@@ -292,17 +312,9 @@ private function upgradeGrav($zip, $folder, $keepFolder = false)
             if ((file_exists($script) && $install = include $script) && is_callable($install)) {
                 $install($zip);
             } else {
-                Installer::install(
-                    $zip,
-                    GRAV_ROOT,
-                    ['sophisticated' => true, 'overwrite' => true, 'ignore_symlinks' => true, 'ignores' => $ignores],
-                    $folder,
-                    $keepFolder
-                );
-
-                Cache::clearCache();
+                throw new RuntimeException('Uploaded archive file is not a valid Grav update package');
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Installer::setError($e->getMessage());
         }
     }
diff --git a/system/src/Grav/Console/Gpm/IndexCommand.php b/system/src/Grav/Console/Gpm/IndexCommand.php
index 06d662bd94..367322bb92 100644
--- a/system/src/Grav/Console/Gpm/IndexCommand.php
+++ b/system/src/Grav/Console/Gpm/IndexCommand.php
@@ -3,35 +3,41 @@
 /**
  * @package    Grav\Console\Gpm
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Gpm;
 
+use Grav\Common\GPM\Remote\AbstractPackageCollection;
 use Grav\Common\GPM\Remote\Package;
 use Grav\Common\GPM\GPM;
 use Grav\Common\GPM\Remote\Packages;
+use Grav\Common\GPM\Remote\Plugins;
+use Grav\Common\GPM\Remote\Themes;
 use Grav\Common\Utils;
-use Grav\Console\ConsoleCommand;
-use League\CLImate\CLImate;
+use Grav\Console\GpmCommand;
+use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputOption;
+use function count;
 
-class IndexCommand extends ConsoleCommand
+/**
+ * Class IndexCommand
+ * @package Grav\Console\Gpm
+ */
+class IndexCommand extends GpmCommand
 {
-    /** @var array */
+    /** @var Packages */
     protected $data;
-
     /** @var GPM */
     protected $gpm;
-
     /** @var array */
     protected $options;
 
-    /** @var array */
-    protected $sortKeys = ['name', 'slug', 'author', 'date'];
-
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('index')
@@ -74,9 +80,9 @@ protected function configure()
             ->addOption(
                 'sort',
                 's',
-                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-                'Allows to sort (ASC) the results based on one or multiple keys. SORT can be either "name", "slug", "author", "date"',
-                ['date']
+                InputOption::VALUE_REQUIRED,
+                'Allows to sort (ASC) the results. SORT can be either "name", "slug", "author", "date"',
+                'date'
             )
             ->addOption(
                 'desc',
@@ -84,74 +90,94 @@ protected function configure()
                 InputOption::VALUE_NONE,
                 'Reverses the order of the output.'
             )
+            ->addOption(
+                'enabled',
+                'e',
+                InputOption::VALUE_NONE,
+                'Filters the results to only enabled Themes and Plugins.'
+            )
+            ->addOption(
+                'disabled',
+                'd',
+                InputOption::VALUE_NONE,
+                'Filters the results to only disabled Themes and Plugins.'
+            )
             ->setDescription('Lists the plugins and themes available for installation')
             ->setHelp('The <info>index</info> command lists the plugins and themes available for installation')
         ;
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
-        $this->options = $this->input->getOptions();
+        $input = $this->getInput();
+        $this->options = $input->getOptions();
         $this->gpm = new GPM($this->options['force']);
         $this->displayGPMRelease();
         $this->data = $this->gpm->getRepository();
 
         $data = $this->filter($this->data);
 
-        $climate = new CLImate;
-        $climate->extend('Grav\Console\TerminalObjects\Table');
+        $io = $this->getIO();
 
-        if (!$data) {
-            $this->output->writeln('No data was found in the GPM repository stored locally.');
-            $this->output->writeln('Please try clearing cache and running the <green>bin/gpm index -f</green> command again');
-            $this->output->writeln('If this doesn\'t work try tweaking your GPM system settings.');
-            $this->output->writeln('');
-            $this->output->writeln('For more help go to:');
-            $this->output->writeln(' -> <yellow>https://learn.getgrav.org/troubleshooting/common-problems#cannot-connect-to-the-gpm</yellow>');
+        if (count($data) === 0) {
+            $io->writeln('No data was found in the GPM repository stored locally.');
+            $io->writeln('Please try clearing cache and running the <green>bin/gpm index -f</green> command again');
+            $io->writeln('If this doesn\'t work try tweaking your GPM system settings.');
+            $io->newLine();
+            $io->writeln('For more help go to:');
+            $io->writeln(' -> <yellow>https://learn.getgrav.org/troubleshooting/common-problems#cannot-connect-to-the-gpm</yellow>');
 
-            die;
+            return 1;
         }
 
         foreach ($data as $type => $packages) {
-            $this->output->writeln('<green>' . strtoupper($type) . '</green> [ ' . \count($packages) . ' ]');
+            $io->writeln('<green>' . strtoupper($type) . '</green> [ ' . count($packages) . ' ]');
+
             $packages = $this->sort($packages);
 
             if (!empty($packages)) {
+                $io->section('Packages table');
+                $table = new Table($io);
+                $table->setHeaders(['Count', 'Name', 'Slug', 'Version', 'Installed', 'Enabled']);
 
-                $table = [];
-                $index    = 0;
-
+                $index = 0;
                 foreach ($packages as $slug => $package) {
                     $row = [
                         'Count' => $index++ + 1,
                         'Name' => '<cyan>' . Utils::truncate($package->name, 20, false, ' ', '...') . '</cyan> ',
                         'Slug' => $slug,
                         'Version'=> $this->version($package),
-                        'Installed' => $this->installed($package)
+                        'Installed' => $this->installed($package),
+                        'Enabled' => $this->enabled($package),
                     ];
-                    $table[] = $row;
+
+                    $table->addRow($row);
                 }
 
-                $climate->table($table);
+                $table->render();
             }
 
-            $this->output->writeln('');
+            $io->newLine();
         }
 
-        $this->output->writeln('You can either get more informations about a package by typing:');
-        $this->output->writeln("    <green>{$this->argv} info <cyan><package></cyan></green>");
-        $this->output->writeln('');
-        $this->output->writeln('Or you can install a package by typing:');
-        $this->output->writeln("    <green>{$this->argv} install <cyan><package></cyan></green>");
-        $this->output->writeln('');
+        $io->writeln('You can either get more informations about a package by typing:');
+        $io->writeln("    <green>{$this->argv} info <cyan><package></cyan></green>");
+        $io->newLine();
+        $io->writeln('Or you can install a package by typing:');
+        $io->writeln("    <green>{$this->argv} install <cyan><package></cyan></green>");
+        $io->newLine();
+
+        return 0;
     }
 
     /**
      * @param Package $package
-     *
      * @return string
      */
-    private function version($package)
+    private function version(Package $package): string
     {
         $list      = $this->gpm->{'getUpdatable' . ucfirst($package->package_type)}();
         $package   = $list[$package->slug] ?? $package;
@@ -165,21 +191,15 @@ private function version($package)
             return "v<green>{$version}</green>";
         }
 
-        if ($updatable) {
-            return "v<red>{$package->version}</red> <cyan>-></cyan> v<green>{$package->available}</green>";
-        }
-
-        return '';
+        return "v<red>{$package->version}</red> <cyan>-></cyan> v<green>{$package->available}</green>";
     }
 
     /**
      * @param Package $package
-     *
      * @return string
      */
-    private function installed($package)
+    private function installed(Package $package): string
     {
-        $package   = $list[$package->slug] ?? $package;
         $type      = ucfirst(preg_replace('/s$/', '', $package->package_type));
         $method = 'is' . $type . 'Installed';
         $installed = $this->gpm->{$method}($package->slug);
@@ -188,11 +208,34 @@ private function installed($package)
     }
 
     /**
-     * @param array $data
-     *
-     * @return mixed
+     * @param Package $package
+     * @return string
+     */
+    private function enabled(Package $package): string
+    {
+        $type      = ucfirst(preg_replace('/s$/', '', $package->package_type));
+        $method = 'is' . $type . 'Installed';
+        $installed = $this->gpm->{$method}($package->slug);
+
+        $result = '';
+        if ($installed) {
+            $method = 'is' . $type . 'Enabled';
+            $enabled = $this->gpm->{$method}($package->slug);
+            if ($enabled === true) {
+                $result = '<cyan>enabled</cyan>';
+            } elseif ($enabled === false) {
+                $result = '<red>disabled</red>';
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Packages $data
+     * @return Packages
      */
-    public function filter($data)
+    public function filter(Packages $data): Packages
     {
         // filtering and sorting
         if ($this->options['plugins-only']) {
@@ -203,13 +246,15 @@ public function filter($data)
         }
 
         $filter = [
+            $this->options['desc'],
+            $this->options['disabled'],
+            $this->options['enabled'],
             $this->options['filter'],
             $this->options['installed-only'],
             $this->options['updates-only'],
-            $this->options['desc']
         ];
 
-        if (\count(array_filter($filter))) {
+        if (count(array_filter($filter))) {
             foreach ($data as $type => $packages) {
                 foreach ($packages as $slug => $package) {
                     $filter = true;
@@ -220,7 +265,7 @@ public function filter($data)
                     }
 
                     // Filtering updatables only
-                    if ($filter && $this->options['installed-only']) {
+                    if ($filter && ($this->options['installed-only'] || $this->options['enabled'] || $this->options['disabled'])) {
                         $method = ucfirst(preg_replace('/s$/', '', $package->package_type));
                         $function = 'is' . $method . 'Installed';
                         $filter = $this->gpm->{$function}($package->slug);
@@ -233,6 +278,29 @@ public function filter($data)
                         $filter = $this->gpm->{$function}($package->slug);
                     }
 
+                    // Filtering enabled only
+                    if ($filter && $this->options['enabled']) {
+                        $method = ucfirst(preg_replace('/s$/', '', $package->package_type));
+
+                        // Check if packaged is enabled.
+                        $function = 'is' . $method . 'Enabled';
+                        $filter = $this->gpm->{$function}($package->slug);
+                    }
+
+                    // Filtering disabled only
+                    if ($filter && $this->options['disabled']) {
+                        $method = ucfirst(preg_replace('/s$/', '', $package->package_type));
+
+                        // Check if package is disabled.
+                        $function = 'is' . $method . 'Enabled';
+                        $enabled_filter = $this->gpm->{$function}($package->slug);
+
+                        // Apply filtering results.
+                        if (!( $enabled_filter === false)) {
+                            $filter = false;
+                        }
+                    }
+
                     if (!$filter) {
                         unset($data[$type][$slug]);
                     }
@@ -244,22 +312,24 @@ public function filter($data)
     }
 
     /**
-     * @param Packages $packages
+     * @param AbstractPackageCollection|Plugins|Themes $packages
+     * @return array
      */
-    public function sort($packages)
+    public function sort(AbstractPackageCollection $packages): array
     {
-        foreach ($this->options['sort'] as $key) {
-            $packages = $packages->sort(function ($a, $b) use ($key) {
+        $key = $this->options['sort'];
+
+        // Sorting only works once.
+        return $packages->sort(
+            function ($a, $b) use ($key) {
                 switch ($key) {
                     case 'author':
                         return strcmp($a->{$key}['name'], $b->{$key}['name']);
-                        break;
                     default:
                         return strcmp($a->$key, $b->$key);
                 }
-            }, $this->options['desc'] ? true : false);
-        }
-
-        return $packages;
+            },
+            $this->options['desc'] ? true : false
+        );
     }
 }
diff --git a/system/src/Grav/Console/Gpm/InfoCommand.php b/system/src/Grav/Console/Gpm/InfoCommand.php
index 2fe1a2ee13..c6f855208c 100644
--- a/system/src/Grav/Console/Gpm/InfoCommand.php
+++ b/system/src/Grav/Console/Gpm/InfoCommand.php
@@ -3,33 +3,36 @@
 /**
  * @package    Grav\Console\Gpm
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Gpm;
 
 use Grav\Common\GPM\GPM;
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GpmCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
+use function strlen;
 
-class InfoCommand extends ConsoleCommand
+/**
+ * Class InfoCommand
+ * @package Grav\Console\Gpm
+ */
+class InfoCommand extends GpmCommand
 {
     /** @var array */
     protected $data;
-
     /** @var GPM */
     protected $gpm;
-
     /** @var string */
     protected $all_yes;
 
     /**
-     *
+     * @return void
      */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('info')
@@ -51,45 +54,51 @@ protected function configure()
                 'The package of which more informations are desired. Use the "index" command for a list of packages'
             )
             ->setDescription('Shows more informations about a package')
-            ->setHelp('The <info>info</info> shows more informations about a package');
+            ->setHelp('The <info>info</info> shows more information about a package');
     }
 
     /**
-     * @return int|null|void
+     * @return int
      */
-    protected function serve()
+    protected function serve(): int
     {
-        $this->gpm = new GPM($this->input->getOption('force'));
+        $input = $this->getInput();
+        $io = $this->getIO();
+
+        $this->gpm = new GPM($input->getOption('force'));
 
-        $this->all_yes = $this->input->getOption('all-yes');
+        $this->all_yes = $input->getOption('all-yes');
 
         $this->displayGPMRelease();
 
-        $foundPackage = $this->gpm->findPackage($this->input->getArgument('package'));
+        $foundPackage = $this->gpm->findPackage($input->getArgument('package'));
 
         if (!$foundPackage) {
-            $this->output->writeln("The package <cyan>'{$this->input->getArgument('package')}'</cyan> was not found in the Grav repository.");
-            $this->output->writeln('');
-            $this->output->writeln('You can list all the available packages by typing:');
-            $this->output->writeln("    <green>{$this->argv} index</green>");
-            $this->output->writeln('');
-            exit;
+            $io->writeln("The package <cyan>'{$input->getArgument('package')}'</cyan> was not found in the Grav repository.");
+            $io->newLine();
+            $io->writeln('You can list all the available packages by typing:');
+            $io->writeln("    <green>{$this->argv} index</green>");
+            $io->newLine();
+
+            return 1;
         }
 
-        $this->output->writeln("Found package <cyan>'{$this->input->getArgument('package')}'</cyan> under the '<green>" . ucfirst($foundPackage->package_type) . "</green>' section");
-        $this->output->writeln('');
-        $this->output->writeln("<cyan>{$foundPackage->name}</cyan> [{$foundPackage->slug}]");
-        $this->output->writeln(str_repeat('-', \strlen($foundPackage->name) + \strlen($foundPackage->slug) + 3));
-        $this->output->writeln('<white>' . strip_tags($foundPackage->description_plain) . '</white>');
-        $this->output->writeln('');
+        $io->writeln("Found package <cyan>'{$input->getArgument('package')}'</cyan> under the '<green>" . ucfirst($foundPackage->package_type) . "</green>' section");
+        $io->newLine();
+        $io->writeln("<cyan>{$foundPackage->name}</cyan> [{$foundPackage->slug}]");
+        $io->writeln(str_repeat('-', strlen($foundPackage->name) + strlen($foundPackage->slug) + 3));
+        $io->writeln('<white>' . strip_tags($foundPackage->description_plain) . '</white>');
+        $io->newLine();
 
         $packageURL = '';
         if (isset($foundPackage->author['url'])) {
             $packageURL = '<' . $foundPackage->author['url'] . '>';
         }
 
-        $this->output->writeln('<green>' . str_pad('Author',
-                12) . ':</green> ' . $foundPackage->author['name'] . ' <' . $foundPackage->author['email'] . '> ' . $packageURL);
+        $io->writeln('<green>' . str_pad(
+            'Author',
+            12
+        ) . ':</green> ' . $foundPackage->author['name'] . ' <' . $foundPackage->author['email'] . '> ' . $packageURL);
 
         foreach ([
                      'version',
@@ -118,7 +127,7 @@ protected function serve()
                 }
 
                 $name = str_pad($name, 12);
-                $this->output->writeln("<green>{$name}:</green> {$data}");
+                $io->writeln("<green>{$name}:</green> {$data}");
             }
         }
 
@@ -129,52 +138,54 @@ protected function serve()
         // display current version if installed and different
         if ($installed && $updatable) {
             $local = $this->gpm->{'getInstalled'. $type}($foundPackage->slug);
-            $this->output->writeln('');
-            $this->output->writeln("Currently installed version: <magenta>{$local->version}</magenta>");
-            $this->output->writeln('');
+            $io->newLine();
+            $io->writeln("Currently installed version: <magenta>{$local->version}</magenta>");
+            $io->newLine();
         }
 
         // display changelog information
-        $questionHelper = $this->getHelper('question');
-        $question = new ConfirmationQuestion('Would you like to read the changelog? [y|N] ',
-            false);
-        $answer = $this->all_yes ? true : $questionHelper->ask($this->input, $this->output, $question);
+        $question = new ConfirmationQuestion(
+            'Would you like to read the changelog? [y|N] ',
+            false
+        );
+        $answer = $this->all_yes ? true : $io->askQuestion($question);
 
         if ($answer) {
             $changelog = $foundPackage->changelog;
 
-            $this->output->writeln('');
+            $io->newLine();
             foreach ($changelog as $version => $log) {
                 $title = $version . ' [' . $log['date'] . ']';
-                $content = preg_replace_callback('/\d\.\s\[\]\(#(.*)\)/', function ($match) {
+                $content = preg_replace_callback('/\d\.\s\[\]\(#(.*)\)/', static function ($match) {
                     return "\n" . ucfirst($match[1]) . ':';
                 }, $log['content']);
 
-                $this->output->writeln("<cyan>{$title}</cyan>");
-                $this->output->writeln(str_repeat('-', \strlen($title)));
-                $this->output->writeln($content);
-                $this->output->writeln('');
+                $io->writeln("<cyan>{$title}</cyan>");
+                $io->writeln(str_repeat('-', strlen($title)));
+                $io->writeln($content);
+                $io->newLine();
 
                 $question = new ConfirmationQuestion('Press [ENTER] to continue or [q] to quit ', true);
-                $answer = $this->all_yes ? false : $questionHelper->ask($this->input, $this->output, $question);
+                $answer = $this->all_yes ? false : $io->askQuestion($question);
                 if (!$answer) {
                     break;
                 }
-                $this->output->writeln('');
+                $io->newLine();
             }
         }
 
-        $this->output->writeln('');
+        $io->newLine();
 
         if ($installed && $updatable) {
-            $this->output->writeln('You can update this package by typing:');
-            $this->output->writeln("    <green>{$this->argv} update</green> <cyan>{$foundPackage->slug}</cyan>");
+            $io->writeln('You can update this package by typing:');
+            $io->writeln("    <green>{$this->argv} update</green> <cyan>{$foundPackage->slug}</cyan>");
         } else {
-            $this->output->writeln("You can install this package by typing:");
-            $this->output->writeln("    <green>{$this->argv} install</green> <cyan>{$foundPackage->slug}</cyan>");
+            $io->writeln('You can install this package by typing:');
+            $io->writeln("    <green>{$this->argv} install</green> <cyan>{$foundPackage->slug}</cyan>");
         }
 
-        $this->output->writeln('');
+        $io->newLine();
 
+        return 0;
     }
 }
diff --git a/system/src/Grav/Console/Gpm/InstallCommand.php b/system/src/Grav/Console/Gpm/InstallCommand.php
index 8d544d4c7d..5ad47f8d4f 100644
--- a/system/src/Grav/Console/Gpm/InstallCommand.php
+++ b/system/src/Grav/Console/Gpm/InstallCommand.php
@@ -3,57 +3,59 @@
 /**
  * @package    Grav\Console\Gpm
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Gpm;
 
+use Exception;
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\HTTP\Response;
 use Grav\Common\GPM\GPM;
 use Grav\Common\GPM\Installer;
 use Grav\Common\GPM\Licenses;
-use Grav\Common\GPM\Response;
 use Grav\Common\GPM\Remote\Package;
 use Grav\Common\Grav;
 use Grav\Common\Utils;
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GpmCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
+use ZipArchive;
+use function array_key_exists;
+use function count;
+use function define;
 
-\define('GIT_REGEX', '/http[s]?:\/\/(?:.*@)?(github|bitbucket)(?:.org|.com)\/.*\/(.*)/');
+define('GIT_REGEX', '/http[s]?:\/\/(?:.*@)?(github|bitbucket)(?:.org|.com)\/.*\/(.*)/');
 
-class InstallCommand extends ConsoleCommand
+/**
+ * Class InstallCommand
+ * @package Grav\Console\Gpm
+ */
+class InstallCommand extends GpmCommand
 {
     /** @var array */
     protected $data;
-
     /** @var GPM */
     protected $gpm;
-
     /** @var string */
     protected $destination;
-
     /** @var string */
     protected $file;
-
     /** @var string */
     protected $tmp;
-
-    /** @var array */
-    protected $local_config;
-
     /** @var bool */
     protected $use_symlinks;
-
     /** @var array */
     protected $demo_processing = [];
-
     /** @var string */
     protected $all_yes;
 
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('install')
@@ -90,47 +92,60 @@ protected function configure()
      *
      * @param GPM $gpm
      */
-    public function setGpm(GPM $gpm)
+    public function setGpm(GPM $gpm): void
     {
         $this->gpm = $gpm;
     }
 
     /**
-     * @return bool
+     * @return int
      */
-    protected function serve()
+    protected function serve(): int
     {
-        $this->gpm = new GPM($this->input->getOption('force'));
+        $input = $this->getInput();
+        $io = $this->getIO();
 
-        $this->all_yes = $this->input->getOption('all-yes');
+        if (!class_exists(ZipArchive::class)) {
+            $io->title('GPM Install');
+            $io->error('php-zip extension needs to be enabled!');
+
+            return 1;
+        }
+
+        $this->gpm = new GPM($input->getOption('force'));
+
+        $this->all_yes = $input->getOption('all-yes');
 
         $this->displayGPMRelease();
 
-        $this->destination = realpath($this->input->getOption('destination'));
+        $this->destination = realpath($input->getOption('destination'));
 
-        $packages = array_map('strtolower', $this->input->getArgument('package'));
+        $packages = array_map('strtolower', $input->getArgument('package'));
         $this->data = $this->gpm->findPackages($packages);
         $this->loadLocalConfig();
 
-        if (
-            !Installer::isGravInstance($this->destination) ||
+        if (!Installer::isGravInstance($this->destination) ||
             !Installer::isValidDestination($this->destination, [Installer::EXISTS, Installer::IS_LINK])
         ) {
-            $this->output->writeln('<red>ERROR</red>: ' . Installer::lastErrorMsg());
-            exit;
+            $io->writeln('<red>ERROR</red>: ' . Installer::lastErrorMsg());
+
+            return 1;
         }
 
-        $this->output->writeln('');
+        $io->newLine();
 
         if (!$this->data['total']) {
-            $this->output->writeln('Nothing to install.');
-            $this->output->writeln('');
-            exit;
+            $io->writeln('Nothing to install.');
+            $io->newLine();
+
+            return 0;
         }
 
-        if (\count($this->data['not_found'])) {
-            $this->output->writeln('These packages were not found on Grav: <red>' . implode('</red>, <red>',
-                    array_keys($this->data['not_found'])) . '</red>');
+        if (count($this->data['not_found'])) {
+            $io->writeln('These packages were not found on Grav: <red>' . implode(
+                '</red>, <red>',
+                array_keys($this->data['not_found'])
+            ) . '</red>');
         }
 
         unset($this->data['not_found'], $this->data['total']);
@@ -138,39 +153,40 @@ protected function serve()
         if (null !== $this->local_config) {
             // Symlinks available, ask if Grav should use them
             $this->use_symlinks = false;
-            $helper = $this->getHelper('question');
             $question = new ConfirmationQuestion('Should Grav use the symlinks if available? [y|N] ', false);
 
-            $answer = $this->all_yes ? false : $helper->ask($this->input, $this->output, $question);
+            $answer = $this->all_yes ? false : $io->askQuestion($question);
 
             if ($answer) {
                 $this->use_symlinks = true;
             }
         }
 
-        $this->output->writeln('');
+        $io->newLine();
 
         try {
             $dependencies = $this->gpm->getDependencies($packages);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             //Error out if there are incompatible packages requirements and tell which ones, and what to do
             //Error out if there is any error in parsing the dependencies and their versions, and tell which one is broken
-            $this->output->writeln("<red>{$e->getMessage()}</red>");
-            return false;
+            $io->writeln("<red>{$e->getMessage()}</red>");
+
+            return 1;
         }
 
         if ($dependencies) {
             try {
                 $this->installDependencies($dependencies, 'install', 'The following dependencies need to be installed...');
-                $this->installDependencies($dependencies, 'update',  'The following dependencies need to be updated...');
-                $this->installDependencies($dependencies, 'ignore',  "The following dependencies can be updated as there is a newer version, but it's not mandatory...", false);
-            } catch (\Exception $e) {
-                $this->output->writeln('<red>Installation aborted</red>');
-                return false;
+                $this->installDependencies($dependencies, 'update', 'The following dependencies need to be updated...');
+                $this->installDependencies($dependencies, 'ignore', "The following dependencies can be updated as there is a newer version, but it's not mandatory...", false);
+            } catch (Exception $e) {
+                $io->writeln('<red>Installation aborted</red>');
+
+                return 1;
             }
 
-            $this->output->writeln('<green>Dependencies are OK</green>');
-            $this->output->writeln('');
+            $io->writeln('<green>Dependencies are OK</green>');
+            $io->newLine();
         }
 
 
@@ -178,36 +194,35 @@ protected function serve()
         foreach ($this->data as $data) {
             foreach ($data as $package_name => $package) {
                 if (array_key_exists($package_name, $dependencies)) {
-                    $this->output->writeln("<green>Package {$package_name} already installed as dependency</green>");
+                    $io->writeln("<green>Package {$package_name} already installed as dependency</green>");
                 } else {
                     $is_valid_destination = Installer::isValidDestination($this->destination . DS . $package->install_path);
                     if ($is_valid_destination || Installer::lastErrorCode() == Installer::NOT_FOUND) {
                         $this->processPackage($package, false);
                     } else {
                         if (Installer::lastErrorCode() == Installer::EXISTS) {
-
                             try {
                                 $this->askConfirmationIfMajorVersionUpdated($package);
                                 $this->gpm->checkNoOtherPackageNeedsThisDependencyInALowerVersion($package->slug, $package->available, array_keys($data));
-                            } catch (\Exception $e) {
-                                $this->output->writeln("<red>{$e->getMessage()}</red>");
-                                return false;
+                            } catch (Exception $e) {
+                                $io->writeln("<red>{$e->getMessage()}</red>");
+
+                                return 1;
                             }
 
-                            $helper = $this->getHelper('question');
                             $question = new ConfirmationQuestion("The package <cyan>{$package_name}</cyan> is already installed, overwrite? [y|N] ", false);
-                            $answer = $this->all_yes ? true : $helper->ask($this->input, $this->output, $question);
+                            $answer = $this->all_yes ? true : $io->askQuestion($question);
 
                             if ($answer) {
                                 $is_update = true;
                                 $this->processPackage($package, $is_update);
                             } else {
-                                $this->output->writeln("<yellow>Package {$package_name} not overwritten</yellow>");
+                                $io->writeln("<yellow>Package {$package_name} not overwritten</yellow>");
                             }
                         } else {
                             if (Installer::lastErrorCode() == Installer::IS_LINK) {
-                                $this->output->writeln("<red>Cannot overwrite existing symlink for </red><cyan>{$package_name}</cyan>");
-                                $this->output->writeln('');
+                                $io->writeln("<red>Cannot overwrite existing symlink for </red><cyan>{$package_name}</cyan>");
+                                $io->newLine();
                             }
                         }
                     }
@@ -215,7 +230,7 @@ protected function serve()
             }
         }
 
-        if (\count($this->demo_processing) > 0) {
+        if (count($this->demo_processing) > 0) {
             foreach ($this->demo_processing as $package) {
                 $this->installDemoContent($package);
             }
@@ -224,17 +239,18 @@ protected function serve()
         // clear cache after successful upgrade
         $this->clearCache();
 
-        return true;
+        return 0;
     }
 
     /**
      * If the package is updated from an older major release, show warning and ask confirmation
      *
      * @param Package $package
+     * @return void
      */
-    public function askConfirmationIfMajorVersionUpdated($package)
+    public function askConfirmationIfMajorVersionUpdated(Package $package): void
     {
-        $helper = $this->getHelper('question');
+        $io = $this->getIO();
         $package_name = $package->name;
         $new_version = $package->available ?: $this->gpm->getLatestVersionOfPackage($package->slug);
         $old_version = $package->version;
@@ -243,14 +259,14 @@ public function askConfirmationIfMajorVersionUpdated($package)
 
         if ($major_version_changed) {
             if ($this->all_yes) {
-                $this->output->writeln("The package <cyan>{$package_name}</cyan> will be updated to a new major version <green>{$new_version}</green>, from <magenta>{$old_version}</magenta>");
+                $io->writeln("The package <cyan>{$package_name}</cyan> will be updated to a new major version <green>{$new_version}</green>, from <magenta>{$old_version}</magenta>");
                 return;
             }
 
             $question = new ConfirmationQuestion("The package <cyan>{$package_name}</cyan> will be updated to a new major version <green>{$new_version}</green>, from <magenta>{$old_version}</magenta>. Be sure to read what changed with the new major release. Continue? [y|N] ", false);
 
-            if (!$helper->ask($this->input, $this->output, $question)) {
-                $this->output->writeln("<yellow>Package {$package_name} not updated</yellow>");
+            if (!$io->askQuestion($question)) {
+                $io->writeln("<yellow>Package {$package_name} not updated</yellow>");
                 exit;
             }
         }
@@ -265,22 +281,23 @@ public function askConfirmationIfMajorVersionUpdated($package)
      * @param string $type         The type of dependency to show: install, update, ignore
      * @param string $message      A message to be shown prior to listing the dependencies
      * @param bool   $required     A flag that determines if the installation is required or optional
-     *
-     * @throws \Exception
+     * @return void
+     * @throws Exception
      */
-    public function installDependencies($dependencies, $type, $message, $required = true)
+    public function installDependencies(array $dependencies, string $type, string $message, bool $required = true): void
     {
-        $packages = array_filter($dependencies, function ($action) use ($type) { return $action === $type; });
-        if (\count($packages) > 0) {
-            $this->output->writeln($message);
+        $io = $this->getIO();
+        $packages = array_filter($dependencies, static function ($action) use ($type) {
+            return $action === $type;
+        });
+        if (count($packages) > 0) {
+            $io->writeln($message);
 
             foreach ($packages as $dependencyName => $dependencyVersion) {
-                $this->output->writeln("  |- Package <cyan>{$dependencyName}</cyan>");
+                $io->writeln("  |- Package <cyan>{$dependencyName}</cyan>");
             }
 
-            $this->output->writeln('');
-
-            $helper = $this->getHelper('question');
+            $io->newLine();
 
             if ($type === 'install') {
                 $questionAction = 'Install';
@@ -288,44 +305,45 @@ public function installDependencies($dependencies, $type, $message, $required =
                 $questionAction = 'Update';
             }
 
-            if (\count($packages) === 1) {
+            if (count($packages) === 1) {
                 $questionArticle = 'this';
             } else {
                 $questionArticle = 'these';
             }
 
-            if (\count($packages) === 1) {
+            if (count($packages) === 1) {
                 $questionNoun = 'package';
             } else {
                 $questionNoun = 'packages';
             }
 
             $question = new ConfirmationQuestion("${questionAction} {$questionArticle} {$questionNoun}? [Y|n] ", true);
-            $answer = $this->all_yes ? true : $helper->ask($this->input, $this->output, $question);
+            $answer = $this->all_yes ? true : $io->askQuestion($question);
 
             if ($answer) {
                 foreach ($packages as $dependencyName => $dependencyVersion) {
                     $package = $this->gpm->findPackage($dependencyName);
                     $this->processPackage($package, $type === 'update');
                 }
-                $this->output->writeln('');
-            } else {
-                if ($required) {
-                    throw new \Exception();
-                }
+                $io->newLine();
+            } elseif ($required) {
+                throw new Exception();
             }
         }
     }
 
     /**
-     * @param Package $package
+     * @param Package|null $package
      * @param bool    $is_update      True if the package is an update
+     * @return void
      */
-    private function processPackage($package, $is_update = false)
+    private function processPackage(?Package $package, bool $is_update = false): void
     {
+        $io = $this->getIO();
+
         if (!$package) {
-            $this->output->writeln('<red>Package not found on the GPM!</red>');
-            $this->output->writeln('');
+            $io->writeln('<red>Package not found on the GPM!</red>');
+            $io->newLine();
             return;
         }
 
@@ -345,8 +363,9 @@ private function processPackage($package, $is_update = false)
      * Add package to the queue to process the demo content, if demo content exists
      *
      * @param Package $package
+     * @return void
      */
-    private function processDemo($package)
+    private function processDemo(Package $package): void
     {
         $demo_dir = $this->destination . DS . $package->install_path . DS . '_demo';
         if (file_exists($demo_dir)) {
@@ -358,9 +377,11 @@ private function processDemo($package)
      * Prompt to install the demo content of a package
      *
      * @param Package $package
+     * @return void
      */
-    private function installDemoContent($package)
+    private function installDemoContent(Package $package): void
     {
+        $io = $this->getIO();
         $demo_dir = $this->destination . DS . $package->install_path . DS . '_demo';
 
         if (file_exists($demo_dir)) {
@@ -368,15 +389,15 @@ private function installDemoContent($package)
             $pages_dir = $dest_dir . DS . 'pages';
 
             // Demo content exists, prompt to install it.
-            $this->output->writeln("<white>Attention: </white><cyan>{$package->name}</cyan> contains demo content");
-            $helper = $this->getHelper('question');
+            $io->writeln("<white>Attention: </white><cyan>{$package->name}</cyan> contains demo content");
+
             $question = new ConfirmationQuestion('Do you wish to install this demo content? [y|N] ', false);
 
-            $answer = $helper->ask($this->input, $this->output, $question);
+            $answer = $io->askQuestion($question);
 
             if (!$answer) {
-                $this->output->writeln("  '- <red>Skipped!</red>  ");
-                $this->output->writeln('');
+                $io->writeln("  '- <red>Skipped!</red>  ");
+                $io->newLine();
 
                 return;
             }
@@ -385,11 +406,11 @@ private function installDemoContent($package)
             if (file_exists($demo_dir . DS . 'pages')) {
                 $pages_backup = 'pages.' . date('m-d-Y-H-i-s');
                 $question = new ConfirmationQuestion('This will backup your current `user/pages` folder to `user/' . $pages_backup . '`, continue? [y|N]', false);
-                $answer = $this->all_yes ? true : $helper->ask($this->input, $this->output, $question);
+                $answer = $this->all_yes ? true : $io->askQuestion($question);
 
                 if (!$answer) {
-                    $this->output->writeln("  '- <red>Skipped!</red>  ");
-                    $this->output->writeln('');
+                    $io->writeln("  '- <red>Skipped!</red>  ");
+                    $io->newLine();
 
                     return;
                 }
@@ -397,27 +418,26 @@ private function installDemoContent($package)
                 // backup current pages folder
                 if (file_exists($dest_dir)) {
                     if (rename($pages_dir, $dest_dir . DS . $pages_backup)) {
-                        $this->output->writeln('  |- Backing up pages...    <green>ok</green>');
+                        $io->writeln('  |- Backing up pages...    <green>ok</green>');
                     } else {
-                        $this->output->writeln('  |- Backing up pages...    <red>failed</red>');
+                        $io->writeln('  |- Backing up pages...    <red>failed</red>');
                     }
                 }
             }
 
             // Confirmation received, copy over the data
-            $this->output->writeln('  |- Installing demo content...    <green>ok</green>                             ');
+            $io->writeln('  |- Installing demo content...    <green>ok</green>                             ');
             Folder::rcopy($demo_dir, $dest_dir);
-            $this->output->writeln("  '- <green>Success!</green>  ");
-            $this->output->writeln('');
+            $io->writeln("  '- <green>Success!</green>  ");
+            $io->newLine();
         }
     }
 
     /**
      * @param Package $package
-     *
-     * @return array|bool
+     * @return array|false
      */
-    private function getGitRegexMatches($package)
+    private function getGitRegexMatches(Package $package)
     {
         if (isset($package->repository)) {
             $repository = $package->repository;
@@ -432,10 +452,9 @@ private function getGitRegexMatches($package)
 
     /**
      * @param Package $package
-     *
-     * @return bool|string
+     * @return string|false
      */
-    private function getSymlinkSource($package)
+    private function getSymlinkSource(Package $package)
     {
         $matches = $this->getGitRegexMatches($package);
 
@@ -445,7 +464,7 @@ private function getSymlinkSource($package)
             } else {
                 $repo_dir = $matches[2];
             }
-            
+
             $paths = (array) $paths;
             foreach ($paths as $repo) {
                 $path = rtrim($repo, '/') . '/' . $repo_dir;
@@ -453,94 +472,94 @@ private function getSymlinkSource($package)
                     return $path;
                 }
             }
-
         }
 
         return false;
     }
 
     /**
-     * @param  Package    $package
+     * @param Package $package
+     * @return void
      */
-    private function processSymlink($package)
+    private function processSymlink(Package $package): void
     {
+        $io = $this->getIO();
 
-        exec('cd ' . $this->destination);
+        exec('cd ' . escapeshellarg($this->destination));
 
         $to = $this->destination . DS . $package->install_path;
         $from = $this->getSymlinkSource($package);
 
-        $this->output->writeln("Preparing to Symlink <cyan>{$package->name}</cyan>");
-        $this->output->write('  |- Checking source...  ');
+        $io->writeln("Preparing to Symlink <cyan>{$package->name}</cyan>");
+        $io->write('  |- Checking source...  ');
 
         if (file_exists($from)) {
-            $this->output->writeln('<green>ok</green>');
+            $io->writeln('<green>ok</green>');
 
-            $this->output->write('  |- Checking destination...  ');
+            $io->write('  |- Checking destination...  ');
             $checks = $this->checkDestination($package);
 
             if (!$checks) {
-                $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-                $this->output->writeln('');
+                $io->writeln("  '- <red>Installation failed or aborted.</red>");
+                $io->newLine();
+            } elseif (file_exists($to)) {
+                $io->writeln("  '- <red>Symlink cannot overwrite an existing package, please remove first</red>");
+                $io->newLine();
             } else {
-                if (file_exists($to)) {
-                    $this->output->writeln("  '- <red>Symlink cannot overwrite an existing package, please remove first</red>");
-                    $this->output->writeln('');
-                } else {
-                    symlink($from, $to);
+                symlink($from, $to);
 
-                    // extra white spaces to clear out the buffer properly
-                    $this->output->writeln('  |- Symlinking package...    <green>ok</green>                             ');
-                    $this->output->writeln("  '- <green>Success!</green>  ");
-                    $this->output->writeln('');
-                }
+                // extra white spaces to clear out the buffer properly
+                $io->writeln('  |- Symlinking package...    <green>ok</green>                             ');
+                $io->writeln("  '- <green>Success!</green>  ");
+                $io->newLine();
             }
 
             return;
         }
 
-        $this->output->writeln('<red>not found!</red>');
-        $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
+        $io->writeln('<red>not found!</red>');
+        $io->writeln("  '- <red>Installation failed or aborted.</red>");
     }
 
     /**
-     * @param Package   $package
-     * @param bool      $is_update
-     *
+     * @param Package $package
+     * @param bool $is_update
      * @return bool
      */
-    private function processGpm($package, $is_update = false)
+    private function processGpm(Package $package, bool $is_update = false)
     {
-        $version = isset($package->available) ? $package->available : $package->version;
+        $io = $this->getIO();
+
+        $version = $package->available ?? $package->version;
         $license = Licenses::get($package->slug);
 
-        $this->output->writeln("Preparing to install <cyan>{$package->name}</cyan> [v{$version}]");
+        $io->writeln("Preparing to install <cyan>{$package->name}</cyan> [v{$version}]");
 
-        $this->output->write('  |- Downloading package...     0%');
+        $io->write('  |- Downloading package...     0%');
         $this->file = $this->downloadPackage($package, $license);
 
         if (!$this->file) {
-            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-            $this->output->writeln('');
+            $io->writeln("  '- <red>Installation failed or aborted.</red>");
+            $io->newLine();
 
             return false;
         }
 
-        $this->output->write('  |- Checking destination...  ');
+        $io->write('  |- Checking destination...  ');
         $checks = $this->checkDestination($package);
 
         if (!$checks) {
-            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-            $this->output->writeln('');
+            $io->writeln("  '- <red>Installation failed or aborted.</red>");
+            $io->newLine();
         } else {
-            $this->output->write('  |- Installing package...  ');
+            $io->write('  |- Installing package...  ');
             $installation = $this->installPackage($package, $is_update);
             if (!$installation) {
-                $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-                $this->output->writeln('');
+                $io->writeln("  '- <red>Installation failed or aborted.</red>");
+                $io->newLine();
             } else {
-                $this->output->writeln("  '- <green>Success!</green>  ");
-                $this->output->writeln('');
+                $io->writeln("  '- <green>Success!</green>  ");
+                $io->newLine();
 
                 return true;
             }
@@ -551,26 +570,27 @@ private function processGpm($package, $is_update = false)
 
     /**
      * @param Package $package
-     *
-     * @param string    $license
-     *
-     * @return string
+     * @param string|null $license
+     * @return string|null
      */
-    private function downloadPackage($package, $license = null)
+    private function downloadPackage(Package $package, string $license = null)
     {
+        $io = $this->getIO();
+
         $tmp_dir = Grav::instance()['locator']->findResource('tmp://', true, true);
         $this->tmp = $tmp_dir . '/Grav-' . uniqid();
-        $filename = $package->slug . basename($package->zipball_url);
+        $filename = $package->slug . Utils::basename($package->zipball_url);
         $filename = preg_replace('/[\\\\\/:"*?&<>|]+/m', '-', $filename);
         $query = '';
 
         if (!empty($package->premium)) {
-            $query = \json_encode(array_merge(
+            $query = json_encode(array_merge(
                 $package->premium,
                 [
                     'slug' => $package->slug,
                     'filename' => $package->premium['filename'],
-                    'license_key' => $license
+                    'license_key' => $license,
+                    'sid' => md5(GRAV_ROOT)
                 ]
             ));
 
@@ -579,21 +599,27 @@ private function downloadPackage($package, $license = null)
 
         try {
             $output = Response::get($package->zipball_url . $query, [], [$this, 'progress']);
-        } catch (\Exception $e) {
-            $error = str_replace("\n", "\n  |  '- ", $e->getMessage());
-            $this->output->write("\x0D");
+        } catch (Exception $e) {
+            if (!empty($package->premium) && $e->getCode() === 401) {
+                $message = '<yellow>Unauthorized Premium License Key</yellow>';
+            } else {
+                $message = $e->getMessage();
+            }
+
+            $error = str_replace("\n", "\n  |  '- ", $message);
+            $io->write("\x0D");
             // extra white spaces to clear out the buffer properly
-            $this->output->writeln('  |- Downloading package...    <red>error</red>                             ');
-            $this->output->writeln("  |  '- " . $error);
+            $io->writeln('  |- Downloading package...    <red>error</red>                             ');
+            $io->writeln("  |  '- " . $error);
 
-            return false;
+            return null;
         }
 
         Folder::create($this->tmp);
 
-        $this->output->write("\x0D");
-        $this->output->write('  |- Downloading package...   100%');
-        $this->output->writeln('');
+        $io->write("\x0D");
+        $io->write('  |- Downloading package...   100%');
+        $io->newLine();
 
         file_put_contents($this->tmp . DS . $filename, $output);
 
@@ -601,32 +627,33 @@ private function downloadPackage($package, $license = null)
     }
 
     /**
-     * @param Package     $package
-     *
+     * @param Package $package
      * @return bool
      */
-    private function checkDestination($package)
+    private function checkDestination(Package $package): bool
     {
-        $question_helper = $this->getHelper('question');
+        $io = $this->getIO();
 
         Installer::isValidDestination($this->destination . DS . $package->install_path);
 
-        if (Installer::lastErrorCode() == Installer::IS_LINK) {
-            $this->output->write("\x0D");
-            $this->output->writeln('  |- Checking destination...  <yellow>symbolic link</yellow>');
+        if (Installer::lastErrorCode() === Installer::IS_LINK) {
+            $io->write("\x0D");
+            $io->writeln('  |- Checking destination...  <yellow>symbolic link</yellow>');
 
             if ($this->all_yes) {
-                $this->output->writeln("  |     '- <yellow>Skipped automatically.</yellow>");
+                $io->writeln("  |     '- <yellow>Skipped automatically.</yellow>");
 
                 return false;
             }
 
-            $question = new ConfirmationQuestion("  |  '- Destination has been detected as symlink, delete symbolic link first? [y|N] ",
-                false);
-            $answer = $question_helper->ask($this->input, $this->output, $question);
+            $question = new ConfirmationQuestion(
+                "  |  '- Destination has been detected as symlink, delete symbolic link first? [y|N] ",
+                false
+            );
+            $answer = $io->askQuestion($question);
 
             if (!$answer) {
-                $this->output->writeln("  |     '- <red>You decided to not delete the symlink automatically.</red>");
+                $io->writeln("  |     '- <red>You decided to not delete the symlink automatically.</red>");
 
                 return false;
             }
@@ -634,8 +661,8 @@ private function checkDestination($package)
             unlink($this->destination . DS . $package->install_path);
         }
 
-        $this->output->write("\x0D");
-        $this->output->writeln('  |- Checking destination...  <green>ok</green>');
+        $io->write("\x0D");
+        $io->writeln('  |- Checking destination...  <green>ok</green>');
 
         return true;
     }
@@ -644,12 +671,13 @@ private function checkDestination($package)
      * Install a package
      *
      * @param Package $package
-     * @param bool    $is_update True if it's an update. False if it's an install
-     *
+     * @param bool $is_update True if it's an update. False if it's an install
      * @return bool
      */
-    private function installPackage($package, $is_update = false)
+    private function installPackage(Package $package, bool $is_update = false): bool
     {
+        $io = $this->getIO();
+
         $type = $package->package_type;
 
         Installer::install($this->file, $this->destination, ['install_path' => $package->install_path, 'theme' => $type === 'themes', 'is_update' => $is_update]);
@@ -657,35 +685,42 @@ private function installPackage($package, $is_update = false)
         Folder::delete($this->tmp);
 
         if ($error_code) {
-            $this->output->write("\x0D");
+            $io->write("\x0D");
             // extra white spaces to clear out the buffer properly
-            $this->output->writeln('  |- Installing package...    <red>error</red>                             ');
-            $this->output->writeln("  |  '- " . Installer::lastErrorMsg());
+            $io->writeln('  |- Installing package...    <red>error</red>                             ');
+            $io->writeln("  |  '- " . Installer::lastErrorMsg());
 
             return false;
         }
 
         $message = Installer::getMessage();
         if ($message) {
-            $this->output->write("\x0D");
+            $io->write("\x0D");
             // extra white spaces to clear out the buffer properly
-            $this->output->writeln("  |- {$message}");
+            $io->writeln("  |- {$message}");
         }
 
-        $this->output->write("\x0D");
+        $io->write("\x0D");
         // extra white spaces to clear out the buffer properly
-        $this->output->writeln('  |- Installing package...    <green>ok</green>                             ');
+        $io->writeln('  |- Installing package...    <green>ok</green>                             ');
 
         return true;
     }
 
     /**
      * @param array $progress
+     * @return void
      */
-    public function progress($progress)
+    public function progress(array $progress): void
     {
-        $this->output->write("\x0D");
-        $this->output->write('  |- Downloading package... ' . str_pad($progress['percent'], 5, ' ',
-                STR_PAD_LEFT) . '%');
+        $io = $this->getIO();
+
+        $io->write("\x0D");
+        $io->write('  |- Downloading package... ' . str_pad(
+            $progress['percent'],
+            5,
+            ' ',
+            STR_PAD_LEFT
+        ) . '%');
     }
 }
diff --git a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
index 1562f4b661..30bc5f5aba 100644
--- a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
+++ b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
@@ -3,50 +3,56 @@
 /**
  * @package    Grav\Console\Gpm
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\Gpm;
 
-use Grav\Common\Cache;
+use Exception;
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\HTTP\Response;
 use Grav\Common\GPM\Installer;
-use Grav\Common\GPM\Remote\Package;
-use Grav\Common\GPM\Response;
 use Grav\Common\GPM\Upgrader;
 use Grav\Common\Grav;
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GpmCommand;
+use Grav\Installer\Install;
+use RuntimeException;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
+use ZipArchive;
+use function is_callable;
+use function strlen;
 
-class SelfupgradeCommand extends ConsoleCommand
+/**
+ * Class SelfupgradeCommand
+ * @package Grav\Console\Gpm
+ */
+class SelfupgradeCommand extends GpmCommand
 {
     /** @var array */
     protected $data;
-
-    protected $extensions;
-
-    protected $updatable;
-
     /** @var string */
     protected $file;
-
     /** @var array */
     protected $types = ['plugins', 'themes'];
-
-    /** @var string */
+    /** @var string|null */
     private $tmp;
-
+    /** @var Upgrader */
     private $upgrader;
 
     /** @var string */
     protected $all_yes;
-
+    /** @var string */
     protected $overwrite;
+    /** @var int */
+    protected $timeout;
 
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('self-upgrade')
@@ -69,15 +75,36 @@ protected function configure()
                 InputOption::VALUE_NONE,
                 'Option to overwrite packages if they already exist'
             )
+            ->addOption(
+                'timeout',
+                't',
+                InputOption::VALUE_OPTIONAL,
+                'Option to set the timeout in seconds when downloading the update (0 for no timeout)',
+                30
+            )
             ->setDescription('Detects and performs an update of Grav itself when available')
             ->setHelp('The <info>update</info> command updates Grav itself when a new version is available');
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
-        $this->upgrader = new Upgrader($this->input->getOption('force'));
-        $this->all_yes = $this->input->getOption('all-yes');
-        $this->overwrite = $this->input->getOption('overwrite');
+        $input = $this->getInput();
+        $io = $this->getIO();
+
+        if (!class_exists(ZipArchive::class)) {
+            $io->title('GPM Self Upgrade');
+            $io->error('php-zip extension needs to be enabled!');
+
+            return 1;
+        }
+
+        $this->upgrader = new Upgrader($input->getOption('force'));
+        $this->all_yes = $input->getOption('all-yes');
+        $this->overwrite = $input->getOption('overwrite');
+        $this->timeout = (int) $input->getOption('timeout');
 
         $this->displayGPMRelease();
 
@@ -88,110 +115,148 @@ protected function serve()
         $release = strftime('%c', strtotime($this->upgrader->getReleaseDate()));
 
         if (!$this->upgrader->meetsRequirements()) {
-            $this->output->writeln('<red>ATTENTION:</red>');
-            $this->output->writeln('   Grav has increased the minimum PHP requirement.');
-            $this->output->writeln('   You are currently running PHP <red>' . phpversion() . '</red>, but PHP <green>' . $this->upgrader->minPHPVersion() . '</green> is required.');
-            $this->output->writeln('   Additional information: <white>http://getgrav.org/blog/changing-php-requirements</white>');
-            $this->output->writeln('');
-            $this->output->writeln('Selfupgrade aborted.');
-            $this->output->writeln('');
-            exit;
+            $io->writeln('<red>ATTENTION:</red>');
+            $io->writeln('   Grav has increased the minimum PHP requirement.');
+            $io->writeln('   You are currently running PHP <red>' . phpversion() . '</red>, but PHP <green>' . $this->upgrader->minPHPVersion() . '</green> is required.');
+            $io->writeln('   Additional information: <white>http://getgrav.org/blog/changing-php-requirements</white>');
+            $io->newLine();
+            $io->writeln('Selfupgrade aborted.');
+            $io->newLine();
+
+            return 1;
         }
 
         if (!$this->overwrite && !$this->upgrader->isUpgradable()) {
-            $this->output->writeln("You are already running the latest version of Grav (v{$local}) released on {$release}");
-            exit;
+            $io->writeln("You are already running the latest version of <green>Grav v{$local}</green>");
+            $io->writeln("which was released on {$release}");
+
+            $config = Grav::instance()['config'];
+            $schema = $config->get('versions.core.grav.schema');
+            if ($schema !== GRAV_SCHEMA && version_compare($schema, GRAV_SCHEMA, '<')) {
+                $io->newLine();
+                $io->writeln('However post-install scripts have not been run.');
+                if (!$this->all_yes) {
+                    $question = new ConfirmationQuestion(
+                        'Would you like to run the scripts? [Y|n] ',
+                        true
+                    );
+                    $answer = $io->askQuestion($question);
+                } else {
+                    $answer = true;
+                }
+
+                if ($answer) {
+                    // Finalize installation.
+                    Install::instance()->finalize();
+
+                    $io->write('  |- Running post-install scripts...  ');
+                    $io->writeln("  '- <green>Success!</green>  ");
+                    $io->newLine();
+                }
+            }
+
+            return 0;
         }
 
         Installer::isValidDestination(GRAV_ROOT . '/system');
         if (Installer::IS_LINK === Installer::lastErrorCode()) {
-            $this->output->writeln('<red>ATTENTION:</red> Grav is symlinked, cannot upgrade, aborting...');
-            $this->output->writeln('');
-            $this->output->writeln("You are currently running a symbolically linked Grav v{$local}. Latest available is v{$remote}.");
-            exit;
+            $io->writeln('<red>ATTENTION:</red> Grav is symlinked, cannot upgrade, aborting...');
+            $io->newLine();
+            $io->writeln("You are currently running a symbolically linked Grav v{$local}. Latest available is v{$remote}.");
+
+            return 1;
         }
 
         // not used but preloaded just in case!
         new ArrayInput([]);
 
-        $questionHelper = $this->getHelper('question');
-
-
-        $this->output->writeln("Grav v<cyan>{$remote}</cyan> is now available [release date: {$release}].");
-        $this->output->writeln('You are currently using v<cyan>' . GRAV_VERSION . '</cyan>.');
+        $io->writeln("Grav v<cyan>{$remote}</cyan> is now available [release date: {$release}].");
+        $io->writeln('You are currently using v<cyan>' . GRAV_VERSION . '</cyan>.');
 
         if (!$this->all_yes) {
-            $question = new ConfirmationQuestion('Would you like to read the changelog before proceeding? [y|N] ',
-                false);
-            $answer = $questionHelper->ask($this->input, $this->output, $question);
+            $question = new ConfirmationQuestion(
+                'Would you like to read the changelog before proceeding? [y|N] ',
+                false
+            );
+            $answer = $io->askQuestion($question);
 
             if ($answer) {
                 $changelog = $this->upgrader->getChangelog(GRAV_VERSION);
 
-                $this->output->writeln('');
+                $io->newLine();
                 foreach ($changelog as $version => $log) {
                     $title = $version . ' [' . $log['date'] . ']';
-                    $content = preg_replace_callback('/\d\.\s\[\]\(#(.*)\)/', function ($match) {
+                    $content = preg_replace_callback('/\d\.\s\[\]\(#(.*)\)/', static function ($match) {
                         return "\n" . ucfirst($match[1]) . ':';
                     }, $log['content']);
 
-                    $this->output->writeln($title);
-                    $this->output->writeln(str_repeat('-', \strlen($title)));
-                    $this->output->writeln($content);
-                    $this->output->writeln('');
+                    $io->writeln($title);
+                    $io->writeln(str_repeat('-', strlen($title)));
+                    $io->writeln($content);
+                    $io->newLine();
                 }
 
                 $question = new ConfirmationQuestion('Press [ENTER] to continue.', true);
-                $questionHelper->ask($this->input, $this->output, $question);
+                $io->askQuestion($question);
             }
 
             $question = new ConfirmationQuestion('Would you like to upgrade now? [y|N] ', false);
-            $answer = $questionHelper->ask($this->input, $this->output, $question);
+            $answer = $io->askQuestion($question);
 
             if (!$answer) {
-                $this->output->writeln('Aborting...');
+                $io->writeln('Aborting...');
 
-                exit;
+                return 1;
             }
         }
 
-        $this->output->writeln('');
-        $this->output->writeln("Preparing to upgrade to v<cyan>{$remote}</cyan>..");
+        $io->newLine();
+        $io->writeln("Preparing to upgrade to v<cyan>{$remote}</cyan>..");
 
-        $this->output->write("  |- Downloading upgrade [{$this->formatBytes($update['size'])}]...     0%");
+        $io->write("  |- Downloading upgrade [{$this->formatBytes($update['size'])}]...     0%");
         $this->file = $this->download($update);
 
-        $this->output->write('  |- Installing upgrade...  ');
+        $io->write('  |- Installing upgrade...  ');
         $installation = $this->upgrade();
 
+        $error = 0;
         if (!$installation) {
-            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-            $this->output->writeln('');
+            $io->writeln("  '- <red>Installation failed or aborted.</red>");
+            $io->newLine();
+            $error = 1;
         } else {
-            $this->output->writeln("  '- <green>Success!</green>  ");
-            $this->output->writeln('');
+            $io->writeln("  '- <green>Success!</green>  ");
+            $io->newLine();
         }
 
-        // clear cache after successful upgrade
-        $this->clearCache('all');
+        if ($this->tmp && is_dir($this->tmp)) {
+            Folder::delete($this->tmp);
+        }
+
+        return $error;
     }
 
     /**
-     * @param Package $package
-     *
+     * @param array $package
      * @return string
      */
-    private function download($package)
+    private function download(array $package): string
     {
+        $io = $this->getIO();
+
         $tmp_dir = Grav::instance()['locator']->findResource('tmp://', true, true);
-        $this->tmp = $tmp_dir . '/Grav-' . uniqid('', false);
-        $output = Response::get($package['download'], [], [$this, 'progress']);
+        $this->tmp = $tmp_dir . '/grav-update-' . uniqid('', false);
+        $options = [
+            'timeout' => $this->timeout,
+        ];
+
+        $output = Response::get($package['download'], $options, [$this, 'progress']);
 
         Folder::create($this->tmp);
 
-        $this->output->write("\x0D");
-        $this->output->write("  |- Downloading upgrade [{$this->formatBytes($package['size'])}]...   100%");
-        $this->output->writeln('');
+        $io->write("\x0D");
+        $io->write("  |- Downloading upgrade [{$this->formatBytes($package['size'])}]...   100%");
+        $io->newLine();
 
         file_put_contents($this->tmp . DS . $package['name'], $output);
 
@@ -201,55 +266,52 @@ private function download($package)
     /**
      * @return bool
      */
-    private function upgrade()
+    private function upgrade(): bool
     {
-        if ($this->file) {
-            $folder = Installer::unZip($this->file, $this->tmp . '/zip');
-        } else {
-            $folder = false;
-        }
+        $io = $this->getIO();
 
-        static::upgradeGrav($this->file, $folder);
+        $this->upgradeGrav($this->file);
 
         $errorCode = Installer::lastErrorCode();
-
-        if ($this->tmp) {
-            Folder::delete($this->tmp);
-        }
-
-        if ($errorCode & (Installer::ZIP_OPEN_ERROR | Installer::ZIP_EXTRACT_ERROR)) {
-            $this->output->write("\x0D");
+        if ($errorCode) {
+            $io->write("\x0D");
             // extra white spaces to clear out the buffer properly
-            $this->output->writeln('  |- Installing upgrade...    <red>error</red>                             ');
-            $this->output->writeln("  |  '- " . Installer::lastErrorMsg());
+            $io->writeln('  |- Installing upgrade...    <red>error</red>                             ');
+            $io->writeln("  |  '- " . Installer::lastErrorMsg());
 
             return false;
         }
 
-        $this->output->write("\x0D");
+        $io->write("\x0D");
         // extra white spaces to clear out the buffer properly
-        $this->output->writeln('  |- Installing upgrade...    <green>ok</green>                             ');
+        $io->writeln('  |- Installing upgrade...    <green>ok</green>                             ');
 
         return true;
     }
 
     /**
      * @param array $progress
+     * @return void
      */
-    public function progress($progress)
+    public function progress(array $progress): void
     {
-        $this->output->write("\x0D");
-        $this->output->write("  |- Downloading upgrade [{$this->formatBytes($progress['filesize']) }]... " . str_pad($progress['percent'],
-                5, ' ', STR_PAD_LEFT) . '%');
+        $io = $this->getIO();
+
+        $io->write("\x0D");
+        $io->write("  |- Downloading upgrade [{$this->formatBytes($progress['filesize']) }]... " . str_pad(
+            $progress['percent'],
+            5,
+            ' ',
+            STR_PAD_LEFT
+        ) . '%');
     }
 
     /**
      * @param int|float $size
      * @param int $precision
-     *
      * @return string
      */
-    public function formatBytes($size, $precision = 2)
+    public function formatBytes($size, int $precision = 2): string
     {
         $base = log($size) / log(1024);
         $suffixes = array('', 'k', 'M', 'G', 'T');
@@ -257,40 +319,25 @@ public function formatBytes($size, $precision = 2)
         return round(1024 ** ($base - floor($base)), $precision) . $suffixes[(int)floor($base)];
     }
 
-    private function upgradeGrav($zip, $folder, $keepFolder = false)
+    /**
+     * @param string $zip
+     * @return void
+     */
+    private function upgradeGrav(string $zip): void
     {
-        static $ignores = [
-            'backup',
-            'cache',
-            'images',
-            'logs',
-            'tmp',
-            'user',
-            '.htaccess',
-            'robots.txt'
-        ];
-
-        if (!is_dir($folder)) {
-            Installer::setError('Invalid source folder');
-        }
-
         try {
+            $folder = Installer::unZip($zip, $this->tmp . '/zip');
+            if ($folder === false) {
+                throw new RuntimeException(Installer::lastErrorMsg());
+            }
+
             $script = $folder . '/system/install.php';
-            /** Install $installer */
             if ((file_exists($script) && $install = include $script) && is_callable($install)) {
                 $install($zip);
             } else {
-                Installer::install(
-                    $zip,
-                    GRAV_ROOT,
-                    ['sophisticated' => true, 'overwrite' => true, 'ignore_symlinks' => true, 'ignores' => $ignores],
-                    $folder,
-                    $keepFolder
-                );
-
-                Cache::clearCache();
+                throw new RuntimeException('Uploaded archive file is not a valid Grav update package');
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Installer::setError($e->getMessage());
         }
     }
diff --git a/system/src/Grav/Console/Gpm/UninstallCommand.php b/system/src/Grav/Console/Gpm/UninstallCommand.php
index 99fc81ab0c..a3db657097 100644
--- a/system/src/Grav/Console/Gpm/UninstallCommand.php
+++ b/system/src/Grav/Console/Gpm/UninstallCommand.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Console\Gpm
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,37 +11,43 @@
 
 use Grav\Common\GPM\GPM;
 use Grav\Common\GPM\Installer;
-use Grav\Common\GPM\Remote\Package;
+use Grav\Common\GPM\Local;
+use Grav\Common\GPM\Remote;
 use Grav\Common\Grav;
-use Grav\Console\ConsoleCommand;
+use Grav\Console\GpmCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Throwable;
+use function count;
+use function in_array;
+use function is_array;
 
-class UninstallCommand extends ConsoleCommand
+/**
+ * Class UninstallCommand
+ * @package Grav\Console\Gpm
+ */
+class UninstallCommand extends GpmCommand
 {
     /** @var array */
     protected $data;
-
     /** @var GPM */
     protected $gpm;
-
     /** @var string */
     protected $destination;
-
     /** @var string */
     protected $file;
-
     /** @var string */
     protected $tmp;
-
     /** @var array */
     protected $dependencies = [];
-
     /** @var string */
     protected $all_yes;
 
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('uninstall')
@@ -60,13 +66,19 @@ protected function configure()
             ->setHelp('The <info>uninstall</info> command allows to uninstall plugins and themes');
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
+        $input = $this->getInput();
+        $io = $this->getIO();
+
         $this->gpm = new GPM();
 
-        $this->all_yes = $this->input->getOption('all-yes');
+        $this->all_yes = $input->getOption('all-yes');
 
-        $packages = array_map('strtolower', $this->input->getArgument('package'));
+        $packages = array_map('strtolower', $input->getArgument('package'));
         $this->data = ['total' => 0, 'not_found' => []];
 
         $total = 0;
@@ -82,55 +94,70 @@ protected function serve()
         }
         $this->data['total'] = $total;
 
-        $this->output->writeln('');
+        $io->newLine();
 
         if (!$this->data['total']) {
-            $this->output->writeln('Nothing to uninstall.');
-            $this->output->writeln('');
-            exit;
+            $io->writeln('Nothing to uninstall.');
+            $io->newLine();
+
+            return 0;
         }
 
         if (count($this->data['not_found'])) {
-            $this->output->writeln('These packages were not found installed: <red>' . implode('</red>, <red>',
-                    $this->data['not_found']) . '</red>');
+            $io->writeln('These packages were not found installed: <red>' . implode(
+                '</red>, <red>',
+                $this->data['not_found']
+            ) . '</red>');
         }
 
         unset($this->data['not_found'], $this->data['total']);
 
+        // Plugins need to be initialized in order to make clearcache to work.
+        try {
+            $this->initializePlugins();
+        } catch (Throwable $e) {
+            $io->writeln("<red>Some plugins failed to initialize: {$e->getMessage()}</red>");
+        }
+
+        $error = 0;
         foreach ($this->data as $slug => $package) {
-            $this->output->writeln("Preparing to uninstall <cyan>{$package->name}</cyan> [v{$package->version}]");
+            $io->writeln("Preparing to uninstall <cyan>{$package->name}</cyan> [v{$package->version}]");
 
-            $this->output->write('  |- Checking destination...  ');
+            $io->write('  |- Checking destination...  ');
             $checks = $this->checkDestination($slug, $package);
 
             if (!$checks) {
-                $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-                $this->output->writeln('');
+                $io->writeln("  '- <red>Installation failed or aborted.</red>");
+                $io->newLine();
+                $error = 1;
             } else {
                 $uninstall = $this->uninstallPackage($slug, $package);
 
                 if (!$uninstall) {
-                    $this->output->writeln("  '- <red>Uninstallation failed or aborted.</red>");
+                    $io->writeln("  '- <red>Uninstallation failed or aborted.</red>");
+                    $error = 1;
                 } else {
-                    $this->output->writeln("  '- <green>Success!</green>  ");
+                    $io->writeln("  '- <green>Success!</green>  ");
                 }
             }
-
         }
 
         // clear cache after successful upgrade
         $this->clearCache();
-    }
 
+        return $error;
+    }
 
     /**
      * @param string $slug
-     * @param Package $package
-     *
+     * @param Local\Package|Remote\Package $package
+     * @param bool $is_dependency
      * @return bool
      */
-    private function uninstallPackage($slug, $package, $is_dependency = false)
+    private function uninstallPackage($slug, $package, $is_dependency = false): bool
     {
+        $io = $this->getIO();
+
         if (!$slug) {
             return false;
         }
@@ -138,44 +165,37 @@ private function uninstallPackage($slug, $package, $is_dependency = false)
         //check if there are packages that have this as a dependency. Abort and show list
         $dependent_packages = $this->gpm->getPackagesThatDependOnPackage($slug);
         if (count($dependent_packages) > ($is_dependency ? 1 : 0)) {
-            $this->output->writeln('');
-            $this->output->writeln('');
-            $this->output->writeln('<red>Uninstallation failed.</red>');
-            $this->output->writeln('');
-            if (\count($dependent_packages) > ($is_dependency ? 2 : 1)) {
-                $this->output->writeln('The installed packages <cyan>' . implode('</cyan>, <cyan>', $dependent_packages) . '</cyan> depends on this package. Please remove those first.');
+            $io->newLine(2);
+            $io->writeln('<red>Uninstallation failed.</red>');
+            $io->newLine();
+            if (count($dependent_packages) > ($is_dependency ? 2 : 1)) {
+                $io->writeln('The installed packages <cyan>' . implode('</cyan>, <cyan>', $dependent_packages) . '</cyan> depends on this package. Please remove those first.');
             } else {
-                $this->output->writeln('The installed package <cyan>' . implode('</cyan>, <cyan>', $dependent_packages) . '</cyan> depends on this package. Please remove it first.');
+                $io->writeln('The installed package <cyan>' . implode('</cyan>, <cyan>', $dependent_packages) . '</cyan> depends on this package. Please remove it first.');
             }
 
-            $this->output->writeln('');
+            $io->newLine();
             return false;
         }
 
         if (isset($package->dependencies)) {
-
             $dependencies = $package->dependencies;
 
             if ($is_dependency) {
                 foreach ($dependencies as $key => $dependency) {
-                    if (\in_array($dependency['name'], $this->dependencies, true)) {
+                    if (in_array($dependency['name'], $this->dependencies, true)) {
                         unset($dependencies[$key]);
                     }
                 }
-            } else {
-                if (\count($dependencies) > 0) {
-                    $this->output->writeln('  `- Dependencies found...');
-                    $this->output->writeln('');
-                }
+            } elseif (count($dependencies) > 0) {
+                $io->writeln('  `- Dependencies found...');
+                $io->newLine();
             }
 
-            $questionHelper = $this->getHelper('question');
-
             foreach ($dependencies as $dependency) {
-
                 $this->dependencies[] = $dependency['name'];
 
-                if (\is_array($dependency)) {
+                if (is_array($dependency)) {
                     $dependency = $dependency['name'];
                 }
                 if ($dependency === 'grav' || $dependency === 'php') {
@@ -187,27 +207,25 @@ private function uninstallPackage($slug, $package, $is_dependency = false)
                 $dependency_exists = $this->packageExists($dependency, $dependencyPackage);
 
                 if ($dependency_exists == Installer::EXISTS) {
-                    $this->output->writeln("A dependency on <cyan>{$dependencyPackage->name}</cyan> [v{$dependencyPackage->version}] was found");
+                    $io->writeln("A dependency on <cyan>{$dependencyPackage->name}</cyan> [v{$dependencyPackage->version}] was found");
 
                     $question = new ConfirmationQuestion("  |- Uninstall <cyan>{$dependencyPackage->name}</cyan>? [y|N] ", false);
-                    $answer = $this->all_yes ? true : $questionHelper->ask($this->input, $this->output, $question);
+                    $answer = $this->all_yes ? true : $io->askQuestion($question);
 
                     if ($answer) {
                         $uninstall = $this->uninstallPackage($dependency, $dependencyPackage, true);
 
                         if (!$uninstall) {
-                            $this->output->writeln("  '- <red>Uninstallation failed or aborted.</red>");
+                            $io->writeln("  '- <red>Uninstallation failed or aborted.</red>");
                         } else {
-                            $this->output->writeln("  '- <green>Success!</green>  ");
-
+                            $io->writeln("  '- <green>Success!</green>  ");
                         }
-                        $this->output->writeln('');
+                        $io->newLine();
                     } else {
-                        $this->output->writeln("  '- <yellow>You decided not to uninstall {$dependencyPackage->name}.</yellow>");
-                        $this->output->writeln('');
+                        $io->writeln("  '- <yellow>You decided not to uninstall {$dependencyPackage->name}.</yellow>");
+                        $io->newLine();
                     }
                 }
-
             }
         }
 
@@ -218,63 +236,61 @@ private function uninstallPackage($slug, $package, $is_dependency = false)
         $errorCode = Installer::lastErrorCode();
 
         if ($errorCode && $errorCode !== Installer::IS_LINK && $errorCode !== Installer::EXISTS) {
-            $this->output->writeln("  |- Uninstalling {$package->name} package...  <red>error</red>                             ");
-            $this->output->writeln("  |  '- <yellow>" . Installer::lastErrorMsg() . '</yellow>');
+            $io->writeln("  |- Uninstalling {$package->name} package...  <red>error</red>                             ");
+            $io->writeln("  |  '- <yellow>" . Installer::lastErrorMsg() . '</yellow>');
 
             return false;
         }
 
         $message = Installer::getMessage();
         if ($message) {
-            $this->output->writeln("  |- {$message}");
+            $io->writeln("  |- {$message}");
         }
 
         if (!$is_dependency && $this->dependencies) {
-            $this->output->writeln("Finishing up uninstalling <cyan>{$package->name}</cyan>");
+            $io->writeln("Finishing up uninstalling <cyan>{$package->name}</cyan>");
         }
-        $this->output->writeln("  |- Uninstalling {$package->name} package...  <green>ok</green>                             ");
-
-
+        $io->writeln("  |- Uninstalling {$package->name} package...  <green>ok</green>                             ");
 
         return true;
     }
 
     /**
      * @param string $slug
-     * @param Package $package
-     *
+     * @param Local\Package|Remote\Package $package
      * @return bool
      */
-
-    private function checkDestination($slug, $package)
+    private function checkDestination(string $slug, $package): bool
     {
-        $questionHelper = $this->getHelper('question');
+        $io = $this->getIO();
 
         $exists = $this->packageExists($slug, $package);
 
-        if ($exists == Installer::IS_LINK) {
-            $this->output->write("\x0D");
-            $this->output->writeln('  |- Checking destination...  <yellow>symbolic link</yellow>');
+        if ($exists === Installer::IS_LINK) {
+            $io->write("\x0D");
+            $io->writeln('  |- Checking destination...  <yellow>symbolic link</yellow>');
 
             if ($this->all_yes) {
-                $this->output->writeln("  |     '- <yellow>Skipped automatically.</yellow>");
+                $io->writeln("  |     '- <yellow>Skipped automatically.</yellow>");
 
                 return false;
             }
 
-            $question = new ConfirmationQuestion("  |  '- Destination has been detected as symlink, delete symbolic link first? [y|N] ",
-                false);
-            $answer = $this->all_yes ? true : $questionHelper->ask($this->input, $this->output, $question);
+            $question = new ConfirmationQuestion(
+                "  |  '- Destination has been detected as symlink, delete symbolic link first? [y|N] ",
+                false
+            );
 
+            $answer = $io->askQuestion($question);
             if (!$answer) {
-                $this->output->writeln("  |     '- <red>You decided not to delete the symlink automatically.</red>");
+                $io->writeln("  |     '- <red>You decided not to delete the symlink automatically.</red>");
 
                 return false;
             }
         }
 
-        $this->output->write("\x0D");
-        $this->output->writeln('  |- Checking destination...  <green>ok</green>');
+        $io->write("\x0D");
+        $io->writeln('  |- Checking destination...  <green>ok</green>');
 
         return true;
     }
@@ -283,13 +299,14 @@ private function checkDestination($slug, $package)
      * Check if package exists
      *
      * @param string $slug
-     * @param Package $package
+     * @param Local\Package|Remote\Package $package
      * @return int
      */
-    private function packageExists($slug, $package)
+    private function packageExists(string $slug, $package): int
     {
         $path = Grav::instance()['locator']->findResource($package->package_type . '://' . $slug);
         Installer::isValidDestination($path);
+
         return Installer::lastErrorCode();
     }
 }
diff --git a/system/src/Grav/Console/Gpm/UpdateCommand.php b/system/src/Grav/Console/Gpm/UpdateCommand.php
index d8ea735d72..73c5c9e42b 100644
--- a/system/src/Grav/Console/Gpm/UpdateCommand.php
+++ b/system/src/Grav/Console/Gpm/UpdateCommand.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Console\Gpm
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,43 +11,43 @@
 
 use Grav\Common\GPM\GPM;
 use Grav\Common\GPM\Installer;
-use Grav\Console\ConsoleCommand;
 use Grav\Common\GPM\Upgrader;
+use Grav\Console\GpmCommand;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
+use ZipArchive;
+use function array_key_exists;
+use function count;
 
-class UpdateCommand extends ConsoleCommand
+/**
+ * Class UpdateCommand
+ * @package Grav\Console\Gpm
+ */
+class UpdateCommand extends GpmCommand
 {
     /** @var array */
     protected $data;
-
-    protected $extensions;
-
-    protected $updatable;
-
     /** @var string */
     protected $destination;
-
     /** @var string */
     protected $file;
-
     /** @var array */
     protected $types = ['plugins', 'themes'];
-
     /** @var GPM  */
     protected $gpm;
-
     /** @var string */
     protected $all_yes;
-
+    /** @var string */
     protected $overwrite;
-
     /** @var Upgrader */
     protected $upgrader;
 
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('update')
@@ -97,42 +97,55 @@ protected function configure()
             ->setHelp('The <info>update</info> command updates plugins and themes when a new version is available');
     }
 
-    protected function serve()
+    /**
+     * @return int
+     */
+    protected function serve(): int
     {
-        $this->upgrader = new Upgrader($this->input->getOption('force'));
+        $input = $this->getInput();
+        $io = $this->getIO();
+
+        if (!class_exists(ZipArchive::class)) {
+            $io->title('GPM Update');
+            $io->error('php-zip extension needs to be enabled!');
+
+            return 1;
+        }
+
+        $this->upgrader = new Upgrader($input->getOption('force'));
         $local = $this->upgrader->getLocalVersion();
         $remote = $this->upgrader->getRemoteVersion();
         if ($local !== $remote) {
-            $this->output->writeln('<yellow>WARNING</yellow>: A new version of Grav is available. You should update Grav before updating plugins and themes. If you continue without updating Grav, some plugins or themes may stop working.');
-            $this->output->writeln('');
-            $questionHelper = $this->getHelper('question');
+            $io->writeln('<yellow>WARNING</yellow>: A new version of Grav is available. You should update Grav before updating plugins and themes. If you continue without updating Grav, some plugins or themes may stop working.');
+            $io->newLine();
             $question = new ConfirmationQuestion('Continue with the update process? [Y|n] ', true);
-            $answer = $questionHelper->ask($this->input, $this->output, $question);
+            $answer = $io->askQuestion($question);
 
             if (!$answer) {
-                $this->output->writeln('<red>Update aborted. Exiting...</red>');
-                exit;
+                $io->writeln('<red>Update aborted. Exiting...</red>');
+
+                return 1;
             }
         }
 
-        $this->gpm = new GPM($this->input->getOption('force'));
+        $this->gpm = new GPM($input->getOption('force'));
 
-        $this->all_yes = $this->input->getOption('all-yes');
-        $this->overwrite = $this->input->getOption('overwrite');
+        $this->all_yes = $input->getOption('all-yes');
+        $this->overwrite = $input->getOption('overwrite');
 
         $this->displayGPMRelease();
 
-        $this->destination = realpath($this->input->getOption('destination'));
+        $this->destination = realpath($input->getOption('destination'));
 
         if (!Installer::isGravInstance($this->destination)) {
-            $this->output->writeln('<red>ERROR</red>: ' . Installer::lastErrorMsg());
+            $io->writeln('<red>ERROR</red>: ' . Installer::lastErrorMsg());
             exit;
         }
-        if ($this->input->getOption('plugins') === false && $this->input->getOption('themes') === false) {
+        if ($input->getOption('plugins') === false && $input->getOption('themes') === false) {
             $list_type = ['plugins' => true, 'themes' => true];
         } else {
-            $list_type['plugins'] = $this->input->getOption('plugins');
-            $list_type['themes'] = $this->input->getOption('themes');
+            $list_type['plugins'] = $input->getOption('plugins');
+            $list_type['themes'] = $input->getOption('themes');
         }
 
         if ($this->overwrite) {
@@ -143,18 +156,19 @@ protected function serve()
             $description = ' need updating';
         }
 
-        $only_packages = array_map('strtolower', $this->input->getArgument('package'));
+        $only_packages = array_map('strtolower', $input->getArgument('package'));
 
         if (!$this->overwrite && !$this->data['total']) {
-            $this->output->writeln('Nothing to update.');
-            exit;
+            $io->writeln('Nothing to update.');
+
+            return 0;
         }
 
-        $this->output->write("Found <green>{$this->gpm->countInstalled()}</green> packages installed of which <magenta>{$this->data['total']}</magenta>{$description}");
+        $io->write("Found <green>{$this->gpm->countInstalled()}</green> packages installed of which <magenta>{$this->data['total']}</magenta>{$description}");
 
         $limit_to = $this->userInputPackages($only_packages);
 
-        $this->output->writeln('');
+        $io->newLine();
 
         unset($this->data['total'], $limit_to['total']);
 
@@ -162,10 +176,10 @@ protected function serve()
         // updates review
         $slugs = [];
 
-        $index = 0;
+        $index = 1;
         foreach ($this->data as $packages) {
             foreach ($packages as $slug => $package) {
-                if (!array_key_exists($slug, $limit_to) && \count($only_packages)) {
+                if (!array_key_exists($slug, $limit_to) && count($only_packages)) {
                     continue;
                 }
 
@@ -173,9 +187,9 @@ protected function serve()
                     $package->available = $package->version;
                 }
 
-                $this->output->writeln(
-                // index
-                    str_pad($index++ + 1, 2, '0', STR_PAD_LEFT) . '. ' .
+                $io->writeln(
+                    // index
+                    str_pad((string)$index++, 2, '0', STR_PAD_LEFT) . '. ' .
                     // name
                     '<cyan>' . str_pad($package->name, 15) . '</cyan> ' .
                     // version
@@ -187,14 +201,14 @@ protected function serve()
 
         if (!$this->all_yes) {
             // prompt to continue
-            $this->output->writeln('');
-            $questionHelper = $this->getHelper('question');
+            $io->newLine();
             $question = new ConfirmationQuestion('Continue with the update process? [Y|n] ', true);
-            $answer = $questionHelper->ask($this->input, $this->output, $question);
+            $answer = $io->askQuestion($question);
 
             if (!$answer) {
-                $this->output->writeln('<red>Update aborted. Exiting...</red>');
-                exit;
+                $io->writeln('<red>Update aborted. Exiting...</red>');
+
+                return 1;
             }
         }
 
@@ -204,30 +218,34 @@ protected function serve()
         $args = new ArrayInput([
             'command' => 'install',
             'package' => $slugs,
-            '-f' => $this->input->getOption('force'),
+            '-f' => $input->getOption('force'),
             '-d' => $this->destination,
             '-y' => true
         ]);
-        $command_exec = $install_command->run($args, $this->output);
+        $command_exec = $install_command->run($args, $io);
 
         if ($command_exec != 0) {
-            $this->output->writeln('<red>Error:</red> An error occurred while trying to install the packages');
-            exit;
+            $io->writeln('<red>Error:</red> An error occurred while trying to install the packages');
+
+            return 1;
         }
+
+        return 0;
     }
 
     /**
      * @param array $only_packages
-     *
      * @return array
      */
-    private function userInputPackages($only_packages)
+    private function userInputPackages(array $only_packages): array
     {
+        $io = $this->getIO();
+
         $found = ['total' => 0];
         $ignore = [];
 
-        if (!\count($only_packages)) {
-            $this->output->writeln('');
+        if (!count($only_packages)) {
+            $io->newLine();
         } else {
             foreach ($only_packages as $only_package) {
                 $find = $this->gpm->findPackage($only_package);
@@ -247,19 +265,22 @@ private function userInputPackages($only_packages)
                 $list = array_keys($list);
 
                 if ($found['total'] !== $this->data['total']) {
-                    $this->output->write(", only <magenta>{$found['total']}</magenta> will be updated");
+                    $io->write(", only <magenta>{$found['total']}</magenta> will be updated");
                 }
 
-                $this->output->writeln('');
-                $this->output->writeln('Limiting updates for only <cyan>' . implode('</cyan>, <cyan>',
-                        $list) . '</cyan>');
+                $io->newLine();
+                $io->writeln('Limiting updates for only <cyan>' . implode(
+                    '</cyan>, <cyan>',
+                    $list
+                ) . '</cyan>');
             }
 
-            if (\count($ignore)) {
-                $this->output->writeln('');
-                $this->output->writeln('Packages not found or not requiring updates: <red>' . implode('</red>, <red>',
-                        $ignore) . '</red>');
-
+            if (count($ignore)) {
+                $io->newLine();
+                $io->writeln('Packages not found or not requiring updates: <red>' . implode(
+                    '</red>, <red>',
+                    $ignore
+                ) . '</red>');
             }
         }
 
diff --git a/system/src/Grav/Console/Gpm/VersionCommand.php b/system/src/Grav/Console/Gpm/VersionCommand.php
index becc3274cc..862919648e 100644
--- a/system/src/Grav/Console/Gpm/VersionCommand.php
+++ b/system/src/Grav/Console/Gpm/VersionCommand.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Console\Gpm
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,17 +11,26 @@
 
 use Grav\Common\GPM\GPM;
 use Grav\Common\GPM\Upgrader;
-use Grav\Console\ConsoleCommand;
+use Grav\Common\Grav;
+use Grav\Console\GpmCommand;
 use RocketTheme\Toolbox\File\YamlFile;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
+use function count;
 
-class VersionCommand extends ConsoleCommand
+/**
+ * Class VersionCommand
+ * @package Grav\Console\Gpm
+ */
+class VersionCommand extends GpmCommand
 {
     /** @var GPM */
     protected $gpm;
 
-    protected function configure()
+    /**
+     * @return void
+     */
+    protected function configure(): void
     {
         $this
             ->setName('version')
@@ -41,12 +50,15 @@ protected function configure()
     }
 
     /**
-     * @return int|null|void
+     * @return int
      */
-    protected function serve()
+    protected function serve(): int
     {
-        $this->gpm = new GPM($this->input->getOption('force'));
-        $packages = $this->input->getArgument('package');
+        $input = $this->getInput();
+        $io = $this->getIO();
+
+        $this->gpm = new GPM($input->getOption('force'));
+        $packages = $input->getArgument('package');
 
         $installed = false;
 
@@ -68,10 +80,9 @@ protected function serve()
                 if ($upgrader->isUpgradable()) {
                     $updatable = " [upgradable: v<green>{$upgrader->getRemoteVersion()}</green>]";
                 }
-
             } else {
                 // get currently installed version
-                $locator = \Grav\Common\Grav::instance()['locator'];
+                $locator = Grav::instance()['locator'];
                 $blueprints_path = $locator->findResource('plugins://' . $package . DS . 'blueprints.yaml');
                 if (!file_exists($blueprints_path)) { // theme?
                     $blueprints_path = $locator->findResource('themes://' . $package . DS . 'blueprints.yaml');
@@ -103,10 +114,12 @@ protected function serve()
             $updatable = $updatable ?: '';
 
             if ($installed || $package === 'grav') {
-                $this->output->writeln("You are running <white>{$name}</white> v<cyan>{$version}</cyan>{$updatable}");
+                $io->writeln("You are running <white>{$name}</white> v<cyan>{$version}</cyan>{$updatable}");
             } else {
-                $this->output->writeln("Package <red>{$package}</red> not found");
+                $io->writeln("Package <red>{$package}</red> not found");
             }
         }
+
+        return 0;
     }
 }
diff --git a/system/src/Grav/Console/GpmCommand.php b/system/src/Grav/Console/GpmCommand.php
new file mode 100644
index 0000000000..a14eb4717a
--- /dev/null
+++ b/system/src/Grav/Console/GpmCommand.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * @package    Grav\Console
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Console;
+
+use Grav\Common\Config\Config;
+use Grav\Common\Grav;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Class ConsoleCommand
+ * @package Grav\Console
+ */
+class GpmCommand extends Command
+{
+    use ConsoleTrait;
+
+    /**
+     * @param InputInterface  $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->setupConsole($input, $output);
+
+        $grav = Grav::instance();
+        $grav['config']->init();
+        $grav['uri']->init();
+        // @phpstan-ignore-next-line
+        $grav['accounts'];
+
+        return $this->serve();
+    }
+
+    /**
+     * Override with your implementation.
+     *
+     * @return int
+     */
+    protected function serve()
+    {
+        // Return error.
+        return 1;
+    }
+
+    /**
+     * @return void
+     */
+    protected function displayGPMRelease()
+    {
+        /** @var Config $config */
+        $config = Grav::instance()['config'];
+
+        $io = $this->getIO();
+        $io->newLine();
+        $io->writeln('GPM Releases Configuration: <yellow>' . ucfirst($config->get('system.gpm.releases')) . '</yellow>');
+        $io->newLine();
+    }
+}
diff --git a/system/src/Grav/Console/GravCommand.php b/system/src/Grav/Console/GravCommand.php
new file mode 100644
index 0000000000..7db18e219e
--- /dev/null
+++ b/system/src/Grav/Console/GravCommand.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @package    Grav\Console
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Console;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Class ConsoleCommand
+ * @package Grav\Console
+ */
+class GravCommand extends Command
+{
+    use ConsoleTrait;
+
+    /**
+     * @param InputInterface  $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->setupConsole($input, $output);
+
+        // Old versions of Grav called this command after grav upgrade.
+        // We need make this command to work with older ConsoleTrait:
+        if (method_exists($this, 'initializeGrav')) {
+            $this->initializeGrav();
+        }
+
+        return $this->serve();
+    }
+
+    /**
+     * Override with your implementation.
+     *
+     * @return int
+     */
+    protected function serve()
+    {
+        // Return error.
+        return 1;
+    }
+}
diff --git a/system/src/Grav/Console/Plugin/PluginListCommand.php b/system/src/Grav/Console/Plugin/PluginListCommand.php
new file mode 100644
index 0000000000..022661452c
--- /dev/null
+++ b/system/src/Grav/Console/Plugin/PluginListCommand.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * @package    Grav\Console\Plugin
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Console\Plugin;
+
+use Grav\Common\Filesystem\Folder;
+use Grav\Common\Plugins;
+use Grav\Console\ConsoleCommand;
+
+/**
+ * Class InfoCommand
+ * @package Grav\Console\Gpm
+ */
+class PluginListCommand extends ConsoleCommand
+{
+    protected static $defaultName = 'plugins:list';
+
+    /**
+     * @return void
+     */
+    protected function configure(): void
+    {
+        $this->setHidden(true);
+    }
+
+    /**
+     * @return int
+     */
+    protected function serve(): int
+    {
+        $bin = $this->argv;
+        $pattern = '([A-Z]\w+Command\.php)';
+
+        $io = $this->getIO();
+        $io->newLine();
+        $io->writeln('<red>Usage:</red>');
+        $io->writeln("  {$bin} [slug] [command] [arguments]");
+        $io->newLine();
+        $io->writeln('<red>Example:</red>');
+        $io->writeln("  {$bin} error log -l 1 --trace");
+        $io->newLine();
+        $io->writeln('<red>Plugins with CLI available:</red>');
+
+        $plugins = Plugins::all();
+        $index = 0;
+        foreach ($plugins as $name => $plugin) {
+            if (!$plugin->enabled) {
+                continue;
+            }
+
+            $list = Folder::all("plugins://{$name}", ['compare' => 'Pathname', 'pattern' => '/\/cli\/' . $pattern . '$/usm', 'levels' => 1]);
+            if (!$list) {
+                continue;
+            }
+
+            $index++;
+            $num = str_pad((string)$index, 2, '0', STR_PAD_LEFT);
+            $io->writeln('  ' . $num . '. <red>' . str_pad($name, 15) . "</red> <white>{$bin} {$name} list</white>");
+        }
+
+        return 0;
+    }
+}
diff --git a/system/src/Grav/Console/TerminalObjects/Table.php b/system/src/Grav/Console/TerminalObjects/Table.php
index 4f9df63fc7..153993dcde 100644
--- a/system/src/Grav/Console/TerminalObjects/Table.php
+++ b/system/src/Grav/Console/TerminalObjects/Table.php
@@ -3,14 +3,22 @@
 /**
  * @package    Grav\Console\TerminalObjects
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Console\TerminalObjects;
 
+/**
+ * Class Table
+ * @package Grav\Console\TerminalObjects
+ * @deprecated 1.7 Use Symfony Console Table
+ */
 class Table extends \League\CLImate\TerminalObject\Basic\Table
 {
+    /**
+     * @return array
+     */
     public function result()
     {
         $this->column_widths = $this->getColumnWidths();
diff --git a/system/src/Grav/Events/FlexRegisterEvent.php b/system/src/Grav/Events/FlexRegisterEvent.php
new file mode 100644
index 0000000000..b02ed1dae1
--- /dev/null
+++ b/system/src/Grav/Events/FlexRegisterEvent.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @package    Grav\Events
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Events;
+
+use Grav\Framework\Flex\Flex;
+use Symfony\Contracts\EventDispatcher\Event;
+
+/**
+ * Flex Register Event
+ *
+ * This event is called the first time $grav['flex'] is being called.
+ *
+ * Use this event to register enabled Directories to Flex.
+ *
+ * @property Flex $flex Flex instance.
+ */
+class FlexRegisterEvent extends Event
+{
+    /** @var Flex */
+    public $flex;
+
+    /**
+     * FlexRegisterEvent constructor.
+     * @param Flex $flex
+     */
+    public function __construct(Flex $flex)
+    {
+        $this->flex = $flex;
+    }
+
+    /**
+     * @return array
+     */
+    public function __debugInfo(): array
+    {
+        return (array)$this;
+    }
+}
diff --git a/system/src/Grav/Events/PermissionsRegisterEvent.php b/system/src/Grav/Events/PermissionsRegisterEvent.php
new file mode 100644
index 0000000000..434dcfaf2d
--- /dev/null
+++ b/system/src/Grav/Events/PermissionsRegisterEvent.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @package    Grav\Events
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Events;
+
+use Grav\Framework\Acl\Permissions;
+use Symfony\Contracts\EventDispatcher\Event;
+
+/**
+ * Permissions Register Event
+ *
+ * This event is called the first time $grav['permissions'] is being called.
+ *
+ * Use this event to register any new permission types you use in your plugins.
+ *
+ * @property Permissions $permissions Permissions instance.
+ */
+class PermissionsRegisterEvent extends Event
+{
+    /** @var Permissions */
+    public $permissions;
+
+    /**
+     * PermissionsRegisterEvent constructor.
+     * @param Permissions $permissions
+     */
+    public function __construct(Permissions $permissions)
+    {
+        $this->permissions = $permissions;
+    }
+
+    /**
+     * @return array
+     */
+    public function __debugInfo(): array
+    {
+        return (array)$this;
+    }
+}
diff --git a/system/src/Grav/Events/PluginsLoadedEvent.php b/system/src/Grav/Events/PluginsLoadedEvent.php
new file mode 100644
index 0000000000..13e22264d9
--- /dev/null
+++ b/system/src/Grav/Events/PluginsLoadedEvent.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @package    Grav\Events
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Events;
+
+use Grav\Common\Grav;
+use Grav\Common\Plugins;
+use Symfony\Contracts\EventDispatcher\Event;
+
+/**
+ * Plugins Loaded Event
+ *
+ * This event is called from InitializeProcessor.
+ *
+ * This is the first event plugin can see. Please avoid using this event if possible.
+ *
+ * @property Grav $grav Grav container.
+ * @property Plugins $plugins Plugins instance.
+ */
+class PluginsLoadedEvent extends Event
+{
+    /** @var Grav */
+    public $grav;
+    /** @var Plugins */
+    public $plugins;
+
+    /**
+     * PluginsLoadedEvent constructor.
+     * @param Grav $grav
+     * @param Plugins $plugins
+     */
+    public function __construct(Grav $grav, Plugins $plugins)
+    {
+        $this->grav = $grav;
+        $this->plugins = $plugins;
+    }
+
+    /**
+     * @return array
+     */
+    public function __debugInfo(): array
+    {
+        return [
+            'plugins' => $this->plugins
+        ];
+    }
+}
diff --git a/system/src/Grav/Events/SessionStartEvent.php b/system/src/Grav/Events/SessionStartEvent.php
new file mode 100644
index 0000000000..fc4f3649c1
--- /dev/null
+++ b/system/src/Grav/Events/SessionStartEvent.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @package    Grav\Events
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Events;
+
+use Grav\Framework\Session\SessionInterface;
+use Symfony\Contracts\EventDispatcher\Event;
+
+/**
+ * Plugins Loaded Event
+ *
+ * This event is called from $grav['session']->start() right after successful session_start() call.
+ *
+ * @property SessionInterface $session Session instance.
+ */
+class SessionStartEvent extends Event
+{
+    /** @var SessionInterface */
+    public $session;
+
+    public function __construct(SessionInterface $session)
+    {
+        $this->session = $session;
+    }
+
+    public function __debugInfo(): array
+    {
+        return (array)$this;
+    }
+}
diff --git a/system/src/Grav/Framework/Acl/Access.php b/system/src/Grav/Framework/Acl/Access.php
new file mode 100644
index 0000000000..45cf2bf9bb
--- /dev/null
+++ b/system/src/Grav/Framework/Acl/Access.php
@@ -0,0 +1,231 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Acl
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Acl;
+
+use ArrayIterator;
+use Countable;
+use Grav\Common\Utils;
+use IteratorAggregate;
+use JsonSerializable;
+use Traversable;
+use function count;
+use function is_array;
+use function is_bool;
+use function is_string;
+use function strlen;
+
+/**
+ * Class Access
+ * @package Grav\Framework\Acl
+ * @implements IteratorAggregate<string,bool|array|null>
+ */
+class Access implements JsonSerializable, IteratorAggregate, Countable
+{
+    /** @var string */
+    private $name;
+    /** @var array */
+    private $rules;
+    /** @var array */
+    private $ops;
+    /** @var array<string,bool|array|null> */
+    private $acl = [];
+    /** @var array */
+    private $inherited = [];
+
+    /**
+     * Access constructor.
+     * @param string|array|null $acl
+     * @param array|null $rules
+     * @param string $name
+     */
+    public function __construct($acl = null, array $rules = null, string $name = '')
+    {
+        $this->name = $name;
+        $this->rules = $rules ?? [];
+        $this->ops = ['+' => true, '-' => false];
+        if (is_string($acl)) {
+            $this->acl = $this->resolvePermissions($acl);
+        } elseif (is_array($acl)) {
+            $this->acl = $this->normalizeAcl($acl);
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param Access $parent
+     * @param string|null $name
+     * @return void
+     */
+    public function inherit(Access $parent, string $name = null)
+    {
+        // Remove cached null actions from acl.
+        $acl = $this->getAllActions();
+        // Get only inherited actions.
+        $inherited = array_diff_key($parent->getAllActions(), $acl);
+
+        $this->inherited += $parent->inherited + array_fill_keys(array_keys($inherited), $name ?? $parent->getName());
+        $this->acl = array_replace($acl, $inherited);
+    }
+
+    /**
+     * Checks user authorization to the action.
+     *
+     * @param  string $action
+     * @param  string|null $scope
+     * @return bool|null
+     */
+    public function authorize(string $action, string $scope = null): ?bool
+    {
+        if (null !== $scope) {
+            $action = $scope !== 'test' ? "{$scope}.{$action}" : $action;
+        }
+
+        return $this->get($action);
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray(): array
+    {
+        return Utils::arrayUnflattenDotNotation($this->acl);
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllActions(): array
+    {
+        return array_filter($this->acl, static function($val) { return $val !== null; });
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize(): array
+    {
+        return $this->toArray();
+    }
+
+    /**
+     * @param string $action
+     * @return bool|null
+     */
+    public function get(string $action)
+    {
+        // Get access value.
+        if (isset($this->acl[$action])) {
+            return $this->acl[$action];
+        }
+
+        // If no value is defined, check the parent access (all true|false).
+        $pos = strrpos($action, '.');
+        $value = $pos ? $this->get(substr($action, 0, $pos)) : null;
+
+        // Cache result for faster lookup.
+        $this->acl[$action] = $value;
+
+        return $value;
+    }
+
+    /**
+     * @param string $action
+     * @return bool
+     */
+    public function isInherited(string $action): bool
+    {
+        return isset($this->inherited[$action]);
+    }
+
+    /**
+     * @param string $action
+     * @return string|null
+     */
+    public function getInherited(string $action): ?string
+    {
+        return $this->inherited[$action] ?? null;
+    }
+
+    /**
+     * @return Traversable
+     */
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator($this->acl);
+    }
+
+    /**
+     * @return int
+     */
+    public function count(): int
+    {
+        return count($this->acl);
+    }
+
+    /**
+     * @param array $acl
+     * @return array
+     */
+    protected function normalizeAcl(array $acl): array
+    {
+        if (empty($acl)) {
+            return [];
+        }
+
+        // Normalize access control list.
+        $list = [];
+        foreach (Utils::arrayFlattenDotNotation($acl) as $key => $value) {
+            if (is_bool($value)) {
+                $list[$key] = $value;
+            } elseif ($value === 0 || $value === 1) {
+                $list[$key] = (bool)$value;
+            } elseif($value === null) {
+                continue;
+            } elseif ($this->rules && is_string($value)) {
+                $list[$key] = $this->resolvePermissions($value);
+            } elseif (Utils::isPositive($value)) {
+                $list[$key] = true;
+            } elseif (Utils::isNegative($value)) {
+                $list[$key] = false;
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * @param string $access
+     * @return array
+     */
+    protected function resolvePermissions(string $access): array
+    {
+        $len = strlen($access);
+        $op = true;
+        $list = [];
+        for($count = 0; $count < $len; $count++) {
+            $letter = $access[$count];
+            if (isset($this->rules[$letter])) {
+                $list[$this->rules[$letter]] = $op;
+                $op = true;
+            } elseif (isset($this->ops[$letter])) {
+                $op = $this->ops[$letter];
+            }
+        }
+
+        return $list;
+    }
+}
diff --git a/system/src/Grav/Framework/Acl/Action.php b/system/src/Grav/Framework/Acl/Action.php
new file mode 100644
index 0000000000..6251c3c89a
--- /dev/null
+++ b/system/src/Grav/Framework/Acl/Action.php
@@ -0,0 +1,204 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Acl
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Acl;
+
+use ArrayIterator;
+use Countable;
+use Grav\Common\Inflector;
+use IteratorAggregate;
+use RuntimeException;
+use Traversable;
+use function count;
+
+/**
+ * Class Action
+ * @package Grav\Framework\Acl
+ * @implements IteratorAggregate<string,Action>
+ */
+class Action implements IteratorAggregate, Countable
+{
+    /** @var string */
+    public $name;
+    /** @var string */
+    public $type;
+    /** @var bool */
+    public $visible;
+    /** @var string|null */
+    public $label;
+    /** @var array */
+    public $params;
+
+    /** @var Action|null */
+    protected $parent;
+    /** @var array<string,Action> */
+    protected $children = [];
+
+    /**
+     * @param string $name
+     * @param array $action
+     */
+    public function __construct(string $name, array $action = [])
+    {
+        $label = $action['label'] ?? null;
+        if (!$label) {
+            if ($pos = mb_strrpos($name, '.')) {
+                $label = mb_substr($name, $pos + 1);
+            } else {
+                $label = $name;
+            }
+            $label = Inflector::humanize($label, 'all');
+        }
+
+        $this->name = $name;
+        $this->type = $action['type'] ?? 'action';
+        $this->visible = (bool)($action['visible'] ?? true);
+        $this->label = $label;
+        unset($action['type'], $action['label']);
+        $this->params = $action;
+
+        // Include compact rules.
+        if (isset($action['letters'])) {
+            foreach ($action['letters'] as $letter => $data) {
+                $data['letter'] = $letter;
+                $childName = $this->name . '.' . $data['action'];
+                unset($data['action']);
+                $child = new Action($childName, $data);
+                $this->addChild($child);
+            }
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function getParams(): array
+    {
+        return $this->params;
+    }
+
+    /**
+     * @param string $name
+     * @return mixed|null
+     */
+    public function getParam(string $name)
+    {
+        return $this->params[$name] ?? null;
+    }
+
+    /**
+     * @return Action|null
+     */
+    public function getParent(): ?Action
+    {
+        return $this->parent;
+    }
+
+    /**
+     * @param Action|null $parent
+     * @return void
+     */
+    public function setParent(?Action $parent): void
+    {
+        $this->parent = $parent;
+    }
+
+    /**
+     * @return string
+     */
+    public function getScope(): string
+    {
+        $pos = mb_strpos($this->name, '.');
+        if ($pos) {
+            return mb_substr($this->name, 0, $pos);
+        }
+
+        return $this->name;
+    }
+
+    /**
+     * @return int
+     */
+    public function getLevels(): int
+    {
+        return mb_substr_count($this->name, '.');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasChildren(): bool
+    {
+        return !empty($this->children);
+    }
+
+    /**
+     * @return Action[]
+     */
+    public function getChildren(): array
+    {
+        return $this->children;
+    }
+
+    /**
+     * @param string $name
+     * @return Action|null
+     */
+    public function getChild(string $name): ?Action
+    {
+        return $this->children[$name] ?? null;
+    }
+
+    /**
+     * @param Action $child
+     * @return void
+     */
+    public function addChild(Action $child): void
+    {
+        if (mb_strpos($child->name, "{$this->name}.") !== 0) {
+            throw new RuntimeException('Bad child');
+        }
+
+        $child->setParent($this);
+        $name = mb_substr($child->name, mb_strlen($this->name) + 1);
+
+        $this->children[$name] = $child;
+    }
+
+    /**
+     * @return Traversable
+     */
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator($this->children);
+    }
+
+    /**
+     * @return int
+     */
+    public function count(): int
+    {
+        return count($this->children);
+    }
+
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
+    public function __debugInfo()
+    {
+        return [
+            'name' => $this->name,
+            'type' => $this->type,
+            'label' => $this->label,
+            'params' => $this->params,
+            'actions' => $this->children
+        ];
+    }
+}
diff --git a/system/src/Grav/Framework/Acl/Permissions.php b/system/src/Grav/Framework/Acl/Permissions.php
new file mode 100644
index 0000000000..e54590a0d7
--- /dev/null
+++ b/system/src/Grav/Framework/Acl/Permissions.php
@@ -0,0 +1,249 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Acl
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Acl;
+
+use ArrayAccess;
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
+use RecursiveIteratorIterator;
+use RuntimeException;
+use Traversable;
+use function count;
+
+/**
+ * Class Permissions
+ * @package Grav\Framework\Acl
+ * @implements ArrayAccess<string,Action>
+ * @implements IteratorAggregate<string,Action>
+ */
+class Permissions implements ArrayAccess, Countable, IteratorAggregate
+{
+    /** @var array<string,Action> */
+    protected $instances = [];
+    /** @var array<string,Action> */
+    protected $actions = [];
+    /** @var array */
+    protected $nested = [];
+    /** @var array */
+    protected $types = [];
+
+    /**
+     * @return array
+     */
+    public function getInstances(): array
+    {
+        $iterator = new RecursiveActionIterator($this->actions);
+        $recursive = new RecursiveIteratorIterator($iterator, RecursiveIteratorIterator::SELF_FIRST);
+
+        return iterator_to_array($recursive);
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public function hasAction(string $name): bool
+    {
+        return isset($this->instances[$name]);
+    }
+
+    /**
+     * @param string $name
+     * @return Action|null
+     */
+    public function getAction(string $name): ?Action
+    {
+        return $this->instances[$name] ?? null;
+    }
+
+    /**
+     * @param Action $action
+     * @return void
+     */
+    public function addAction(Action $action): void
+    {
+        $name = $action->name;
+        $parent = $this->getParent($name);
+        if ($parent) {
+            $parent->addChild($action);
+        } else {
+            $this->actions[$name] = $action;
+        }
+
+        $this->instances[$name] = $action;
+
+        // If Action has children, add those, too.
+        foreach ($action->getChildren() as $child) {
+            $this->instances[$child->name] = $child;
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function getActions(): array
+    {
+        return $this->actions;
+    }
+
+    /**
+     * @param Action[] $actions
+     * @return void
+     */
+    public function addActions(array $actions): void
+    {
+        foreach ($actions as $action) {
+            $this->addAction($action);
+        }
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public function hasType(string $name): bool
+    {
+        return isset($this->types[$name]);
+    }
+
+    /**
+     * @param string $name
+     * @return Action|null
+     */
+    public function getType(string $name): ?Action
+    {
+        return $this->types[$name] ?? null;
+    }
+
+    /**
+     * @param string $name
+     * @param array $type
+     * @return void
+     */
+    public function addType(string $name, array $type): void
+    {
+        $this->types[$name] = $type;
+    }
+
+    /**
+     * @return array
+     */
+    public function getTypes(): array
+    {
+        return $this->types;
+    }
+
+    /**
+     * @param array $types
+     * @return void
+     */
+    public function addTypes(array $types): void
+    {
+        $types = array_replace($this->types, $types);
+
+        $this->types = $types;
+    }
+
+    /**
+     * @param array|null $access
+     * @return Access
+     */
+    public function getAccess(array $access = null): Access
+    {
+        return new Access($access ?? []);
+    }
+
+    /**
+     * @param int|string $offset
+     * @return bool
+     */
+    public function offsetExists($offset): bool
+    {
+        return isset($this->nested[$offset]);
+    }
+
+    /**
+     * @param int|string $offset
+     * @return Action|null
+     */
+    public function offsetGet($offset): ?Action
+    {
+        return $this->nested[$offset] ?? null;
+    }
+
+    /**
+     * @param int|string $offset
+     * @param mixed $value
+     * @return void
+     */
+    public function offsetSet($offset, $value): void
+    {
+        throw new RuntimeException(__METHOD__ . '(): Not Supported');
+    }
+
+    /**
+     * @param int|string $offset
+     * @return void
+     */
+    public function offsetUnset($offset): void
+    {
+        throw new RuntimeException(__METHOD__ . '(): Not Supported');
+    }
+
+    /**
+     * @return int
+     */
+    public function count(): int
+    {
+        return count($this->actions);
+    }
+
+    /**
+     * @return ArrayIterator|Traversable
+     */
+    #[\ReturnTypeWillChange]
+    public function getIterator()
+    {
+        return new ArrayIterator($this->actions);
+    }
+
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
+    public function __debugInfo()
+    {
+        return [
+            'actions' => $this->actions
+        ];
+    }
+
+    /**
+     * @param string $name
+     * @return Action|null
+     */
+    protected function getParent(string $name): ?Action
+    {
+        if ($pos = strrpos($name, '.')) {
+            $parentName = substr($name, 0, $pos);
+
+            $parent = $this->getAction($parentName);
+            if (!$parent) {
+                $parent = new Action($parentName);
+                $this->addAction($parent);
+            }
+
+            return $parent;
+        }
+
+        return null;
+    }
+}
diff --git a/system/src/Grav/Framework/Acl/PermissionsReader.php b/system/src/Grav/Framework/Acl/PermissionsReader.php
new file mode 100644
index 0000000000..350fc967a3
--- /dev/null
+++ b/system/src/Grav/Framework/Acl/PermissionsReader.php
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Acl
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Acl;
+
+use Grav\Common\File\CompiledYamlFile;
+use RuntimeException;
+use stdClass;
+use function is_array;
+
+/**
+ * Class PermissionsReader
+ * @package Grav\Framework\Acl
+ */
+class PermissionsReader
+{
+    /** @var array */
+    protected static $types;
+
+    /**
+     * @param string $filename
+     * @return Action[]
+     */
+    public static function fromYaml(string $filename): array
+    {
+        $content = CompiledYamlFile::instance($filename)->content();
+        $actions = $content['actions'] ?? [];
+        $types = $content['types'] ?? [];
+
+        return static::fromArray($actions, $types);
+    }
+
+    /**
+     * @param array $actions
+     * @param array $types
+     * @return Action[]
+     */
+    public static function fromArray(array $actions, array $types): array
+    {
+        static::initTypes($types);
+
+        $list = [];
+        foreach (static::read($actions) as $type => $data) {
+            $list[$type] = new Action($type, $data);
+        }
+
+        return $list;
+    }
+
+    /**
+     * @param array $actions
+     * @param string $prefix
+     * @return array
+     */
+    public static function read(array $actions, string $prefix = ''): array
+    {
+        $list = [];
+        foreach ($actions as $name => $action) {
+            $prefixName = $prefix . $name;
+            $list[$prefixName] = null;
+
+            // Support nested sets of actions.
+            if (isset($action['actions']) && is_array($action['actions'])) {
+                $innerList = static::read($action['actions'], "{$prefixName}.");
+
+                $list += $innerList;
+            }
+
+            unset($action['actions']);
+
+            // Add defaults if they exist.
+            $action = static::addDefaults($action);
+
+            // Build flat list of actions.
+            $list[$prefixName] = $action;
+        }
+
+        return $list;
+    }
+
+    /**
+     * @param array $types
+     * @return void
+     */
+    protected static function initTypes(array $types)
+    {
+        static::$types = [];
+
+        $dependencies = [];
+        foreach ($types as $type => $defaults) {
+            $current = array_fill_keys((array)($defaults['use'] ?? null), null);
+            $defType = $defaults['type'] ?? $type;
+            if ($type !== $defType) {
+                $current[$defaults['type']] = null;
+            }
+
+            $dependencies[$type] = (object)$current;
+        }
+
+        // Build dependency tree.
+        foreach ($dependencies as $type => $dep) {
+            foreach (get_object_vars($dep) as $k => &$val) {
+                if (null === $val) {
+                    $val = $dependencies[$k] ?? new stdClass();
+                }
+            }
+            unset($val);
+        }
+
+        $encoded = json_encode($dependencies);
+        if ($encoded === false) {
+            throw new RuntimeException('json_encode(): failed to encode dependencies');
+        }
+        $dependencies = json_decode($encoded, true);
+
+        foreach (static::getDependencies($dependencies) as $type) {
+            $defaults = $types[$type] ?? null;
+            if ($defaults) {
+                static::$types[$type] = static::addDefaults($defaults);
+            }
+        }
+    }
+
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    protected static function getDependencies(array $dependencies): array
+    {
+        $list = [[]];
+        foreach ($dependencies as $name => $deps) {
+            $current = $deps ? static::getDependencies($deps) : [];
+            $current[] = $name;
+
+            $list[] = $current;
+        }
+
+        return array_unique(array_merge(...$list));
+    }
+
+    /**
+     * @param array $action
+     * @return array
+     */
+    protected static function addDefaults(array $action): array
+    {
+        $scopes = [];
+
+        // Add used properties.
+        $use = (array)($action['use'] ?? null);
+        foreach ($use as $type) {
+            if (isset(static::$types[$type])) {
+                $used = static::$types[$type];
+                unset($used['type']);
+                $scopes[] = $used;
+            }
+        }
+        unset($action['use']);
+
+        // Add type defaults.
+        $type = $action['type'] ?? 'default';
+        $defaults = static::$types[$type] ?? null;
+        if (is_array($defaults)) {
+            $scopes[] = $defaults;
+        }
+
+        if ($scopes) {
+            $scopes[] = $action;
+
+            $action = array_replace_recursive(...$scopes);
+
+            $newType =  $defaults['type'] ?? null;
+            if ($newType && $newType !== $type) {
+                $action['type'] = $newType;
+            }
+        }
+
+        return $action;
+    }
+}
diff --git a/system/src/Grav/Framework/Acl/RecursiveActionIterator.php b/system/src/Grav/Framework/Acl/RecursiveActionIterator.php
new file mode 100644
index 0000000000..1fb9a60bae
--- /dev/null
+++ b/system/src/Grav/Framework/Acl/RecursiveActionIterator.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Acl
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Acl;
+
+use RecursiveIterator;
+use RocketTheme\Toolbox\ArrayTraits\Constructor;
+use RocketTheme\Toolbox\ArrayTraits\Countable;
+use RocketTheme\Toolbox\ArrayTraits\Iterator;
+
+/**
+ * Class Action
+ * @package Grav\Framework\Acl
+ * @implements RecursiveIterator<string,Action>
+ */
+class RecursiveActionIterator implements RecursiveIterator, \Countable
+{
+    use Constructor, Iterator, Countable;
+
+    /**
+     * @see \Iterator::key()
+     * @return string
+     */
+    #[\ReturnTypeWillChange]
+    public function key()
+    {
+        /** @var Action $current */
+        $current = $this->current();
+
+        return $current->name;
+    }
+
+    /**
+     * @see \RecursiveIterator::hasChildren()
+     * @return bool
+     */
+    public function hasChildren(): bool
+    {
+        /** @var Action $current */
+        $current = $this->current();
+
+        return $current->hasChildren();
+    }
+
+    /**
+     * @see \RecursiveIterator::getChildren()
+     * @return RecursiveActionIterator
+     */
+    public function getChildren(): self
+    {
+        /** @var Action $current */
+        $current = $this->current();
+
+        return new static($current->getChildren());
+    }
+}
diff --git a/system/src/Grav/Framework/Cache/AbstractCache.php b/system/src/Grav/Framework/Cache/AbstractCache.php
index 127db45aac..b6d00a3b8a 100644
--- a/system/src/Grav/Framework/Cache/AbstractCache.php
+++ b/system/src/Grav/Framework/Cache/AbstractCache.php
@@ -3,12 +3,13 @@
 /**
  * @package    Grav\Framework\Cache
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Cache;
 
+use DateInterval;
 use Psr\SimpleCache\InvalidArgumentException;
 
 /**
@@ -21,7 +22,7 @@ abstract class AbstractCache implements CacheInterface
 
     /**
      * @param string $namespace
-     * @param null|int|\DateInterval $defaultLifetime
+     * @param null|int|DateInterval $defaultLifetime
      * @throws InvalidArgumentException
      */
     public function __construct($namespace = '', $defaultLifetime = null)
diff --git a/system/src/Grav/Framework/Cache/Adapter/ChainCache.php b/system/src/Grav/Framework/Cache/Adapter/ChainCache.php
index e1eea7b6d9..bca940fa03 100644
--- a/system/src/Grav/Framework/Cache/Adapter/ChainCache.php
+++ b/system/src/Grav/Framework/Cache/Adapter/ChainCache.php
@@ -3,15 +3,18 @@
 /**
  * @package    Grav\Framework\Cache
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Cache\Adapter;
 
+use DateInterval;
 use Grav\Framework\Cache\AbstractCache;
 use Grav\Framework\Cache\CacheInterface;
 use Grav\Framework\Cache\Exception\InvalidArgumentException;
+use function count;
+use function get_class;
 
 /**
  * Cache class for PSR-16 compatible "Simple Cache" implementation using chained cache adapters.
@@ -20,25 +23,25 @@
  */
 class ChainCache extends AbstractCache
 {
-    /**
-     * @var CacheInterface[]
-     */
+    /** @var CacheInterface[] */
     protected $caches;
 
-    /**
-     * @var int
-     */
+    /** @var int */
     protected $count;
 
     /**
      * Chain Cache constructor.
      * @param array $caches
-     * @param null|int|\DateInterval $defaultLifetime
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @param null|int|DateInterval $defaultLifetime
+     * @throws InvalidArgumentException
      */
     public function __construct(array $caches, $defaultLifetime = null)
     {
-        parent::__construct('', $defaultLifetime);
+        try {
+            parent::__construct('', $defaultLifetime);
+        } catch (\Psr\SimpleCache\InvalidArgumentException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
 
         if (!$caches) {
             throw new InvalidArgumentException('At least one cache must be specified');
@@ -49,7 +52,7 @@ public function __construct(array $caches, $defaultLifetime = null)
                 throw new InvalidArgumentException(
                     sprintf(
                         "The class '%s' does not implement the '%s' interface",
-                        \get_class($cache),
+                        get_class($cache),
                         CacheInterface::class
                     )
                 );
@@ -57,7 +60,7 @@ public function __construct(array $caches, $defaultLifetime = null)
         }
 
         $this->caches = array_values($caches);
-        $this->count = \count($caches);
+        $this->count = count($caches);
     }
 
     /**
@@ -121,6 +124,7 @@ public function doClear()
         while ($i--) {
             $success = $this->caches[$i]->doClear() && $success;
         }
+
         return $success;
     }
 
@@ -130,6 +134,10 @@ public function doClear()
     public function doGetMultiple($keys, $miss)
     {
         $list = [];
+        /**
+         * @var int $i
+         * @var CacheInterface $cache
+         */
         foreach ($this->caches as $i => $cache) {
             $list[$i] = $cache->doGetMultiple($keys, $miss);
 
@@ -140,8 +148,12 @@ public function doGetMultiple($keys, $miss)
             }
         }
 
-        $values = [];
         // Update all the previous caches with missing values.
+        $values = [];
+        /**
+         * @var int $i
+         * @var CacheInterface $items
+         */
         foreach (array_reverse($list) as $i => $items) {
             $values += $items;
             if ($i && $values) {
diff --git a/system/src/Grav/Framework/Cache/Adapter/DoctrineCache.php b/system/src/Grav/Framework/Cache/Adapter/DoctrineCache.php
index 45c9d07a86..15afed3802 100644
--- a/system/src/Grav/Framework/Cache/Adapter/DoctrineCache.php
+++ b/system/src/Grav/Framework/Cache/Adapter/DoctrineCache.php
@@ -3,12 +3,13 @@
 /**
  * @package    Grav\Framework\Cache
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Cache\Adapter;
 
+use DateInterval;
 use Doctrine\Common\Cache\CacheProvider;
 use Grav\Framework\Cache\AbstractCache;
 use Grav\Framework\Cache\Exception\InvalidArgumentException;
@@ -19,9 +20,7 @@
  */
 class DoctrineCache extends AbstractCache
 {
-    /**
-     * @var CacheProvider
-     */
+    /** @var CacheProvider */
     protected $driver;
 
     /**
@@ -29,13 +28,17 @@ class DoctrineCache extends AbstractCache
      *
      * @param CacheProvider $doctrineCache
      * @param string $namespace
-     * @param null|int|\DateInterval $defaultLifetime
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @param null|int|DateInterval $defaultLifetime
+     * @throws InvalidArgumentException
      */
     public function __construct(CacheProvider $doctrineCache, $namespace = '', $defaultLifetime = null)
     {
         // Do not use $namespace or $defaultLifetime directly, store them with constructor and fetch with methods.
-        parent::__construct($namespace, $defaultLifetime);
+        try {
+            parent::__construct($namespace, $defaultLifetime);
+        } catch (\Psr\SimpleCache\InvalidArgumentException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
 
         // Set namespace to Doctrine Cache provider if it was given.
         $namespace = $this->getNamespace();
@@ -99,7 +102,6 @@ public function doSetMultiple($values, $ttl)
 
     /**
      * @inheritdoc
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
      */
     public function doDeleteMultiple($keys)
     {
diff --git a/system/src/Grav/Framework/Cache/Adapter/FileCache.php b/system/src/Grav/Framework/Cache/Adapter/FileCache.php
index a5a60fa5f1..7f1d5e7b08 100644
--- a/system/src/Grav/Framework/Cache/Adapter/FileCache.php
+++ b/system/src/Grav/Framework/Cache/Adapter/FileCache.php
@@ -3,15 +3,21 @@
 /**
  * @package    Grav\Framework\Cache
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Cache\Adapter;
 
+use ErrorException;
+use FilesystemIterator;
 use Grav\Framework\Cache\AbstractCache;
 use Grav\Framework\Cache\Exception\CacheException;
 use Grav\Framework\Cache\Exception\InvalidArgumentException;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use RuntimeException;
+use function strlen;
 
 /**
  * Cache class for PSR-16 compatible "Simple Cache" implementation using file backend.
@@ -22,17 +28,27 @@
  */
 class FileCache extends AbstractCache
 {
+    /** @var string */
     private $directory;
+    /** @var string|null */
     private $tmp;
 
     /**
-     * @inheritdoc
+     * FileCache constructor.
+     * @param string $namespace
+     * @param int|null $defaultLifetime
+     * @param string|null $folder
+     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
      */
     public function __construct($namespace = '', $defaultLifetime = null, $folder = null)
     {
-        parent::__construct($namespace, $defaultLifetime ?: 31557600); // = 1 year
+        try {
+            parent::__construct($namespace, $defaultLifetime ?: 31557600); // = 1 year
 
-        $this->initFileCache($namespace, $folder ?? '');
+            $this->initFileCache($namespace, $folder ?? '');
+        } catch (\Psr\SimpleCache\InvalidArgumentException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
     }
 
     /**
@@ -51,12 +67,12 @@ public function doGet($key, $miss)
             fclose($h);
             @unlink($file);
         } else {
-            $i = rawurldecode(rtrim(fgets($h)));
-            $value = stream_get_contents($h);
+            $i = rawurldecode(rtrim((string)fgets($h)));
+            $value = stream_get_contents($h) ?: '';
             fclose($h);
 
             if ($i === $key) {
-                return unserialize($value);
+                return unserialize($value, ['allowed_classes' => true]);
             }
         }
 
@@ -65,7 +81,7 @@ public function doGet($key, $miss)
 
     /**
      * @inheritdoc
-     * @throws \Psr\SimpleCache\CacheException|InvalidArgumentException
+     * @throws CacheException
      */
     public function doSet($key, $value, $ttl)
     {
@@ -91,7 +107,13 @@ public function doDelete($key)
     {
         $file = $this->getFile($key);
 
-        return (!file_exists($file) || @unlink($file) || !file_exists($file));
+        $result = false;
+        if (file_exists($file)) {
+            $result = @unlink($file);
+            $result &= !file_exists($file);
+        }
+
+        return $result;
     }
 
     /**
@@ -100,7 +122,7 @@ public function doDelete($key)
     public function doClear()
     {
         $result = true;
-        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS));
+        $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->directory, FilesystemIterator::SKIP_DOTS));
 
         foreach ($iterator as $file) {
             $result = ($file->isDir() || @unlink($file) || !file_exists($file)) && $result;
@@ -139,11 +161,12 @@ protected function getFile($key, $mkdir = false)
     /**
      * @param string $namespace
      * @param string $directory
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @return void
+     * @throws InvalidArgumentException
      */
     protected function initFileCache($namespace, $directory)
     {
-        if (!isset($directory[0])) {
+        if ($directory === '') {
             $directory = sys_get_temp_dir() . '/grav-cache';
         } else {
             $directory = realpath($directory) ?: $directory;
@@ -195,7 +218,8 @@ private function write($file, $data, $expiresAt = null)
 
     /**
      * @param  string  $dir
-     * @throws \RuntimeException
+     * @return void
+     * @throws RuntimeException
      */
     private function mkdir($dir)
     {
@@ -210,20 +234,29 @@ private function mkdir($dir)
             // Take yet another look, make sure that the folder doesn't exist.
             clearstatcache(true, $dir);
             if (!@is_dir($dir)) {
-                throw new \RuntimeException(sprintf('Unable to create directory: %s', $dir));
+                throw new RuntimeException(sprintf('Unable to create directory: %s', $dir));
             }
         }
     }
 
     /**
+     * @param int $type
+     * @param string $message
+     * @param string $file
+     * @param int $line
+     * @return bool
      * @internal
-     * @throws \ErrorException
+     * @throws ErrorException
      */
     public static function throwError($type, $message, $file, $line)
     {
-        throw new \ErrorException($message, 0, $type, $file, $line);
+        throw new ErrorException($message, 0, $type, $file, $line);
     }
 
+    /**
+     * @return void
+     */
+    #[\ReturnTypeWillChange]
     public function __destruct()
     {
         if ($this->tmp !== null && file_exists($this->tmp)) {
diff --git a/system/src/Grav/Framework/Cache/Adapter/MemoryCache.php b/system/src/Grav/Framework/Cache/Adapter/MemoryCache.php
index 2d0fe40bd9..21cd89c1c6 100644
--- a/system/src/Grav/Framework/Cache/Adapter/MemoryCache.php
+++ b/system/src/Grav/Framework/Cache/Adapter/MemoryCache.php
@@ -3,13 +3,14 @@
 /**
  * @package    Grav\Framework\Cache
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Cache\Adapter;
 
 use Grav\Framework\Cache\AbstractCache;
+use function array_key_exists;
 
 /**
  * Cache class for PSR-16 compatible "Simple Cache" implementation using in memory backend.
@@ -20,11 +21,14 @@
  */
 class MemoryCache extends AbstractCache
 {
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $cache = [];
 
+    /**
+     * @param string $key
+     * @param mixed $miss
+     * @return mixed
+     */
     public function doGet($key, $miss)
     {
         if (!array_key_exists($key, $this->cache)) {
@@ -34,6 +38,12 @@ public function doGet($key, $miss)
         return $this->cache[$key];
     }
 
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl
+     * @return bool
+     */
     public function doSet($key, $value, $ttl)
     {
         $this->cache[$key] = $value;
@@ -41,6 +51,10 @@ public function doSet($key, $value, $ttl)
         return true;
     }
 
+    /**
+     * @param string $key
+     * @return bool
+     */
     public function doDelete($key)
     {
         unset($this->cache[$key]);
@@ -48,6 +62,9 @@ public function doDelete($key)
         return true;
     }
 
+    /**
+     * @return bool
+     */
     public function doClear()
     {
         $this->cache = [];
@@ -55,6 +72,10 @@ public function doClear()
         return true;
     }
 
+    /**
+     * @param string $key
+     * @return bool
+     */
     public function doHas($key)
     {
         return array_key_exists($key, $this->cache);
diff --git a/system/src/Grav/Framework/Cache/Adapter/SessionCache.php b/system/src/Grav/Framework/Cache/Adapter/SessionCache.php
index 62c68a0c96..02fe7c9e3c 100644
--- a/system/src/Grav/Framework/Cache/Adapter/SessionCache.php
+++ b/system/src/Grav/Framework/Cache/Adapter/SessionCache.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Cache
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -21,6 +21,11 @@ class SessionCache extends AbstractCache
     public const VALUE = 0;
     public const LIFETIME = 1;
 
+    /**
+     * @param string $key
+     * @param mixed $miss
+     * @return mixed
+     */
     public function doGet($key, $miss)
     {
         $stored = $this->doGetStored($key);
@@ -28,12 +33,17 @@ public function doGet($key, $miss)
         return $stored ? $stored[self::VALUE] : $miss;
     }
 
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl
+     * @return bool
+     */
     public function doSet($key, $value, $ttl)
     {
         $stored = [self::VALUE => $value];
         if (null !== $ttl) {
             $stored[self::LIFETIME] = time() + $ttl;
-
         }
 
         $_SESSION[$this->getNamespace()][$key] = $stored;
@@ -41,6 +51,10 @@ public function doSet($key, $value, $ttl)
         return true;
     }
 
+    /**
+     * @param string $key
+     * @return bool
+     */
     public function doDelete($key)
     {
         unset($_SESSION[$this->getNamespace()][$key]);
@@ -48,6 +62,9 @@ public function doDelete($key)
         return true;
     }
 
+    /**
+     * @return bool
+     */
     public function doClear()
     {
         unset($_SESSION[$this->getNamespace()]);
@@ -55,16 +72,27 @@ public function doClear()
         return true;
     }
 
+    /**
+     * @param string $key
+     * @return bool
+     */
     public function doHas($key)
     {
         return $this->doGetStored($key) !== null;
     }
 
+    /**
+     * @return string
+     */
     public function getNamespace()
     {
         return 'cache-' . parent::getNamespace();
     }
 
+    /**
+     * @param string $key
+     * @return mixed|null
+     */
     protected function doGetStored($key)
     {
         $stored = $_SESSION[$this->getNamespace()][$key] ?? null;
diff --git a/system/src/Grav/Framework/Cache/CacheInterface.php b/system/src/Grav/Framework/Cache/CacheInterface.php
index 5aefe35563..03dfa7a14b 100644
--- a/system/src/Grav/Framework/Cache/CacheInterface.php
+++ b/system/src/Grav/Framework/Cache/CacheInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Cache
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -17,12 +17,55 @@
  */
 interface CacheInterface extends SimpleCacheInterface
 {
+    /**
+     * @param string $key
+     * @param mixed $miss
+     * @return mixed
+     */
     public function doGet($key, $miss);
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @param int|null $ttl
+     * @return mixed
+     */
     public function doSet($key, $value, $ttl);
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
     public function doDelete($key);
+
+    /**
+     * @return bool
+     */
     public function doClear();
+
+    /**
+     * @param string[] $keys
+     * @param mixed $miss
+     * @return mixed
+     */
     public function doGetMultiple($keys, $miss);
+
+    /**
+     * @param array<string, mixed> $values
+     * @param int|null $ttl
+     * @return mixed
+     */
     public function doSetMultiple($values, $ttl);
+
+    /**
+     * @param string[] $keys
+     * @return mixed
+     */
     public function doDeleteMultiple($keys);
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
     public function doHas($key);
 }
diff --git a/system/src/Grav/Framework/Cache/CacheTrait.php b/system/src/Grav/Framework/Cache/CacheTrait.php
index 748744a15a..46248fe556 100644
--- a/system/src/Grav/Framework/Cache/CacheTrait.php
+++ b/system/src/Grav/Framework/Cache/CacheTrait.php
@@ -3,13 +3,25 @@
 /**
  * @package    Grav\Framework\Cache
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Cache;
 
+use DateInterval;
+use DateTime;
 use Grav\Framework\Cache\Exception\InvalidArgumentException;
+use stdClass;
+use Traversable;
+use function array_key_exists;
+use function get_class;
+use function gettype;
+use function is_array;
+use function is_int;
+use function is_object;
+use function is_string;
+use function strlen;
 
 /**
  * Cache trait for PSR-16 compatible "Simple Cache" implementation
@@ -19,13 +31,10 @@ trait CacheTrait
 {
     /** @var string */
     private $namespace = '';
-
     /** @var int|null */
     private $defaultLifetime = null;
-
-    /** @var \stdClass */
+    /** @var stdClass */
     private $miss;
-
     /** @var bool */
     private $validation = true;
 
@@ -33,18 +42,20 @@ trait CacheTrait
      * Always call from constructor.
      *
      * @param string $namespace
-     * @param null|int|\DateInterval $defaultLifetime
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @param null|int|DateInterval $defaultLifetime
+     * @return void
+     * @throws InvalidArgumentException
      */
     protected function init($namespace = '', $defaultLifetime = null)
     {
         $this->namespace = (string) $namespace;
         $this->defaultLifetime = $this->convertTtl($defaultLifetime);
-        $this->miss = new \stdClass;
+        $this->miss = new stdClass;
     }
 
     /**
      * @param bool $validation
+     * @return void
      */
     public function setValidation($validation)
     {
@@ -68,8 +79,10 @@ protected function getDefaultLifetime()
     }
 
     /**
-     * @inheritdoc
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @param string $key
+     * @param mixed|null $default
+     * @return mixed|null
+     * @throws InvalidArgumentException
      */
     public function get($key, $default = null)
     {
@@ -81,8 +94,11 @@ public function get($key, $default = null)
     }
 
     /**
-     * @inheritdoc
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @param string $key
+     * @param mixed $value
+     * @param null|int|DateInterval $ttl
+     * @return bool
+     * @throws InvalidArgumentException
      */
     public function set($key, $value, $ttl = null)
     {
@@ -95,8 +111,9 @@ public function set($key, $value, $ttl = null)
     }
 
     /**
-     * @inheritdoc
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @param string $key
+     * @return bool
+     * @throws InvalidArgumentException
      */
     public function delete($key)
     {
@@ -106,7 +123,7 @@ public function delete($key)
     }
 
     /**
-     * @inheritdoc
+     * @return bool
      */
     public function clear()
     {
@@ -114,18 +131,21 @@ public function clear()
     }
 
     /**
-     * @inheritdoc
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @param iterable $keys
+     * @param mixed|null $default
+     * @return iterable
+     * @throws InvalidArgumentException
      */
     public function getMultiple($keys, $default = null)
     {
-        if ($keys instanceof \Traversable) {
+        if ($keys instanceof Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!\is_array($keys)) {
+        } elseif (!is_array($keys)) {
+            $isObject = is_object($keys);
             throw new InvalidArgumentException(
                 sprintf(
                     'Cache keys must be array or Traversable, "%s" given',
-                    \is_object($keys) ? \get_class($keys) : \gettype($keys)
+                     $isObject ? get_class($keys) : gettype($keys)
                 )
             );
         }
@@ -154,18 +174,21 @@ public function getMultiple($keys, $default = null)
     }
 
     /**
-     * @inheritdoc
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @param iterable $values
+     * @param null|int|DateInterval $ttl
+     * @return bool
+     * @throws InvalidArgumentException
      */
     public function setMultiple($values, $ttl = null)
     {
-        if ($values instanceof \Traversable) {
+        if ($values instanceof Traversable) {
             $values = iterator_to_array($values, true);
         } elseif (!is_array($values)) {
+            $isObject = is_object($values);
             throw new InvalidArgumentException(
                 sprintf(
                     'Cache values must be array or Traversable, "%s" given',
-                    \is_object($values) ? \get_class($values) : \gettype($values)
+                    $isObject ? get_class($values) : gettype($values)
                 )
             );
         }
@@ -185,18 +208,20 @@ public function setMultiple($values, $ttl = null)
     }
 
     /**
-     * @inheritdoc
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @param iterable $keys
+     * @return bool
+     * @throws InvalidArgumentException
      */
     public function deleteMultiple($keys)
     {
-        if ($keys instanceof \Traversable) {
+        if ($keys instanceof Traversable) {
             $keys = iterator_to_array($keys, false);
         } elseif (!is_array($keys)) {
+            $isObject = is_object($keys);
             throw new InvalidArgumentException(
                 sprintf(
                     'Cache keys must be array or Traversable, "%s" given',
-                    \is_object($keys) ? \get_class($keys) : \gettype($keys)
+                    $isObject ? get_class($keys) : gettype($keys)
                 )
             );
         }
@@ -211,8 +236,9 @@ public function deleteMultiple($keys)
     }
 
     /**
-     * @inheritdoc
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @param string $key
+     * @return bool
+     * @throws InvalidArgumentException
      */
     public function has($key)
     {
@@ -221,11 +247,6 @@ public function has($key)
         return $this->doHas($key);
     }
 
-    abstract public function doGet($key, $miss);
-    abstract public function doSet($key, $value, $ttl);
-    abstract public function doDelete($key);
-    abstract public function doClear();
-
     /**
      * @param array $keys
      * @param mixed $miss
@@ -247,7 +268,7 @@ public function doGetMultiple($keys, $miss)
 
     /**
      * @param array $values
-     * @param int $ttl
+     * @param int|null $ttl
      * @return bool
      */
     public function doSetMultiple($values, $ttl)
@@ -276,28 +297,27 @@ public function doDeleteMultiple($keys)
         return $success;
     }
 
-    abstract public function doHas($key);
-
     /**
      * @param string|mixed $key
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @return void
+     * @throws InvalidArgumentException
      */
     protected function validateKey($key)
     {
-        if (!\is_string($key)) {
+        if (!is_string($key)) {
             throw new InvalidArgumentException(
                 sprintf(
                     'Cache key must be string, "%s" given',
-                    \is_object($key) ? \get_class($key) : \gettype($key)
+                    is_object($key) ? get_class($key) : gettype($key)
                 )
             );
         }
         if (!isset($key[0])) {
             throw new InvalidArgumentException('Cache key length must be greater than zero');
         }
-        if (\strlen($key) > 64) {
+        if (strlen($key) > 64) {
             throw new InvalidArgumentException(
-                sprintf('Cache key length must be less than 65 characters, key had %s characters', \strlen($key))
+                sprintf('Cache key length must be less than 65 characters, key had %d characters', strlen($key))
             );
         }
         if (strpbrk($key, '{}()/\@:') !== false) {
@@ -309,7 +329,8 @@ protected function validateKey($key)
 
     /**
      * @param array $keys
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @return void
+     * @throws InvalidArgumentException
      */
     protected function validateKeys($keys)
     {
@@ -323,9 +344,9 @@ protected function validateKeys($keys)
     }
 
     /**
-     * @param null|int|\DateInterval|mixed    $ttl
+     * @param null|int|DateInterval    $ttl
      * @return int|null
-     * @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     protected function convertTtl($ttl)
     {
@@ -333,18 +354,19 @@ protected function convertTtl($ttl)
             return $this->getDefaultLifetime();
         }
 
-        if (\is_int($ttl)) {
+        if (is_int($ttl)) {
             return $ttl;
         }
 
-        if ($ttl instanceof \DateInterval) {
-            $ttl = (int) \DateTime::createFromFormat('U', '0')->add($ttl)->format('U');
+        if ($ttl instanceof DateInterval) {
+            $date = DateTime::createFromFormat('U', '0');
+            $ttl = $date ? (int)$date->add($ttl)->format('U') : 0;
         }
 
         throw new InvalidArgumentException(
             sprintf(
                 'Expiration date must be an integer, a DateInterval or null, "%s" given',
-                \is_object($ttl) ? \get_class($ttl) : \gettype($ttl)
+                is_object($ttl) ? get_class($ttl) : gettype($ttl)
             )
         );
     }
diff --git a/system/src/Grav/Framework/Cache/Exception/CacheException.php b/system/src/Grav/Framework/Cache/Exception/CacheException.php
index 55da2f52fc..db33883b0e 100644
--- a/system/src/Grav/Framework/Cache/Exception/CacheException.php
+++ b/system/src/Grav/Framework/Cache/Exception/CacheException.php
@@ -3,18 +3,19 @@
 /**
  * @package    Grav\Framework\Cache
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Cache\Exception;
 
+use Exception;
 use Psr\SimpleCache\CacheException as SimpleCacheException;
 
 /**
  * CacheException class for PSR-16 compatible "Simple Cache" implementation.
  * @package Grav\Framework\Cache\Exception
  */
-class CacheException extends \Exception implements SimpleCacheException
+class CacheException extends Exception implements SimpleCacheException
 {
 }
diff --git a/system/src/Grav/Framework/Cache/Exception/InvalidArgumentException.php b/system/src/Grav/Framework/Cache/Exception/InvalidArgumentException.php
index 594878da85..70c041885e 100644
--- a/system/src/Grav/Framework/Cache/Exception/InvalidArgumentException.php
+++ b/system/src/Grav/Framework/Cache/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Cache
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
diff --git a/system/src/Grav/Framework/Collection/AbstractFileCollection.php b/system/src/Grav/Framework/Collection/AbstractFileCollection.php
index f6f2996074..500aea8e48 100644
--- a/system/src/Grav/Framework/Collection/AbstractFileCollection.php
+++ b/system/src/Grav/Framework/Collection/AbstractFileCollection.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Collection
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,45 +11,37 @@
 
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\Expr\ClosureExpressionVisitor;
+use FilesystemIterator;
 use Grav\Common\Grav;
+use RecursiveDirectoryIterator;
 use RocketTheme\Toolbox\ResourceLocator\RecursiveUniformResourceIterator;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use SeekableIterator;
+use function array_slice;
 
 /**
  * Collection of objects stored into a filesystem.
  *
  * @package Grav\Framework\Collection
+ * @template TKey of array-key
+ * @template T of object
+ * @extends AbstractLazyCollection<TKey,T>
+ * @implements FileCollectionInterface<TKey,T>
  */
 class AbstractFileCollection extends AbstractLazyCollection implements FileCollectionInterface
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $path;
-
-    /**
-     * @var \RecursiveDirectoryIterator|RecursiveUniformResourceIterator
-     */
+    /** @var RecursiveDirectoryIterator|RecursiveUniformResourceIterator */
     protected $iterator;
-
-    /**
-     * @var callable
-     */
+    /** @var callable */
     protected $createObjectFunction;
-
-    /**
-     * @var callable|null
-     */
+    /** @var callable|null */
     protected $filterFunction;
-
-    /**
-     * @var int
-     */
+    /** @var int */
     protected $flags;
-
-    /**
-     * @var int
-     */
+    /** @var int */
     protected $nestingLimit;
 
     /**
@@ -76,6 +68,7 @@ public function getPath()
     /**
      * @param Criteria $criteria
      * @return ArrayCollection
+     * @phpstan-return ArrayCollection<TKey,T>
      * @todo Implement lazy matching
      */
     public function matching(Criteria $criteria)
@@ -94,9 +87,17 @@ public function matching(Criteria $criteria)
 
         if ($orderings = $criteria->getOrderings()) {
             $next = null;
+            /**
+             * @var string $field
+             * @var string $ordering
+             */
             foreach (array_reverse($orderings) as $field => $ordering) {
                 $next = ClosureExpressionVisitor::sortByField($field, $ordering === Criteria::DESC ? -1 : 1, $next);
             }
+            /** @phpstan-ignore-next-line */
+            if (null === $next) {
+                throw new RuntimeException('Criteria is missing orderings');
+            }
 
             uasort($filtered, $next);
         } else {
@@ -107,23 +108,26 @@ public function matching(Criteria $criteria)
         $length = $criteria->getMaxResults();
 
         if ($offset || $length) {
-            $filtered = \array_slice($filtered, (int)$offset, $length);
+            $filtered = array_slice($filtered, (int)$offset, $length);
         }
 
         return new ArrayCollection($filtered);
     }
 
+    /**
+     * @return void
+     */
     protected function setIterator()
     {
-        $iteratorFlags = \RecursiveDirectoryIterator::SKIP_DOTS + \FilesystemIterator::UNIX_PATHS
-            + \FilesystemIterator::CURRENT_AS_SELF + \FilesystemIterator::FOLLOW_SYMLINKS;
+        $iteratorFlags = RecursiveDirectoryIterator::SKIP_DOTS + FilesystemIterator::UNIX_PATHS
+            + FilesystemIterator::CURRENT_AS_SELF + FilesystemIterator::FOLLOW_SYMLINKS;
 
         if (strpos($this->path, '://')) {
             /** @var UniformResourceLocator $locator */
             $locator = Grav::instance()['locator'];
             $this->iterator = $locator->getRecursiveIterator($this->path, $iteratorFlags);
         } else {
-            $this->iterator = new \RecursiveDirectoryIterator($this->path, $iteratorFlags);
+            $this->iterator = new RecursiveDirectoryIterator($this->path, $iteratorFlags);
         }
     }
 
@@ -156,14 +160,20 @@ protected function doInitialize()
         $this->collection = new ArrayCollection($filtered);
     }
 
-    protected function doInitializeByIterator(\SeekableIterator $iterator, $nestingLimit)
+    /**
+     * @param SeekableIterator $iterator
+     * @param int $nestingLimit
+     * @return array
+     * @phpstan-param SeekableIterator<int,T> $iterator
+     */
+    protected function doInitializeByIterator(SeekableIterator $iterator, $nestingLimit)
     {
         $children = [];
         $objects = [];
         $filter = $this->filterFunction;
         $objectFunction = $this->createObjectFunction;
 
-        /** @var \RecursiveDirectoryIterator $file */
+        /** @var RecursiveDirectoryIterator $file */
         foreach ($iterator as $file) {
             // Skip files if they shouldn't be included.
             if (!($this->flags & static::INCLUDE_FILES) && $file->isFile()) {
@@ -197,13 +207,13 @@ protected function doInitializeByIterator(\SeekableIterator $iterator, $nestingL
     }
 
     /**
-     * @param \RecursiveDirectoryIterator[] $children
+     * @param array $children
+     * @param int $nestingLimit
      * @return array
      */
     protected function doInitializeChildren(array $children, $nestingLimit)
     {
         $objects = [];
-
         foreach ($children as $iterator) {
             $objects += $this->doInitializeByIterator($iterator, $nestingLimit);
         }
@@ -212,7 +222,7 @@ protected function doInitializeChildren(array $children, $nestingLimit)
     }
 
     /**
-     * @param \RecursiveDirectoryIterator $file
+     * @param RecursiveDirectoryIterator $file
      * @return object
      */
     protected function createObject($file)
diff --git a/system/src/Grav/Framework/Collection/AbstractIndexCollection.php b/system/src/Grav/Framework/Collection/AbstractIndexCollection.php
index 0e4fae22de..02916d9097 100644
--- a/system/src/Grav/Framework/Collection/AbstractIndexCollection.php
+++ b/system/src/Grav/Framework/Collection/AbstractIndexCollection.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Collection
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,19 +11,36 @@
 
 use ArrayIterator;
 use Closure;
+use Grav\Framework\Compat\Serializable;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use InvalidArgumentException;
+use Iterator;
+use function array_key_exists;
+use function array_slice;
+use function count;
 
 /**
  * Abstract Index Collection.
+ * @template TKey of array-key
+ * @template T
+ * @template C of CollectionInterface
+ * @implements CollectionInterface<TKey,T>
  */
 abstract class AbstractIndexCollection implements CollectionInterface
 {
-    /** @var array */
+    use Serializable;
+
+    /**
+     * @var array
+     * @phpstan-var array<TKey,T>
+     */
     private $entries;
 
     /**
      * Initializes a new IndexCollection.
      *
      * @param array $entries
+     * @phpstan-param array<TKey,T> $entries
      */
     public function __construct(array $entries = [])
     {
@@ -44,7 +61,7 @@ public function toArray()
     public function first()
     {
         $value = reset($this->entries);
-        $key = key($this->entries);
+        $key = (string)key($this->entries);
 
         return $this->loadElement($key, $value);
     }
@@ -55,7 +72,7 @@ public function first()
     public function last()
     {
         $value = end($this->entries);
-        $key = key($this->entries);
+        $key = (string)key($this->entries);
 
         return $this->loadElement($key, $value);
     }
@@ -63,18 +80,21 @@ public function last()
     /**
      * {@inheritDoc}
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
-        return key($this->entries);
+        /** @phpstan-var TKey */
+        return (string)key($this->entries);
     }
 
     /**
      * {@inheritDoc}
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         $value = next($this->entries);
-        $key = key($this->entries);
+        $key = (string)key($this->entries);
 
         return $this->loadElement($key, $value);
     }
@@ -82,10 +102,11 @@ public function next()
     /**
      * {@inheritDoc}
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         $value = current($this->entries);
-        $key = key($this->entries);
+        $key = (string)key($this->entries);
 
         return $this->loadElement($key, $value);
     }
@@ -102,7 +123,7 @@ public function remove($key)
         $value = $this->entries[$key];
         unset($this->entries[$key]);
 
-        return $this->loadElement($key, $value);
+        return $this->loadElement((string)$key, $value);
     }
 
     /**
@@ -110,9 +131,9 @@ public function remove($key)
      */
     public function removeElement($element)
     {
-        $key = $this->isAllowedElement($element) ? $element->getKey() : null;
+        $key = $this->isAllowedElement($element) ? $this->getCurrentKey($element) : null;
 
-        if (!$key || !isset($this->entries[$key])) {
+        if (null !== $key || !isset($this->entries[$key])) {
             return false;
         }
 
@@ -124,45 +145,64 @@ public function removeElement($element)
     /**
      * Required by interface ArrayAccess.
      *
-     * {@inheritDoc}
+     * @param string|int|null $offset
+     * @return bool
+     * @phpstan-param TKey|null $offset
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
-        return $this->containsKey($offset);
+        /** @phpstan-ignore-next-line phpstan bug? */
+        return $offset !== null ? $this->containsKey($offset) : false;
     }
 
     /**
      * Required by interface ArrayAccess.
      *
-     * {@inheritDoc}
+     * @param string|int|null $offset
+     * @return mixed
+     * @phpstan-param TKey|null $offset
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
-        return $this->get($offset);
+        /** @phpstan-ignore-next-line phpstan bug? */
+        return $offset !== null ? $this->get($offset) : null;
     }
 
     /**
      * Required by interface ArrayAccess.
      *
-     * {@inheritDoc}
+     * @param string|int|null $offset
+     * @param mixed $value
+     * @return void
+     * @phpstan-param TKey|null $offset
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if (null === $offset) {
             $this->add($value);
+        } else {
+            /** @phpstan-ignore-next-line phpstan bug? */
+            $this->set($offset, $value);
         }
-
-        $this->set($offset, $value);
     }
 
     /**
      * Required by interface ArrayAccess.
      *
-     * {@inheritDoc}
+     * @param string|int|null $offset
+     * @return void
+     * @phpstan-param TKey|null $offset
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
-        return $this->remove($offset);
+        if ($offset !== null) {
+            /** @phpstan-ignore-next-line phpstan bug? */
+            $this->remove($offset);
+        }
     }
 
     /**
@@ -178,7 +218,7 @@ public function containsKey($key)
      */
     public function contains($element)
     {
-        $key = $this->isAllowedElement($element) ? $element->getKey() : null;
+        $key = $this->isAllowedElement($element) ? $this->getCurrentKey($element) : null;
 
         return $key && isset($this->entries[$key]);
     }
@@ -196,9 +236,9 @@ public function exists(Closure $p)
      */
     public function indexOf($element)
     {
-        $key = $this->isAllowedElement($element) ? $element->getKey() : null;
+        $key = $this->isAllowedElement($element) ? $this->getCurrentKey($element) : null;
 
-        return $key && isset($this->entries[$key]) ? $key : null;
+        return $key && isset($this->entries[$key]) ? $key : false;
     }
 
     /**
@@ -210,7 +250,7 @@ public function get($key)
             return null;
         }
 
-        return $this->loadElement($key, $this->entries[$key]);
+        return $this->loadElement((string)$key, $this->entries[$key]);
     }
 
     /**
@@ -232,9 +272,10 @@ public function getValues()
     /**
      * {@inheritDoc}
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
-        return \count($this->entries);
+        return count($this->entries);
     }
 
     /**
@@ -243,11 +284,7 @@ public function count()
     public function set($key, $value)
     {
         if (!$this->isAllowedElement($value)) {
-            throw new \InvalidArgumentException('Invalid argument $value');
-        }
-
-        if ($key !== $value->getKey()) {
-            $value->setKey($key);
+            throw new InvalidArgumentException('Invalid argument $value');
         }
 
         $this->entries[$key] = $this->getElementMeta($value);
@@ -259,10 +296,10 @@ public function set($key, $value)
     public function add($element)
     {
         if (!$this->isAllowedElement($element)) {
-            throw new \InvalidArgumentException('Invalid argument $element');
+            throw new InvalidArgumentException('Invalid argument $element');
         }
 
-        $this->entries[$element->getKey()] = $this->getElementMeta($element);
+        $this->entries[$this->getCurrentKey($element)] = $this->getElementMeta($element);
 
         return true;
     }
@@ -279,7 +316,9 @@ public function isEmpty()
      * Required by interface IteratorAggregate.
      *
      * {@inheritDoc}
+     * @phpstan-return Iterator<TKey,T>
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->loadElements());
@@ -322,6 +361,7 @@ public function partition(Closure $p)
      *
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function __toString()
     {
         return __CLASS__ . '@' . spl_object_hash($this);
@@ -340,23 +380,25 @@ public function clear()
      */
     public function slice($offset, $length = null)
     {
-        return $this->loadElements(\array_slice($this->entries, $offset, $length, true));
+        return $this->loadElements(array_slice($this->entries, $offset, $length, true));
     }
 
     /**
      * @param int $start
      * @param int|null $limit
      * @return static
+     * @phpstan-return static<TKey,T,C>
      */
     public function limit($start, $limit = null)
     {
-        return $this->createFrom(\array_slice($this->entries, $start, $limit, true));
+        return $this->createFrom(array_slice($this->entries, $start, $limit, true));
     }
 
     /**
      * Reverse the order of the items.
      *
      * @return static
+     * @phpstan-return static<TKey,T,C>
      */
     public function reverse()
     {
@@ -367,6 +409,7 @@ public function reverse()
      * Shuffle items.
      *
      * @return static
+     * @phpstan-return static<TKey,T,C>
      */
     public function shuffle()
     {
@@ -383,6 +426,7 @@ public function shuffle()
      *
      * @param array $keys
      * @return static
+     * @phpstan-return static<TKey,T,C>
      */
     public function select(array $keys)
     {
@@ -401,6 +445,7 @@ public function select(array $keys)
      *
      * @param array $keys
      * @return static
+     * @phpstan-return static<TKey,T,C>
      */
     public function unselect(array $keys)
     {
@@ -412,27 +457,30 @@ public function unselect(array $keys)
      *
      * @param int $size     Size of each chunk.
      * @return array
+     * @phpstan-return array<array<TKey,T>>
      */
     public function chunk($size)
     {
+        /** @phpstan-var array<array<TKey,T>> */
         return $this->loadCollection($this->entries)->chunk($size);
     }
 
     /**
-     * @return string
+     * @return array
      */
-    public function serialize()
+    public function __serialize(): array
     {
-        return serialize(['entries' => $this->entries]);
+        return [
+            'entries' => $this->entries
+        ];
     }
 
     /**
-     * @param string $serialized
+     * @param array $data
+     * @return void
      */
-    public function unserialize($serialized)
+    public function __unserialize(array $data): void
     {
-        $data = unserialize($serialized, ['allowed_classes' => false]);
-
         $this->entries = $data['entries'];
     }
 
@@ -441,6 +489,7 @@ public function unserialize($serialized)
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->loadCollection()->jsonSerialize();
@@ -453,8 +502,8 @@ public function jsonSerialize()
      * instance should be created when constructor semantics have changed.
      *
      * @param array $entries Elements.
-     *
      * @return static
+     * @phpstan-return static<TKey,T,C>
      */
     protected function createFrom(array $entries)
     {
@@ -464,19 +513,32 @@ protected function createFrom(array $entries)
     /**
      * @return array
      */
-    protected function getEntries() : array
+    protected function getEntries(): array
     {
         return $this->entries;
     }
 
     /**
      * @param array $entries
+     * @return void
+     * @phpstan-param array<TKey,T> $entries
      */
-    protected function setEntries(array $entries) : void
+    protected function setEntries(array $entries): void
     {
         $this->entries = $entries;
     }
 
+    /**
+     * @param FlexObjectInterface $element
+     * @return string
+     * @phpstan-param T $element
+     * @phpstan-return TKey
+     */
+    protected function getCurrentKey($element)
+    {
+        return $element->getKey();
+    }
+
     /**
      * @param string $key
      * @param mixed $value
@@ -487,20 +549,22 @@ abstract protected function loadElement($key, $value);
     /**
      * @param array|null $entries
      * @return array
+     * @phpstan-return array<TKey,T>
      */
-    abstract protected function loadElements(array $entries = null) : array;
+    abstract protected function loadElements(array $entries = null): array;
 
     /**
      * @param array|null $entries
      * @return CollectionInterface
+     * @phpstan-return C
      */
-    abstract protected function loadCollection(array $entries = null) : CollectionInterface;
+    abstract protected function loadCollection(array $entries = null): CollectionInterface;
 
     /**
      * @param mixed $value
      * @return bool
      */
-    abstract protected function isAllowedElement($value) : bool;
+    abstract protected function isAllowedElement($value): bool;
 
     /**
      * @param mixed $element
diff --git a/system/src/Grav/Framework/Collection/AbstractLazyCollection.php b/system/src/Grav/Framework/Collection/AbstractLazyCollection.php
index 0653caa41b..b0a93f514b 100644
--- a/system/src/Grav/Framework/Collection/AbstractLazyCollection.php
+++ b/system/src/Grav/Framework/Collection/AbstractLazyCollection.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Collection
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,31 +15,38 @@
  * General JSON serializable collection.
  *
  * @package Grav\Framework\Collection
+ * @template TKey of array-key
+ * @template T
+ * @extends BaseAbstractLazyCollection<TKey,T>
+ * @implements CollectionInterface<TKey,T>
  */
 abstract class AbstractLazyCollection extends BaseAbstractLazyCollection implements CollectionInterface
 {
     /**
-     * The backed collection to use
-     *
-     * @var ArrayCollection
+     * @par ArrayCollection
+     * @phpstan-var ArrayCollection<TKey,T>
      */
     protected $collection;
 
     /**
      * {@inheritDoc}
+     * @phpstan-return ArrayCollection<TKey,T>
      */
     public function reverse()
     {
         $this->initialize();
+
         return $this->collection->reverse();
     }
 
     /**
      * {@inheritDoc}
+     * @phpstan-return ArrayCollection<TKey,T>
      */
     public function shuffle()
     {
         $this->initialize();
+
         return $this->collection->shuffle();
     }
 
@@ -49,33 +56,42 @@ public function shuffle()
     public function chunk($size)
     {
         $this->initialize();
+
         return $this->collection->chunk($size);
     }
 
     /**
      * {@inheritDoc}
+     * @phpstan-param array<TKey,T> $keys
+     * @phpstan-return ArrayCollection<TKey,T>
      */
     public function select(array $keys)
     {
         $this->initialize();
+
         return $this->collection->select($keys);
     }
 
     /**
      * {@inheritDoc}
+     * @phpstan-param array<TKey,T> $keys
+     * @phpstan-return ArrayCollection<TKey,T>
      */
     public function unselect(array $keys)
     {
         $this->initialize();
+
         return $this->collection->unselect($keys);
     }
 
     /**
-     * {@inheritDoc}
+     * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $this->initialize();
+
         return $this->collection->jsonSerialize();
     }
 }
diff --git a/system/src/Grav/Framework/Collection/ArrayCollection.php b/system/src/Grav/Framework/Collection/ArrayCollection.php
index f79ab9614d..cad02f26d2 100644
--- a/system/src/Grav/Framework/Collection/ArrayCollection.php
+++ b/system/src/Grav/Framework/Collection/ArrayCollection.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Collection
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,6 +15,10 @@
  * General JSON serializable collection.
  *
  * @package Grav\Framework\Collection
+ * @template TKey of array-key
+ * @template T
+ * @extends BaseArrayCollection<TKey,T>
+ * @implements CollectionInterface<TKey,T>
  */
 class ArrayCollection extends BaseArrayCollection implements CollectionInterface
 {
@@ -22,23 +26,30 @@ class ArrayCollection extends BaseArrayCollection implements CollectionInterface
      * Reverse the order of the items.
      *
      * @return static
+     * @phpstan-return static<TKey,T>
      */
     public function reverse()
     {
-        return $this->createFrom(array_reverse($this->toArray()));
+        $keys = array_reverse($this->toArray());
+
+        /** @phpstan-var static<TKey,T> */
+        return $this->createFrom($keys);
     }
 
     /**
      * Shuffle items.
      *
      * @return static
+     * @phpstan-return static<TKey,T>
      */
     public function shuffle()
     {
         $keys = $this->getKeys();
         shuffle($keys);
+        $keys = array_replace(array_flip($keys), $this->toArray());
 
-        return $this->createFrom(array_replace(array_flip($keys), $this->toArray()));
+        /** @phpstan-var static<TKey,T> */
+        return $this->createFrom($keys);
     }
 
     /**
@@ -46,9 +57,11 @@ public function shuffle()
      *
      * @param int $size     Size of each chunk.
      * @return array
+     * @phpstan-return array<array<TKey,T>>
      */
     public function chunk($size)
     {
+        /** @phpstan-var array<array<TKey,T>> */
         return array_chunk($this->toArray(), $size, true);
     }
 
@@ -57,8 +70,10 @@ public function chunk($size)
      *
      * Collection is returned in the order of $keys given to the function.
      *
-     * @param array $keys
+     * @param array<int,string> $keys
      * @return static
+     * @phpstan-param TKey[] $keys
+     * @phpstan-return static<TKey,T>
      */
     public function select(array $keys)
     {
@@ -69,18 +84,24 @@ public function select(array $keys)
             }
         }
 
+        /** @phpstan-var static<TKey,T> */
         return $this->createFrom($list);
     }
 
     /**
      * Un-select items from collection.
      *
-     * @param array $keys
+     * @param array<int|string> $keys
      * @return static
+     * @phpstan-param TKey[] $keys
+     * @phpstan-return static<TKey,T>
      */
     public function unselect(array $keys)
     {
-        return $this->select(array_diff($this->getKeys(), $keys));
+        $list = array_diff($this->getKeys(), $keys);
+
+        /** @phpstan-var static<TKey,T> */
+        return $this->select($list);
     }
 
     /**
@@ -88,6 +109,7 @@ public function unselect(array $keys)
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->toArray();
diff --git a/system/src/Grav/Framework/Collection/CollectionInterface.php b/system/src/Grav/Framework/Collection/CollectionInterface.php
index 9239d4ace7..e098dd6a13 100644
--- a/system/src/Grav/Framework/Collection/CollectionInterface.php
+++ b/system/src/Grav/Framework/Collection/CollectionInterface.php
@@ -3,32 +3,38 @@
 /**
  * @package    Grav\Framework\Collection
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Collection;
 
 use Doctrine\Common\Collections\Collection;
+use JsonSerializable;
 
 /**
  * Collection Interface.
  *
  * @package Grav\Framework\Collection
+ * @template TKey of array-key
+ * @template T
+ * @extends Collection<TKey,T>
  */
-interface CollectionInterface extends Collection, \JsonSerializable
+interface CollectionInterface extends Collection, JsonSerializable
 {
     /**
      * Reverse the order of the items.
      *
-     * @return static
+     * @return CollectionInterface
+     * @phpstan-return static<TKey,T>
      */
     public function reverse();
 
     /**
      * Shuffle items.
      *
-     * @return static
+     * @return CollectionInterface
+     * @phpstan-return static<TKey,T>
      */
     public function shuffle();
 
@@ -37,6 +43,7 @@ public function shuffle();
      *
      * @param int $size     Size of each chunk.
      * @return array
+     * @phpstan-return array<array<TKey,T>>
      */
     public function chunk($size);
 
@@ -45,16 +52,18 @@ public function chunk($size);
      *
      * Collection is returned in the order of $keys given to the function.
      *
-     * @param array $keys
-     * @return static
+     * @param array<int|string> $keys
+     * @return CollectionInterface
+     * @phpstan-return static<TKey,T>
      */
     public function select(array $keys);
 
     /**
      * Un-select items from collection.
      *
-     * @param array $keys
-     * @return static
+     * @param array<int|string> $keys
+     * @return CollectionInterface
+     * @phpstan-return static<TKey,T>
      */
     public function unselect(array $keys);
 }
diff --git a/system/src/Grav/Framework/Collection/FileCollection.php b/system/src/Grav/Framework/Collection/FileCollection.php
index c8e5116785..bae0e7b2ff 100644
--- a/system/src/Grav/Framework/Collection/FileCollection.php
+++ b/system/src/Grav/Framework/Collection/FileCollection.php
@@ -3,16 +3,19 @@
 /**
  * @package    Grav\Framework\Collection
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Collection;
 
+use stdClass;
+
 /**
  * Collection of objects stored into a filesystem.
  *
  * @package Grav\Framework\Collection
+ * @extends AbstractFileCollection<array-key,stdClass>
  */
 class FileCollection extends AbstractFileCollection
 {
diff --git a/system/src/Grav/Framework/Collection/FileCollectionInterface.php b/system/src/Grav/Framework/Collection/FileCollectionInterface.php
index fec4129418..1b56da953e 100644
--- a/system/src/Grav/Framework/Collection/FileCollectionInterface.php
+++ b/system/src/Grav/Framework/Collection/FileCollectionInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Collection
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,6 +15,10 @@
  * Collection of objects stored into a filesystem.
  *
  * @package Grav\Framework\Collection
+ * @template TKey of array-key
+ * @template T
+ * @extends CollectionInterface<TKey,T>
+ * @extends Selectable<TKey,T>
  */
 interface FileCollectionInterface extends CollectionInterface, Selectable
 {
diff --git a/system/src/Grav/Framework/Compat/Serializable.php b/system/src/Grav/Framework/Compat/Serializable.php
new file mode 100644
index 0000000000..22e4648d8b
--- /dev/null
+++ b/system/src/Grav/Framework/Compat/Serializable.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Compat
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Compat;
+
+/**
+ * Serializable trait
+ *
+ * Adds backwards compatibility to PHP 7.3 Serializable interface.
+ *
+ * Note: Remember to add: `implements \Serializable` to the classes which use this trait.
+ *
+ * @package Grav\Framework\Traits
+ */
+trait Serializable
+{
+    /**
+     * @return string
+     */
+    final public function serialize(): string
+    {
+        return serialize($this->__serialize());
+    }
+
+    /**
+     * @param string $serialized
+     * @return void
+     */
+    final public function unserialize($serialized): void
+    {
+        $this->__unserialize(unserialize($serialized, ['allowed_classes' => $this->getUnserializeAllowedClasses()]));
+    }
+
+    /**
+     * @return array|bool
+     */
+    protected function getUnserializeAllowedClasses()
+    {
+        return false;
+    }
+}
diff --git a/system/src/Grav/Framework/ContentBlock/ContentBlock.php b/system/src/Grav/Framework/ContentBlock/ContentBlock.php
index ab63bb1d1d..7259df0907 100644
--- a/system/src/Grav/Framework/ContentBlock/ContentBlock.php
+++ b/system/src/Grav/Framework/ContentBlock/ContentBlock.php
@@ -3,12 +3,18 @@
 /**
  * @package    Grav\Framework\ContentBlock
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\ContentBlock;
 
+use Exception;
+use Grav\Framework\Compat\Serializable;
+use InvalidArgumentException;
+use RuntimeException;
+use function get_class;
+
 /**
  * Class to create nested blocks of content.
  *
@@ -23,16 +29,25 @@
  */
 class ContentBlock implements ContentBlockInterface
 {
+    use Serializable;
+
+    /** @var int */
     protected $version = 1;
+    /** @var string */
     protected $id;
+    /** @var string */
     protected $tokenTemplate = '@@BLOCK-%s@@';
+    /** @var string */
     protected $content = '';
+    /** @var array */
     protected $blocks = [];
+    /** @var string */
     protected $checksum;
+    /** @var bool */
     protected $cached = true;
 
     /**
-     * @param string $id
+     * @param string|null $id
      * @return static
      */
     public static function create($id = null)
@@ -43,7 +58,7 @@ public static function create($id = null)
     /**
      * @param array $serialized
      * @return ContentBlockInterface
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function fromArray(array $serialized)
     {
@@ -52,14 +67,14 @@ public static function fromArray(array $serialized)
             $id = $serialized['id'] ?? null;
 
             if (!$type || !$id || !is_a($type, ContentBlockInterface::class, true)) {
-                throw new \InvalidArgumentException('Bad data');
+                throw new InvalidArgumentException('Bad data');
             }
 
             /** @var ContentBlockInterface $instance */
             $instance = new $type($id);
             $instance->build($serialized);
-        } catch (\Exception $e) {
-            throw new \InvalidArgumentException(sprintf('Cannot unserialize Block: %s', $e->getMessage()), $e->getCode(), $e);
+        } catch (Exception $e) {
+            throw new InvalidArgumentException(sprintf('Cannot unserialize Block: %s', $e->getMessage()), $e->getCode(), $e);
         }
 
         return $instance;
@@ -68,7 +83,7 @@ public static function fromArray(array $serialized)
     /**
      * Block constructor.
      *
-     * @param string $id
+     * @param string|null $id
      */
     public function __construct($id = null)
     {
@@ -97,16 +112,13 @@ public function getToken()
     public function toArray()
     {
         $blocks = [];
-        /**
-         * @var string $id
-         * @var ContentBlockInterface $block
-         */
+        /** @var ContentBlockInterface $block */
         foreach ($this->blocks as $block) {
             $blocks[$block->getId()] = $block->toArray();
         }
 
         $array = [
-            '_type' => \get_class($this),
+            '_type' => get_class($this),
             '_version' => $this->version,
             'id' => $this->id,
             'cached' => $this->cached
@@ -149,18 +161,20 @@ public function toString()
     /**
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function __toString()
     {
         try {
             return $this->toString();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return sprintf('Error while rendering block: %s', $e->getMessage());
         }
     }
 
     /**
      * @param array $serialized
-     * @throws \RuntimeException
+     * @return void
+     * @throws RuntimeException
      */
     public function build(array $serialized)
     {
@@ -250,20 +264,20 @@ public function addBlock(ContentBlockInterface $block)
     }
 
     /**
-     * @return string
+     * @return array
      */
-    public function serialize()
+    final public function __serialize(): array
     {
-        return serialize($this->toArray());
+        return $this->toArray();
     }
 
     /**
-     * @param string $serialized
+     * @param array $data
+     * @return void
      */
-    public function unserialize($serialized)
+    final public function __unserialize(array $data): void
     {
-        $array = unserialize($serialized);
-        $this->build($array);
+        $this->build($data);
     }
 
     /**
@@ -276,13 +290,14 @@ protected function generateId()
 
     /**
      * @param array $serialized
-     * @throws \RuntimeException
+     * @return void
+     * @throws RuntimeException
      */
     protected function checkVersion(array $serialized)
     {
         $version = isset($serialized['_version']) ? (int) $serialized['_version'] : 1;
         if ($version !== $this->version) {
-            throw new \RuntimeException(sprintf('Unsupported version %s', $version));
+            throw new RuntimeException(sprintf('Unsupported version %s', $version));
         }
     }
 }
diff --git a/system/src/Grav/Framework/ContentBlock/ContentBlockInterface.php b/system/src/Grav/Framework/ContentBlock/ContentBlockInterface.php
index 330901ebe2..bb0e46f8f6 100644
--- a/system/src/Grav/Framework/ContentBlock/ContentBlockInterface.php
+++ b/system/src/Grav/Framework/ContentBlock/ContentBlockInterface.php
@@ -3,20 +3,22 @@
 /**
  * @package    Grav\Framework\ContentBlock
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\ContentBlock;
 
+use Serializable;
+
 /**
  * ContentBlock Interface
  * @package Grav\Framework\ContentBlock
  */
-interface ContentBlockInterface extends \Serializable
+interface ContentBlockInterface extends Serializable
 {
     /**
-     * @param string $id
+     * @param string|null $id
      * @return static
      */
     public static function create($id = null);
@@ -28,7 +30,7 @@ public static function create($id = null);
     public static function fromArray(array $serialized);
 
     /**
-     * @param string $id
+     * @param string|null $id
      */
     public function __construct($id = null);
 
@@ -59,6 +61,7 @@ public function __toString();
 
     /**
      * @param array $serialized
+     * @return void
      */
     public function build(array $serialized);
 
diff --git a/system/src/Grav/Framework/ContentBlock/HtmlBlock.php b/system/src/Grav/Framework/ContentBlock/HtmlBlock.php
index 8cefd4f9a4..69d417ca08 100644
--- a/system/src/Grav/Framework/ContentBlock/HtmlBlock.php
+++ b/system/src/Grav/Framework/ContentBlock/HtmlBlock.php
@@ -3,12 +3,16 @@
 /**
  * @package    Grav\Framework\ContentBlock
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\ContentBlock;
 
+use RuntimeException;
+use function is_array;
+use function is_string;
+
 /**
  * HtmlBlock
  *
@@ -16,10 +20,17 @@
  */
 class HtmlBlock extends ContentBlock implements HtmlBlockInterface
 {
+    /** @var int */
     protected $version = 1;
+    /** @var array */
     protected $frameworks = [];
+    /** @var array */
     protected $styles = [];
+    /** @var array */
     protected $scripts = [];
+    /** @var array */
+    protected $links = [];
+    /** @var array */
     protected $html = [];
 
     /**
@@ -31,6 +42,7 @@ public function getAssets()
 
         $this->sortAssets($assets['styles']);
         $this->sortAssets($assets['scripts']);
+        $this->sortAssets($assets['links']);
         $this->sortAssets($assets['html']);
 
         return $assets;
@@ -64,6 +76,15 @@ public function getScripts($location = 'head')
         return $this->getAssetsInLocation('scripts', $location);
     }
 
+    /**
+     * @param string $location
+     * @return array
+     */
+    public function getLinks($location = 'head')
+    {
+        return $this->getAssetsInLocation('links', $location);
+    }
+
     /**
      * @param string $location
      * @return array
@@ -74,7 +95,7 @@ public function getHtml($location = 'bottom')
     }
 
     /**
-     * @return array[]
+     * @return array
      */
     public function toArray()
     {
@@ -89,6 +110,9 @@ public function toArray()
         if ($this->scripts) {
             $array['scripts'] = $this->scripts;
         }
+        if ($this->links) {
+            $array['links'] = $this->links;
+        }
         if ($this->html) {
             $array['html'] = $this->html;
         }
@@ -98,7 +122,8 @@ public function toArray()
 
     /**
      * @param array $serialized
-     * @throws \RuntimeException
+     * @return void
+     * @throws RuntimeException
      */
     public function build(array $serialized)
     {
@@ -107,6 +132,7 @@ public function build(array $serialized)
         $this->frameworks = isset($serialized['frameworks']) ? (array) $serialized['frameworks'] : [];
         $this->styles = isset($serialized['styles']) ? (array) $serialized['styles'] : [];
         $this->scripts = isset($serialized['scripts']) ? (array) $serialized['scripts'] : [];
+        $this->links = isset($serialized['links']) ? (array) $serialized['links'] : [];
         $this->html = isset($serialized['html']) ? (array) $serialized['html'] : [];
     }
 
@@ -132,7 +158,7 @@ public function addFramework($framework)
      */
     public function addStyle($element, $priority = 0, $location = 'head')
     {
-        if (!\is_array($element)) {
+        if (!is_array($element)) {
             $element = ['href' => (string) $element];
         }
         if (empty($element['href'])) {
@@ -176,7 +202,7 @@ public function addStyle($element, $priority = 0, $location = 'head')
      */
     public function addInlineStyle($element, $priority = 0, $location = 'head')
     {
-        if (!\is_array($element)) {
+        if (!is_array($element)) {
             $element = ['content' => (string) $element];
         }
         if (empty($element['content'])) {
@@ -189,11 +215,14 @@ public function addInlineStyle($element, $priority = 0, $location = 'head')
         $content = (string) $element['content'];
         $type = !empty($element['type']) ? (string) $element['type'] : 'text/css';
 
+        unset($element['content'], $element['type']);
+
         $this->styles[$location][md5($content) . sha1($content)] = [
             ':type' => 'inline',
             ':priority' => (int) $priority,
             'content' => $content,
-            'type' => $type
+            'type' => $type,
+            'element' => $element
         ];
 
         return true;
@@ -207,7 +236,7 @@ public function addInlineStyle($element, $priority = 0, $location = 'head')
      */
     public function addScript($element, $priority = 0, $location = 'head')
     {
-        if (!\is_array($element)) {
+        if (!is_array($element)) {
             $element = ['src' => (string) $element];
         }
         if (empty($element['src'])) {
@@ -219,18 +248,23 @@ public function addScript($element, $priority = 0, $location = 'head')
 
         $src = $element['src'];
         $type = !empty($element['type']) ? (string) $element['type'] : 'text/javascript';
-        $defer = isset($element['defer']) ? true : false;
-        $async = isset($element['async']) ? true : false;
+        $loading = !empty($element['loading']) ? (string) $element['loading'] : null;
+        $defer = !empty($element['defer']);
+        $async = !empty($element['async']);
         $handle = !empty($element['handle']) ? (string) $element['handle'] : '';
 
+        unset($element['src'], $element['type'], $element['loading'], $element['defer'], $element['async'], $element['handle']);
+
         $this->scripts[$location][md5($src) . sha1($src)] = [
             ':type' => 'file',
             ':priority' => (int) $priority,
             'src' => $src,
             'type' => $type,
+            'loading' => $loading,
             'defer' => $defer,
             'async' => $async,
-            'handle' => $handle
+            'handle' => $handle,
+            'element' => $element
         ];
 
         return true;
@@ -244,7 +278,7 @@ public function addScript($element, $priority = 0, $location = 'head')
      */
     public function addInlineScript($element, $priority = 0, $location = 'head')
     {
-        if (!\is_array($element)) {
+        if (!is_array($element)) {
             $element = ['content' => (string) $element];
         }
         if (empty($element['content'])) {
@@ -256,12 +290,83 @@ public function addInlineScript($element, $priority = 0, $location = 'head')
 
         $content = (string) $element['content'];
         $type = !empty($element['type']) ? (string) $element['type'] : 'text/javascript';
+        $loading = !empty($element['loading']) ? (string) $element['loading'] : null;
+
+        unset($element['content'], $element['type'], $element['loading']);
 
         $this->scripts[$location][md5($content) . sha1($content)] = [
             ':type' => 'inline',
             ':priority' => (int) $priority,
             'content' => $content,
-            'type' => $type
+            'type' => $type,
+            'loading' => $loading,
+            'element' => $element
+        ];
+
+        return true;
+    }
+
+    /**
+     * @param string|array $element
+     * @param int $priority
+     * @param string $location
+     * @return bool
+     */
+    public function addModule($element, $priority = 0, $location = 'head')
+    {
+        if (!is_array($element)) {
+            $element = ['src' => (string) $element];
+        }
+
+        $element['type'] = 'module';
+
+        return $this->addScript($element, $priority, $location);
+    }
+
+    /**
+     * @param string|array $element
+     * @param int $priority
+     * @param string $location
+     * @return bool
+     */
+    public function addInlineModule($element, $priority = 0, $location = 'head')
+    {
+        if (!is_array($element)) {
+            $element = ['content' => (string) $element];
+        }
+
+        $element['type'] = 'module';
+
+        return $this->addInlineScript($element, $priority, $location);
+    }
+
+    /**
+     * @param array $element
+     * @param int $priority
+     * @param string $location
+     * @return bool
+     */
+    public function addLink($element, $priority = 0, $location = 'head')
+    {
+        if (!is_array($element) || empty($element['rel']) || empty($element['href'])) {
+            return false;
+        }
+
+        if (!isset($this->links[$location])) {
+            $this->links[$location] = [];
+        }
+
+        $rel = (string) $element['rel'];
+        $href = (string) $element['href'];
+
+        unset($element['rel'], $element['href']);
+
+        $this->links[$location][md5($href) . sha1($href)] = [
+            ':type' => 'file',
+            ':priority' => (int) $priority,
+            'href' => $href,
+            'rel' => $rel,
+            'element' => $element,
         ];
 
         return true;
@@ -275,7 +380,7 @@ public function addInlineScript($element, $priority = 0, $location = 'head')
      */
     public function addHtml($html, $priority = 0, $location = 'bottom')
     {
-        if (empty($html) || !\is_string($html)) {
+        if (empty($html) || !is_string($html)) {
             return false;
         }
         if (!isset($this->html[$location])) {
@@ -299,6 +404,7 @@ protected function getAssetsFast()
             'frameworks' => $this->frameworks,
             'styles' => $this->styles,
             'scripts' => $this->scripts,
+            'links' => $this->links,
             'html' => $this->html
         ];
 
@@ -323,6 +429,14 @@ protected function getAssetsFast()
                     }
                 }
 
+                foreach ($blockAssets['links'] as $location => $links) {
+                    if (!isset($assets['links'][$location])) {
+                        $assets['links'][$location] = $links;
+                    } elseif ($links) {
+                        $assets['links'][$location] += $links;
+                    }
+                }
+
                 foreach ($blockAssets['html'] as $location => $htmls) {
                     if (!isset($assets['html'][$location])) {
                         $assets['html'][$location] = $htmls;
@@ -357,6 +471,7 @@ protected function getAssetsInLocation($type, $location)
 
     /**
      * @param array $items
+     * @return void
      */
     protected function sortAssetsInLocation(array &$items)
     {
@@ -368,19 +483,19 @@ protected function sortAssetsInLocation(array &$items)
 
         uasort(
             $items,
-            function ($a, $b) {
-                return ($a[':priority'] === $b[':priority'])
-                    ? $a[':order'] - $b[':order'] : $a[':priority'] - $b[':priority'];
+            static function ($a, $b) {
+                return $a[':priority'] <=> $b[':priority'] ?: $a[':order'] <=> $b[':order'];
             }
         );
     }
 
     /**
      * @param array $array
+     * @return void
      */
     protected function sortAssets(array &$array)
     {
-        foreach ($array as $location => &$items) {
+        foreach ($array as &$items) {
             $this->sortAssetsInLocation($items);
         }
     }
diff --git a/system/src/Grav/Framework/ContentBlock/HtmlBlockInterface.php b/system/src/Grav/Framework/ContentBlock/HtmlBlockInterface.php
index ee486d207e..b151d7b8aa 100644
--- a/system/src/Grav/Framework/ContentBlock/HtmlBlockInterface.php
+++ b/system/src/Grav/Framework/ContentBlock/HtmlBlockInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\ContentBlock
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -37,6 +37,13 @@ public function getStyles($location = 'head');
      */
     public function getScripts($location = 'head');
 
+
+    /**
+     * @param string $location
+     * @return array
+     */
+    public function getLinks($location = 'head');
+
     /**
      * @param string $location
      * @return array
@@ -76,7 +83,6 @@ public function addInlineStyle($element, $priority = 0, $location = 'head');
      */
     public function addScript($element, $priority = 0, $location = 'head');
 
-
     /**
      * @param string|array $element
      * @param int $priority
@@ -85,6 +91,35 @@ public function addScript($element, $priority = 0, $location = 'head');
      */
     public function addInlineScript($element, $priority = 0, $location = 'head');
 
+
+    /**
+     * Shortcut for writing addScript(['type' => 'module', 'src' => ...]).
+     *
+     * @param string|array $element
+     * @param int $priority
+     * @param string $location
+     * @return bool
+     */
+    public function addModule($element, $priority = 0, $location = 'head');
+
+    /**
+     * Shortcut for writing addInlineScript(['type' => 'module', 'content' => ...]).
+     *
+     * @param string|array $element
+     * @param int $priority
+     * @param string $location
+     * @return bool
+     */
+    public function addInlineModule($element, $priority = 0, $location = 'head');
+
+    /**
+     * @param array $element
+     * @param int $priority
+     * @param string $location
+     * @return bool
+     */
+    public function addLink($element, $priority = 0, $location = 'head');
+
     /**
      * @param string $html
      * @param int $priority
diff --git a/system/src/Grav/Framework/Contracts/Media/MediaObjectInterface.php b/system/src/Grav/Framework/Contracts/Media/MediaObjectInterface.php
new file mode 100644
index 0000000000..75b80f0d6d
--- /dev/null
+++ b/system/src/Grav/Framework/Contracts/Media/MediaObjectInterface.php
@@ -0,0 +1,52 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Contracts\Media;
+
+use Grav\Framework\Contracts\Object\IdentifierInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Media Object Interface
+ */
+interface MediaObjectInterface extends IdentifierInterface
+{
+    /**
+     * Returns true if the object exists.
+     *
+     * @return bool
+     * @phpstan-pure
+     */
+    public function exists(): bool;
+
+    /**
+     * Get metadata associated to the media object.
+     *
+     * @return array
+     * @phpstan-pure
+     */
+    public function getMeta(): array;
+
+    /**
+     * @param string $field
+     * @return mixed
+     * @phpstan-pure
+     */
+    public function get(string $field);
+
+    /**
+     * Return URL pointing to the media object.
+     *
+     * @return string
+     * @phpstan-pure
+     */
+    public function getUrl(): string;
+
+    /**
+     * Create media response.
+     *
+     * @param array $actions
+     * @return ResponseInterface
+     * @phpstan-pure
+     */
+    public function createResponse(array $actions): ResponseInterface;
+}
diff --git a/system/src/Grav/Framework/Contracts/Object/IdentifierInterface.php b/system/src/Grav/Framework/Contracts/Object/IdentifierInterface.php
new file mode 100644
index 0000000000..b38abe6b73
--- /dev/null
+++ b/system/src/Grav/Framework/Contracts/Object/IdentifierInterface.php
@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Contracts\Object;
+
+use JsonSerializable;
+
+/**
+ * Interface IdentifierInterface
+ */
+interface IdentifierInterface extends JsonSerializable
+{
+    /**
+     * Get identifier's ID.
+     *
+     * @return string
+     * @phpstan-pure
+     */
+    public function getId(): string;
+
+    /**
+     * Get identifier's type.
+     *
+     * @return string
+     * @phpstan-pure
+     */
+    public function getType(): string;
+}
diff --git a/system/src/Grav/Framework/Contracts/Relationships/RelationshipIdentifierInterface.php b/system/src/Grav/Framework/Contracts/Relationships/RelationshipIdentifierInterface.php
new file mode 100644
index 0000000000..3d7ea4a046
--- /dev/null
+++ b/system/src/Grav/Framework/Contracts/Relationships/RelationshipIdentifierInterface.php
@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Contracts\Relationships;
+
+use ArrayAccess;
+use Grav\Framework\Contracts\Object\IdentifierInterface;
+
+/**
+ * Interface RelationshipIdentifierInterface
+ */
+interface RelationshipIdentifierInterface extends IdentifierInterface
+{
+    /**
+     * If identifier has meta.
+     *
+     * @return bool
+     * @phpstan-pure
+     */
+    public function hasIdentifierMeta(): bool;
+
+    /**
+     * Get identifier meta.
+     *
+     * @return array<string,mixed>|ArrayAccess<string,mixed>
+     * @phpstan-pure
+     */
+    public function getIdentifierMeta();
+}
diff --git a/system/src/Grav/Framework/Contracts/Relationships/RelationshipInterface.php b/system/src/Grav/Framework/Contracts/Relationships/RelationshipInterface.php
new file mode 100644
index 0000000000..c0a7edfe40
--- /dev/null
+++ b/system/src/Grav/Framework/Contracts/Relationships/RelationshipInterface.php
@@ -0,0 +1,81 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Contracts\Relationships;
+
+use Countable;
+use Grav\Framework\Contracts\Object\IdentifierInterface;
+use IteratorAggregate;
+use JsonSerializable;
+use Serializable;
+
+/**
+ * Interface Relationship
+ *
+ * @template T of IdentifierInterface
+ * @template P of IdentifierInterface
+ * @extends IteratorAggregate<string, T>
+ */
+interface RelationshipInterface extends Countable, IteratorAggregate, JsonSerializable, Serializable
+{
+    /**
+     * @return string
+     * @phpstan-pure
+     */
+    public function getName(): string;
+
+    /**
+     * @return string
+     * @phpstan-pure
+     */
+    public function getType(): string;
+
+    /**
+     * @return bool
+     * @phpstan-pure
+     */
+    public function isModified(): bool;
+
+    /**
+     * @return string
+     * @phpstan-pure
+     */
+    public function getCardinality(): string;
+
+    /**
+     * @return P
+     * @phpstan-pure
+     */
+    public function getParent(): IdentifierInterface;
+
+    /**
+     * @param string $id
+     * @param string|null $type
+     * @return bool
+     * @phpstan-pure
+     */
+    public function has(string $id, string $type = null): bool;
+
+    /**
+     * @param T $identifier
+     * @return bool
+     * @phpstan-pure
+     */
+    public function hasIdentifier(IdentifierInterface $identifier): bool;
+
+    /**
+     * @param T $identifier
+     * @return bool
+     */
+    public function addIdentifier(IdentifierInterface $identifier): bool;
+
+    /**
+     * @param T|null $identifier
+     * @return bool
+     */
+    public function removeIdentifier(IdentifierInterface $identifier = null): bool;
+
+    /**
+     * @return iterable<T>
+     */
+    public function getIterator(): iterable;
+}
diff --git a/system/src/Grav/Framework/Contracts/Relationships/RelationshipsInterface.php b/system/src/Grav/Framework/Contracts/Relationships/RelationshipsInterface.php
new file mode 100644
index 0000000000..4bd90a30b9
--- /dev/null
+++ b/system/src/Grav/Framework/Contracts/Relationships/RelationshipsInterface.php
@@ -0,0 +1,53 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Contracts\Relationships;
+
+use ArrayAccess;
+use Countable;
+use Iterator;
+use JsonSerializable;
+
+/**
+ * Interface RelationshipsInterface
+ *
+ * @template T of \Grav\Framework\Contracts\Object\IdentifierInterface
+ * @template P of \Grav\Framework\Contracts\Object\IdentifierInterface
+ * @extends ArrayAccess<string,RelationshipInterface<T,P>>
+ * @extends Iterator<string,RelationshipInterface<T,P>>
+ */
+interface RelationshipsInterface extends Countable, ArrayAccess, Iterator, JsonSerializable
+{
+    /**
+     * @return bool
+     * @phpstan-pure
+     */
+    public function isModified(): bool;
+
+    /**
+     * @return array
+     */
+    public function getModified(): array;
+
+    /**
+     * @return int
+     * @phpstan-pure
+     */
+    public function count(): int;
+
+    /**
+     * @param string $offset
+     * @return RelationshipInterface<T,P>|null
+     */
+    public function offsetGet($offset): ?RelationshipInterface;
+
+    /**
+     * @return RelationshipInterface<T,P>|null
+     */
+    public function current(): ?RelationshipInterface;
+
+    /**
+     * @return string
+     * @phpstan-pure
+     */
+    public function key(): string;
+}
diff --git a/system/src/Grav/Framework/Contracts/Relationships/ToManyRelationshipInterface.php b/system/src/Grav/Framework/Contracts/Relationships/ToManyRelationshipInterface.php
new file mode 100644
index 0000000000..723bef6905
--- /dev/null
+++ b/system/src/Grav/Framework/Contracts/Relationships/ToManyRelationshipInterface.php
@@ -0,0 +1,55 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Contracts\Relationships;
+
+use Grav\Framework\Contracts\Object\IdentifierInterface;
+
+/**
+ * Interface ToManyRelationshipInterface
+ *
+ * @template T of IdentifierInterface
+ * @template P of IdentifierInterface
+ * @template-extends RelationshipInterface<T,P>
+ */
+interface ToManyRelationshipInterface extends RelationshipInterface
+{
+    /**
+     * @param positive-int $pos
+     * @return IdentifierInterface|null
+     */
+    public function getNthIdentifier(int $pos): ?IdentifierInterface;
+
+    /**
+     * @param string $id
+     * @param string|null $type
+     * @return T|null
+     * @phpstan-pure
+     */
+    public function getIdentifier(string $id, string $type = null): ?IdentifierInterface;
+
+    /**
+     * @param string $id
+     * @param string|null $type
+     * @return T|null
+     * @phpstan-pure
+     */
+    public function getObject(string $id, string $type = null): ?object;
+
+    /**
+     * @param iterable<T> $identifiers
+     * @return bool
+     */
+    public function addIdentifiers(iterable $identifiers): bool;
+
+    /**
+     * @param iterable<T> $identifiers
+     * @return bool
+     */
+    public function replaceIdentifiers(iterable $identifiers): bool;
+
+    /**
+     * @param iterable<T> $identifiers
+     * @return bool
+     */
+    public function removeIdentifiers(iterable $identifiers): bool;
+}
diff --git a/system/src/Grav/Framework/Contracts/Relationships/ToOneRelationshipInterface.php b/system/src/Grav/Framework/Contracts/Relationships/ToOneRelationshipInterface.php
new file mode 100644
index 0000000000..0e6aeb9738
--- /dev/null
+++ b/system/src/Grav/Framework/Contracts/Relationships/ToOneRelationshipInterface.php
@@ -0,0 +1,37 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Contracts\Relationships;
+
+use Grav\Framework\Contracts\Object\IdentifierInterface;
+
+/**
+ * Interface ToOneRelationshipInterface
+ *
+ * @template T of IdentifierInterface
+ * @template P of IdentifierInterface
+ * @template-extends RelationshipInterface<T,P>
+ */
+interface ToOneRelationshipInterface extends RelationshipInterface
+{
+    /**
+     * @param string|null $id
+     * @param string|null $type
+     * @return T|null
+     * @phpstan-pure
+     */
+    public function getIdentifier(string $id = null, string $type = null): ?IdentifierInterface;
+
+    /**
+     * @param string|null $id
+     * @param string|null $type
+     * @return T|null
+     * @phpstan-pure
+     */
+    public function getObject(string $id = null, string $type = null): ?object;
+
+    /**
+     * @param T|null $identifier
+     * @return bool
+     */
+    public function replaceIdentifier(IdentifierInterface $identifier = null): bool;
+}
diff --git a/system/src/Grav/Framework/Controller/Traits/ControllerResponseTrait.php b/system/src/Grav/Framework/Controller/Traits/ControllerResponseTrait.php
new file mode 100644
index 0000000000..24e1fc2b3a
--- /dev/null
+++ b/system/src/Grav/Framework/Controller/Traits/ControllerResponseTrait.php
@@ -0,0 +1,307 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Controller
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace Grav\Framework\Controller\Traits;
+
+use Grav\Common\Config\Config;
+use Grav\Common\Data\ValidationException;
+use Grav\Common\Debugger;
+use Grav\Common\Grav;
+use Grav\Common\Utils;
+use Grav\Framework\Psr7\Response;
+use Grav\Framework\RequestHandler\Exception\RequestException;
+use Grav\Framework\Route\Route;
+use JsonSerializable;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\StreamInterface;
+use Throwable;
+use function get_class;
+use function in_array;
+
+/**
+ * Trait ControllerResponseTrait
+ * @package Grav\Framework\Controller\Traits
+ */
+trait ControllerResponseTrait
+{
+    /**
+     * Display the current page.
+     *
+     * @return Response
+     */
+    protected function createDisplayResponse(): ResponseInterface
+    {
+        return new Response(418);
+    }
+
+    /**
+     * @param string $content
+     * @param int|null $code
+     * @param array|null $headers
+     * @return Response
+     */
+    protected function createHtmlResponse(string $content, int $code = null, array $headers = null): ResponseInterface
+    {
+        $code = $code ?? 200;
+        if ($code < 100 || $code > 599) {
+            $code = 500;
+        }
+        $headers = $headers ?? [];
+
+        return new Response($code, $headers, $content);
+    }
+
+    /**
+     * @param array $content
+     * @param int|null $code
+     * @param array|null $headers
+     * @return Response
+     */
+    protected function createJsonResponse(array $content, int $code = null, array $headers = null): ResponseInterface
+    {
+        $code = $code ?? $content['code'] ?? 200;
+        if (null === $code || $code < 100 || $code > 599) {
+            $code = 200;
+        }
+        $headers = ($headers ?? []) + [
+            'Content-Type' => 'application/json',
+            'Cache-Control' => 'no-store, max-age=0'
+        ];
+
+        return new Response($code, $headers, json_encode($content));
+    }
+
+    /**
+     * @param string $filename
+     * @param string|resource|StreamInterface $resource
+     * @param array|null $headers
+     * @param array|null $options
+     * @return ResponseInterface
+     */
+    protected function createDownloadResponse(string $filename, $resource, array $headers = null, array $options = null): ResponseInterface
+    {
+        // Required for IE, otherwise Content-Disposition may be ignored
+        if (ini_get('zlib.output_compression')) {
+            @ini_set('zlib.output_compression', 'Off');
+        }
+
+        $headers = $headers ?? [];
+        $options = $options ?? ['force_download' => true];
+
+        $file_parts = Utils::pathinfo($filename);
+
+        if (!isset($headers['Content-Type'])) {
+            $mimetype = Utils::getMimeByExtension($file_parts['extension']);
+
+            $headers['Content-Type'] = $mimetype;
+        }
+
+        // TODO: add multipart download support.
+        //$headers['Accept-Ranges'] = 'bytes';
+
+        if (!empty($options['force_download'])) {
+            $headers['Content-Disposition'] = 'attachment; filename="' . $file_parts['basename'] . '"';
+        }
+
+        if (!isset($headers['Content-Length'])) {
+            $realpath = realpath($filename);
+            if ($realpath) {
+                $headers['Content-Length'] = filesize($realpath);
+            }
+        }
+
+        $headers += [
+            'Expires' => 'Mon, 26 Jul 1997 05:00:00 GMT',
+            'Last-Modified' => gmdate('D, d M Y H:i:s') . ' GMT',
+            'Cache-Control' => 'no-store, no-cache, must-revalidate',
+            'Pragma' => 'no-cache'
+        ];
+
+        return new Response(200, $headers, $resource);
+    }
+
+    /**
+     * @param string $url
+     * @param int|null $code
+     * @return Response
+     */
+    protected function createRedirectResponse(string $url, int $code = null): ResponseInterface
+    {
+        if (null === $code || $code < 301 || $code > 307) {
+            $code = (int)$this->getConfig()->get('system.pages.redirect_default_code', 302);
+        }
+
+        $ext = Utils::pathinfo($url, PATHINFO_EXTENSION);
+        $accept = $this->getAccept(['application/json', 'text/html']);
+        if ($ext === 'json' || $accept === 'application/json') {
+            return $this->createJsonResponse(['code' => $code, 'status' => 'redirect', 'redirect' => $url]);
+        }
+
+        return new Response($code, ['Location' => $url]);
+    }
+
+    /**
+     * @param Throwable $e
+     * @return ResponseInterface
+     */
+    protected function createErrorResponse(Throwable $e): ResponseInterface
+    {
+        $response = $this->getErrorJson($e);
+        $message = $response['message'];
+        $code = $response['code'];
+        $reason = $e instanceof RequestException ? $e->getHttpReason() : null;
+        $accept = $this->getAccept(['application/json', 'text/html']);
+
+        $request = $this->getRequest();
+        $context = $request->getAttributes();
+
+        /** @var Route $route */
+        $route = $context['route'] ?? null;
+
+        $ext = $route ? $route->getExtension() : null;
+        if ($ext !== 'json' && $accept === 'text/html') {
+            $method = $request->getMethod();
+
+            // On POST etc, redirect back to the previous page.
+            if ($method !== 'GET' && $method !== 'HEAD') {
+                $this->setMessage($message, 'error');
+                $referer = $request->getHeaderLine('Referer');
+
+                return $this->createRedirectResponse($referer, 303);
+            }
+
+            // TODO: improve error page
+            return $this->createHtmlResponse($response['message'], $code);
+        }
+
+        return new Response($code, ['Content-Type' => 'application/json'], json_encode($response), '1.1', $reason);
+    }
+
+    /**
+     * @param Throwable $e
+     * @return ResponseInterface
+     */
+    protected function createJsonErrorResponse(Throwable $e): ResponseInterface
+    {
+        $response = $this->getErrorJson($e);
+        $reason = $e instanceof RequestException ? $e->getHttpReason() : null;
+
+        return new Response($response['code'], ['Content-Type' => 'application/json'], json_encode($response), '1.1', $reason);
+    }
+
+    /**
+     * @param Throwable $e
+     * @return array
+     */
+    protected function getErrorJson(Throwable $e): array
+    {
+        $code = $this->getErrorCode($e instanceof RequestException ? $e->getHttpCode() : $e->getCode());
+        if ($e instanceof ValidationException) {
+            $message = $e->getMessage();
+        } else {
+            $message = htmlspecialchars($e->getMessage(), ENT_QUOTES | ENT_HTML5, 'UTF-8');
+        }
+
+        $extra = $e instanceof JsonSerializable ? $e->jsonSerialize() : [];
+
+        $response = [
+            'code' => $code,
+            'status' => 'error',
+            'message' => $message,
+            'redirect' => null,
+            'error' => [
+                'code' => $code,
+                'message' => $message
+            ] + $extra
+        ];
+
+        /** @var Debugger $debugger */
+        $debugger = Grav::instance()['debugger'];
+        if ($debugger->enabled()) {
+            $response['error'] += [
+                'type' => get_class($e),
+                'file' => $e->getFile(),
+                'line' => $e->getLine(),
+                'trace' => explode("\n", $e->getTraceAsString())
+            ];
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param int $code
+     * @return int
+     */
+    protected function getErrorCode(int $code): int
+    {
+        static $errorCodes = [
+            400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418,
+            422, 423, 424, 425, 426, 428, 429, 431, 451, 500, 501, 502, 503, 504, 505, 506, 507, 508, 511
+        ];
+
+        if (!in_array($code, $errorCodes, true)) {
+            $code = 500;
+        }
+
+        return $code;
+    }
+
+    /**
+     * @param array $compare
+     * @return mixed
+     */
+    protected function getAccept(array $compare)
+    {
+        $accepted = [];
+        foreach ($this->getRequest()->getHeader('Accept') as $accept) {
+            foreach (explode(',', $accept) as $item) {
+                if (!$item) {
+                    continue;
+                }
+
+                $split = explode(';q=', $item);
+                $mime = array_shift($split);
+                $priority = array_shift($split) ?? 1.0;
+
+                $accepted[$mime] = $priority;
+            }
+        }
+
+        arsort($accepted);
+
+        // TODO: add support for image/* etc
+        $list = array_intersect($compare, array_keys($accepted));
+        if (!$list && (isset($accepted['*/*']) || isset($accepted['*']))) {
+            return reset($compare);
+        }
+
+        return reset($list);
+    }
+
+    /**
+     * @return ServerRequestInterface
+     */
+    abstract protected function getRequest(): ServerRequestInterface;
+
+    /**
+     * @param string $message
+     * @param string $type
+     * @return $this
+     */
+    abstract protected function setMessage(string $message, string $type = 'info');
+
+    /**
+     * @return Config
+     */
+    abstract protected function getConfig(): Config;
+}
diff --git a/system/src/Grav/Framework/DI/Container.php b/system/src/Grav/Framework/DI/Container.php
index c4b3ef4cac..dde0da3ca5 100644
--- a/system/src/Grav/Framework/DI/Container.php
+++ b/system/src/Grav/Framework/DI/Container.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\DI
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,13 +15,21 @@
 
 class Container extends \Pimple\Container implements ContainerInterface
 {
+    /**
+     * @param string $id
+     * @return mixed
+     */
     public function get($id)
     {
         return $this->offsetGet($id);
     }
 
+    /**
+     * @param string $id
+     * @return bool
+     */
     public function has($id): bool
     {
         return $this->offsetExists($id);
     }
-}
\ No newline at end of file
+}
diff --git a/system/src/Grav/Framework/File/AbstractFile.php b/system/src/Grav/Framework/File/AbstractFile.php
index 0411701d39..b216ea6c80 100644
--- a/system/src/Grav/Framework/File/AbstractFile.php
+++ b/system/src/Grav/Framework/File/AbstractFile.php
@@ -5,38 +5,40 @@
 /**
  * @package    Grav\Framework\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\File;
 
+use Exception;
+use Grav\Framework\Compat\Serializable;
 use Grav\Framework\File\Interfaces\FileInterface;
 use Grav\Framework\Filesystem\Filesystem;
+use RuntimeException;
 
+/**
+ * Class AbstractFile
+ * @package Grav\Framework\File
+ */
 class AbstractFile implements FileInterface
 {
+    use Serializable;
+
     /** @var Filesystem */
     private $filesystem;
-
     /** @var string */
     private $filepath;
-
     /** @var string|null */
     private $filename;
-
     /** @var string|null */
     private $path;
-
     /** @var string|null */
     private $basename;
-
     /** @var string|null */
     private $extension;
-
     /** @var resource|null */
     private $handle;
-
     /** @var bool */
     private $locked = false;
 
@@ -53,6 +55,7 @@ public function __construct(string $filepath, Filesystem $filesystem = null)
     /**
      * Unlock file when the object gets destroyed.
      */
+    #[\ReturnTypeWillChange]
     public function __destruct()
     {
         if ($this->isLocked()) {
@@ -60,6 +63,10 @@ public function __destruct()
         }
     }
 
+    /**
+     * @return void
+     */
+    #[\ReturnTypeWillChange]
     public function __clone()
     {
         $this->handle = null;
@@ -67,19 +74,22 @@ public function __clone()
     }
 
     /**
-     * @return string
+     * @return array
      */
-    public function serialize(): string
+    final public function __serialize(): array
     {
-        return serialize($this->doSerialize());
+        return ['filesystem_normalize' => $this->filesystem->getNormalization()] + $this->doSerialize();
     }
 
     /**
-     * @param string $serialized
+     * @param array $data
+     * @return void
      */
-    public function unserialize($serialized): void
+    final public function __unserialize(array $data): void
     {
-        $this->doUnserialize(unserialize($serialized, ['allowed_classes' => false]));
+        $this->filesystem = Filesystem::getInstance($data['filesystem_normalize'] ?? null);
+
+        $this->doUnserialize($data);
     }
 
     /**
@@ -101,7 +111,7 @@ public function getPath(): string
             $this->setPathInfo();
         }
 
-        return $this->path;
+        return $this->path ?? '';
     }
 
     /**
@@ -114,7 +124,7 @@ public function getFilename(): string
             $this->setPathInfo();
         }
 
-        return $this->filename;
+        return $this->filename ?? '';
     }
 
     /**
@@ -127,7 +137,7 @@ public function getBasename(): string
             $this->setPathInfo();
         }
 
-        return $this->basename;
+        return $this->basename ?? '';
     }
 
     /**
@@ -158,7 +168,7 @@ public function exists(): bool
      */
     public function getCreationTime(): int
     {
-        return is_file($this->filepath) ? filectime($this->filepath) : time();
+        return is_file($this->filepath) ? (int)filectime($this->filepath) : time();
     }
 
     /**
@@ -167,7 +177,7 @@ public function getCreationTime(): int
      */
     public function getModificationTime(): int
     {
-        return is_file($this->filepath) ? filemtime($this->filepath) : time();
+        return is_file($this->filepath) ? (int)filemtime($this->filepath) : time();
     }
 
     /**
@@ -178,20 +188,21 @@ public function lock(bool $block = true): bool
     {
         if (!$this->handle) {
             if (!$this->mkdir($this->getPath())) {
-                throw new \RuntimeException('Creating directory failed for ' . $this->filepath);
+                throw new RuntimeException('Creating directory failed for ' . $this->filepath);
             }
-            $this->handle = @fopen($this->filepath, 'cb+');
+            $this->handle = @fopen($this->filepath, 'cb+') ?: null;
             if (!$this->handle) {
                 $error = error_get_last();
+                $message = $error['message'] ?? 'Unknown error';
 
-                throw new \RuntimeException("Opening file for writing failed on error {$error['message']}");
+                throw new RuntimeException("Opening file for writing failed on error {$message}");
             }
         }
 
         $lock = $block ? LOCK_EX : LOCK_EX | LOCK_NB;
 
         // Some filesystems do not support file locks, only fail if another process holds the lock.
-        $this->locked = flock($this->handle, $lock, $wouldblock) || !$wouldblock;
+        $this->locked = flock($this->handle, $lock, $wouldBlock) || !$wouldBlock;
 
         return $this->locked;
     }
@@ -207,7 +218,7 @@ public function unlock(): bool
         }
 
         if ($this->locked) {
-            flock($this->handle, LOCK_UN);
+            flock($this->handle, LOCK_UN | LOCK_NB);
             $this->locked = false;
         }
 
@@ -267,7 +278,7 @@ public function save($data): void
         $dir = $this->getPath();
 
         if (!$this->mkdir($dir)) {
-            throw new \RuntimeException('Creating directory failed for ' . $filepath);
+            throw new RuntimeException('Creating directory failed for ' . $filepath);
         }
 
         try {
@@ -279,21 +290,27 @@ public function save($data): void
                     $tmp = false;
                 }
             } else {
+                // Support for symlinks.
+                $realpath = is_link($filepath) ? realpath($filepath) : $filepath;
+                if ($realpath === false) {
+                    throw new RuntimeException('Failed to save file ' . $filepath);
+                }
+
                 // Create file with a temporary name and rename it to make the save action atomic.
-                $tmp = $this->tempname($filepath);
+                $tmp = $this->tempname($realpath);
                 if (@file_put_contents($tmp, $data) === false) {
                     $tmp = false;
-                } elseif (@rename($tmp, $filepath) === false) {
+                } elseif (@rename($tmp, $realpath) === false) {
                     @unlink($tmp);
                     $tmp = false;
                 }
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $tmp = false;
         }
 
         if ($tmp === false) {
-            throw new \RuntimeException('Failed to save file ' . $filepath);
+            throw new RuntimeException('Failed to save file ' . $filepath);
         }
 
         // Touch the directory as well, thus marking it modified.
@@ -327,7 +344,7 @@ public function delete(): bool
     /**
      * @param  string  $dir
      * @return bool
-     * @throws \RuntimeException
+     * @throws RuntimeException
      * @internal
      */
     protected function mkdir(string $dir): bool
@@ -362,6 +379,7 @@ protected function doSerialize(): array
 
     /**
      * @param array $serialized
+     * @return void
      */
     protected function doUnserialize(array $serialized): void
     {
@@ -382,6 +400,7 @@ protected function setFilepath(string $filepath): void
 
     protected function setPathInfo(): void
     {
+        /** @var array $pathInfo */
         $pathInfo = $this->filesystem->pathinfo($this->filepath);
 
         $this->filename = $pathInfo['filename'] ?? null;
diff --git a/system/src/Grav/Framework/File/CsvFile.php b/system/src/Grav/Framework/File/CsvFile.php
index 53af766fea..7eba91e88d 100644
--- a/system/src/Grav/Framework/File/CsvFile.php
+++ b/system/src/Grav/Framework/File/CsvFile.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -28,4 +28,13 @@ public function __construct($filepath, CsvFormatter $formatter)
     {
         parent::__construct($filepath, $formatter);
     }
+
+    /**
+     * @return array
+     */
+    public function load(): array
+    {
+        /** @var array */
+        return parent::load();
+    }
 }
diff --git a/system/src/Grav/Framework/File/DataFile.php b/system/src/Grav/Framework/File/DataFile.php
index 4914871320..189db53de8 100644
--- a/system/src/Grav/Framework/File/DataFile.php
+++ b/system/src/Grav/Framework/File/DataFile.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,7 +13,12 @@
 
 use Grav\Framework\File\Interfaces\FileFormatterInterface;
 use RuntimeException;
+use function is_string;
 
+/**
+ * Class DataFile
+ * @package Grav\Framework\File
+ */
 class DataFile extends AbstractFile
 {
     /** @var FileFormatterInterface */
@@ -40,7 +45,11 @@ public function load()
         $raw = parent::load();
 
         try {
-            return $raw !== false ? $this->formatter->decode($raw) : false;
+            if (!is_string($raw)) {
+                throw new RuntimeException('Bad Data');
+            }
+
+            return $this->formatter->decode($raw);
         } catch (RuntimeException $e) {
             throw new RuntimeException(sprintf("Failed to load file '%s': %s", $this->getFilePath(), $e->getMessage()), $e->getCode(), $e);
         }
@@ -52,7 +61,7 @@ public function load()
      */
     public function save($data): void
     {
-        if (\is_string($data)) {
+        if (is_string($data)) {
             // Make sure that the string is valid data.
             try {
                 $this->formatter->decode($data);
diff --git a/system/src/Grav/Framework/File/File.php b/system/src/Grav/Framework/File/File.php
index c1a21731bf..b1a1c4f674 100644
--- a/system/src/Grav/Framework/File/File.php
+++ b/system/src/Grav/Framework/File/File.php
@@ -5,31 +5,29 @@
 /**
  * @package    Grav\Framework\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\File;
 
+use RuntimeException;
+use function is_string;
+
+/**
+ * Class File
+ * @package Grav\Framework\File
+ */
 class File extends AbstractFile
 {
-    /**
-     * {@inheritdoc}
-     * @see FileInterface::load()
-     */
-    public function load()
-    {
-        return parent::load();
-    }
-
     /**
      * {@inheritdoc}
      * @see FileInterface::save()
      */
     public function save($data): void
     {
-        if (!\is_string($data)) {
-            throw new \RuntimeException('Cannot save data, string required');
+        if (!is_string($data)) {
+            throw new RuntimeException('Cannot save data, string required');
         }
 
         parent::save($data);
diff --git a/system/src/Grav/Framework/File/Formatter/AbstractFormatter.php b/system/src/Grav/Framework/File/Formatter/AbstractFormatter.php
index 549ff6ff33..6a6981bc04 100644
--- a/system/src/Grav/Framework/File/Formatter/AbstractFormatter.php
+++ b/system/src/Grav/Framework/File/Formatter/AbstractFormatter.php
@@ -5,13 +5,15 @@
 /**
  * @package    Grav\Framework\File\Formatter
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\File\Formatter;
 
+use Grav\Framework\Compat\Serializable;
 use Grav\Framework\File\Interfaces\FileFormatterInterface;
+use function is_string;
 
 /**
  * Abstract file formatter.
@@ -20,6 +22,8 @@
  */
 abstract class AbstractFormatter implements FileFormatterInterface
 {
+    use Serializable;
+
     /** @var array */
     private $config;
 
@@ -35,17 +39,11 @@ public function __construct(array $config = [])
     /**
      * @return string
      */
-    public function serialize(): string
+    public function getMimeType(): string
     {
-        return serialize($this->doSerialize());
-    }
+        $mime = $this->getConfig('mime');
 
-    /**
-     * @param string $serialized
-     */
-    public function unserialize($serialized): void
-    {
-        $this->doUnserialize(unserialize($serialized, ['allowed_classes' => false]));
+        return is_string($mime) ? $mime : 'application/octet-stream';
     }
 
     /**
@@ -57,7 +55,7 @@ public function getDefaultFileExtension(): string
         $extensions = $this->getSupportedFileExtensions();
 
         // Call fails on bad configuration.
-        return reset($extensions);
+        return reset($extensions) ?: '';
     }
 
     /**
@@ -69,7 +67,7 @@ public function getSupportedFileExtensions(): array
         $extensions = $this->getConfig('file_extension');
 
         // Call fails on bad configuration.
-        return \is_string($extensions) ? [$extensions] : $extensions;
+        return is_string($extensions) ? [$extensions] : $extensions;
     }
 
     /**
@@ -84,36 +82,36 @@ abstract public function encode($data): string;
      */
     abstract public function decode($data);
 
+
     /**
-     * Get either full configuration or a single option.
-     *
-     * @param string|null $name Configuration option (optional)
-     * @return mixed
+     * @return array
      */
-    protected function getConfig(string $name = null)
+    public function __serialize(): array
     {
-        if (null !== $name) {
-            return $this->config[$name] ?? null;
-        }
-
-        return $this->config;
+        return ['config' => $this->config];
     }
 
     /**
-     * @return array
+     * @param array $data
+     * @return void
      */
-    protected function doSerialize(): array
+    public function __unserialize(array $data): void
     {
-        return ['config' => $this->config];
+        $this->config = $data['config'];
     }
 
     /**
-     * Note: if overridden, make sure you call parent::doUnserialize()
+     * Get either full configuration or a single option.
      *
-     * @param array $serialized
+     * @param string|null $name Configuration option (optional)
+     * @return mixed
      */
-    protected function doUnserialize(array $serialized): void
+    protected function getConfig(string $name = null)
     {
-        $this->config = $serialized['config'];
+        if (null !== $name) {
+            return $this->config[$name] ?? null;
+        }
+
+        return $this->config;
     }
 }
diff --git a/system/src/Grav/Framework/File/Formatter/CsvFormatter.php b/system/src/Grav/Framework/File/Formatter/CsvFormatter.php
index 8945df004d..37ab5bb257 100644
--- a/system/src/Grav/Framework/File/Formatter/CsvFormatter.php
+++ b/system/src/Grav/Framework/File/Formatter/CsvFormatter.php
@@ -5,14 +5,26 @@
 /**
  * @package    Grav\Framework\File\Formatter
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\File\Formatter;
 
+use Exception;
 use Grav\Framework\File\Interfaces\FileFormatterInterface;
+use JsonSerializable;
+use RuntimeException;
+use stdClass;
+use function count;
+use function is_array;
+use function is_object;
+use function is_scalar;
 
+/**
+ * Class CsvFormatter
+ * @package Grav\Framework\File\Formatter
+ */
 class CsvFormatter extends AbstractFormatter
 {
     /**
@@ -23,7 +35,8 @@ public function __construct(array $config = [])
     {
         $config += [
             'file_extension' => ['.csv', '.tsv'],
-            'delimiter' => ','
+            'delimiter' => ',',
+            'mime' => 'text/x-csv'
         ];
 
         parent::__construct($config);
@@ -41,7 +54,9 @@ public function getDelimiter(): string
     }
 
     /**
-     * {@inheritdoc}
+     * @param array $data
+     * @param string|null $delimiter
+     * @return string
      * @see FileFormatterInterface::encode()
      */
     public function encode($data, $delimiter = null): string
@@ -64,33 +79,75 @@ public function encode($data, $delimiter = null): string
     }
 
     /**
-     * {@inheritdoc}
+     * @param string $data
+     * @param string|null $delimiter
+     * @return array
      * @see FileFormatterInterface::decode()
      */
     public function decode($data, $delimiter = null): array
     {
         $delimiter = $delimiter ?? $this->getDelimiter();
         $lines = preg_split('/\r\n|\r|\n/', $data);
-
         if ($lines === false) {
-            throw new \RuntimeException('Decoding CSV failed');
+            throw new RuntimeException('Decoding CSV failed');
         }
 
         // Get the field names
-        $header = str_getcsv(array_shift($lines), $delimiter);
+        $headerStr = array_shift($lines);
+        if (!$headerStr) {
+            throw new RuntimeException('CSV header missing');
+        }
+
+        $header = str_getcsv($headerStr, $delimiter);
+
+        // Allow for replacing a null string with null/empty value
+        $null_replace = $this->getConfig('null');
 
         // Get the data
         $list = [];
-        foreach ($lines as $line) {
-            $list[] = array_combine($header, str_getcsv($line, $delimiter));
+        $line = null;
+        try {
+            foreach ($lines as $line) {
+                if (!empty($line)) {
+                    $csv_line = str_getcsv($line, $delimiter);
+
+                    if ($null_replace) {
+                        array_walk($csv_line, static function (&$el) use ($null_replace) {
+                            $el = str_replace($null_replace, "\0", $el);
+                        });
+                    }
+
+                    $list[] = array_combine($header, $csv_line);
+                }
+            }
+        } catch (Exception $e) {
+            throw new RuntimeException('Badly formatted CSV line: ' . $line);
         }
 
         return $list;
     }
 
-    protected function encodeLine(array $line, $delimiter = null): string
+    /**
+     * @param array $line
+     * @param string $delimiter
+     * @return string
+     */
+    protected function encodeLine(array $line, string $delimiter): string
     {
         foreach ($line as $key => &$value) {
+            // Oops, we need to convert the line to a string.
+            if (!is_scalar($value)) {
+                if (is_array($value) || $value instanceof JsonSerializable || $value instanceof stdClass) {
+                    $value = json_encode($value);
+                } elseif (is_object($value)) {
+                    if (method_exists($value, 'toJson')) {
+                        $value = $value->toJson();
+                    } elseif (method_exists($value, 'toArray')) {
+                        $value = json_encode($value->toArray());
+                    }
+                }
+            }
+
             $value = $this->escape((string)$value);
         }
         unset($value);
@@ -98,6 +155,10 @@ protected function encodeLine(array $line, $delimiter = null): string
         return implode($delimiter, $line). "\n";
     }
 
+    /**
+     * @param string $value
+     * @return string
+     */
     protected function escape(string $value)
     {
         if (preg_match('/[,"\r\n]/u', $value)) {
diff --git a/system/src/Grav/Framework/File/Formatter/FormatterInterface.php b/system/src/Grav/Framework/File/Formatter/FormatterInterface.php
index a8d5bc5b8c..757e229d9a 100644
--- a/system/src/Grav/Framework/File/Formatter/FormatterInterface.php
+++ b/system/src/Grav/Framework/File/Formatter/FormatterInterface.php
@@ -7,4 +7,6 @@
 /**
  * @deprecated 1.6 Use Grav\Framework\File\Interfaces\FileFormatterInterface instead
  */
-interface FormatterInterface extends FileFormatterInterface {};
+interface FormatterInterface extends FileFormatterInterface
+{
+}
diff --git a/system/src/Grav/Framework/File/Formatter/IniFormatter.php b/system/src/Grav/Framework/File/Formatter/IniFormatter.php
index 8d72c52f1c..ecf67d1f2c 100644
--- a/system/src/Grav/Framework/File/Formatter/IniFormatter.php
+++ b/system/src/Grav/Framework/File/Formatter/IniFormatter.php
@@ -5,14 +5,19 @@
 /**
  * @package    Grav\Framework\File\Formatter
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\File\Formatter;
 
 use Grav\Framework\File\Interfaces\FileFormatterInterface;
+use RuntimeException;
 
+/**
+ * Class IniFormatter
+ * @package Grav\Framework\File\Formatter
+ */
 class IniFormatter extends AbstractFormatter
 {
     /**
@@ -37,10 +42,10 @@ public function encode($data): string
         $string = '';
         foreach ($data as $key => $value) {
             $string .= $key . '="' .  preg_replace(
-                    ['/"/', '/\\\/', "/\t/", "/\n/", "/\r/"],
-                    ['\"',  '\\\\', '\t',   '\n',   '\r'],
-                    $value
-                ) . "\"\n";
+                ['/"/', '/\\\/', "/\t/", "/\n/", "/\r/"],
+                ['\"',  '\\\\', '\t',   '\n',   '\r'],
+                $value
+            ) . "\"\n";
         }
 
         return $string;
@@ -55,7 +60,7 @@ public function decode($data): array
         $decoded = @parse_ini_string($data);
 
         if ($decoded === false) {
-            throw new \RuntimeException('Decoding INI failed');
+            throw new RuntimeException('Decoding INI failed');
         }
 
         return $decoded;
diff --git a/system/src/Grav/Framework/File/Formatter/JsonFormatter.php b/system/src/Grav/Framework/File/Formatter/JsonFormatter.php
index 1ae16ae293..2bd6c79ad5 100644
--- a/system/src/Grav/Framework/File/Formatter/JsonFormatter.php
+++ b/system/src/Grav/Framework/File/Formatter/JsonFormatter.php
@@ -5,16 +5,51 @@
 /**
  * @package    Grav\Framework\File\Formatter
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\File\Formatter;
 
 use Grav\Framework\File\Interfaces\FileFormatterInterface;
+use RuntimeException;
+use function is_int;
+use function is_string;
 
+/**
+ * Class JsonFormatter
+ * @package Grav\Framework\File\Formatter
+ */
 class JsonFormatter extends AbstractFormatter
 {
+    /** @var array */
+    protected $encodeOptions = [
+        'JSON_FORCE_OBJECT' => JSON_FORCE_OBJECT,
+        'JSON_HEX_QUOT' => JSON_HEX_QUOT,
+        'JSON_HEX_TAG' => JSON_HEX_TAG,
+        'JSON_HEX_AMP' => JSON_HEX_AMP,
+        'JSON_HEX_APOS' => JSON_HEX_APOS,
+        'JSON_INVALID_UTF8_IGNORE' => JSON_INVALID_UTF8_IGNORE,
+        'JSON_INVALID_UTF8_SUBSTITUTE' => JSON_INVALID_UTF8_SUBSTITUTE,
+        'JSON_NUMERIC_CHECK' => JSON_NUMERIC_CHECK,
+        'JSON_PARTIAL_OUTPUT_ON_ERROR' => JSON_PARTIAL_OUTPUT_ON_ERROR,
+        'JSON_PRESERVE_ZERO_FRACTION' => JSON_PRESERVE_ZERO_FRACTION,
+        'JSON_PRETTY_PRINT' => JSON_PRETTY_PRINT,
+        'JSON_UNESCAPED_LINE_TERMINATORS' => JSON_UNESCAPED_LINE_TERMINATORS,
+        'JSON_UNESCAPED_SLASHES' => JSON_UNESCAPED_SLASHES,
+        'JSON_UNESCAPED_UNICODE' => JSON_UNESCAPED_UNICODE,
+        //'JSON_THROW_ON_ERROR' => JSON_THROW_ON_ERROR // PHP 7.3
+    ];
+
+    /** @var array */
+    protected $decodeOptions = [
+        'JSON_BIGINT_AS_STRING' => JSON_BIGINT_AS_STRING,
+        'JSON_INVALID_UTF8_IGNORE' => JSON_INVALID_UTF8_IGNORE,
+        'JSON_INVALID_UTF8_SUBSTITUTE' => JSON_INVALID_UTF8_SUBSTITUTE,
+        'JSON_OBJECT_AS_ARRAY' => JSON_OBJECT_AS_ARRAY,
+        //'JSON_THROW_ON_ERROR' => JSON_THROW_ON_ERROR // PHP 7.3
+    ];
+
     public function __construct(array $config = [])
     {
         $config += [
@@ -35,7 +70,24 @@ public function __construct(array $config = [])
      */
     public function getEncodeOptions(): int
     {
-        return $this->getConfig('encode_options');
+        $options = $this->getConfig('encode_options');
+        if (!is_int($options)) {
+            if (is_string($options)) {
+                $list = preg_split('/[\s,|]+/', $options);
+                $options = 0;
+                if ($list) {
+                    foreach ($list as $option) {
+                        if (isset($this->encodeOptions[$option])) {
+                            $options += $this->encodeOptions[$option];
+                        }
+                    }
+                }
+            } else {
+                $options = 0;
+            }
+        }
+
+        return $options;
     }
 
     /**
@@ -45,13 +97,31 @@ public function getEncodeOptions(): int
      */
     public function getDecodeOptions(): int
     {
-        return $this->getConfig('decode_options');
+        $options = $this->getConfig('decode_options');
+        if (!is_int($options)) {
+            if (is_string($options)) {
+                $list = preg_split('/[\s,|]+/', $options);
+                $options = 0;
+                if ($list) {
+                    foreach ($list as $option) {
+                        if (isset($this->decodeOptions[$option])) {
+                            $options += $this->decodeOptions[$option];
+                        }
+                    }
+                }
+            } else {
+                $options = 0;
+            }
+        }
+
+        return $options;
     }
 
     /**
      * Returns recursion depth used in decode() function.
      *
      * @return int
+     * @phpstan-return positive-int
      */
     public function getDecodeDepth(): int
     {
@@ -77,10 +147,10 @@ public function encode($data): string
         $encoded = @json_encode($data, $this->getEncodeOptions());
 
         if ($encoded === false && json_last_error() !== JSON_ERROR_NONE) {
-            throw new \RuntimeException('Encoding JSON failed: ' . json_last_error_msg());
+            throw new RuntimeException('Encoding JSON failed: ' . json_last_error_msg());
         }
 
-        return $encoded;
+        return $encoded ?: '';
     }
 
     /**
@@ -92,7 +162,7 @@ public function decode($data)
         $decoded = @json_decode($data, $this->getDecodeAssoc(), $this->getDecodeDepth(), $this->getDecodeOptions());
 
         if (null === $decoded && json_last_error() !== JSON_ERROR_NONE) {
-            throw new \RuntimeException('Decoding JSON failed: ' . json_last_error_msg());
+            throw new RuntimeException('Decoding JSON failed: ' . json_last_error_msg());
         }
 
         return $decoded;
diff --git a/system/src/Grav/Framework/File/Formatter/MarkdownFormatter.php b/system/src/Grav/Framework/File/Formatter/MarkdownFormatter.php
index a2f84e8008..e36276a81e 100644
--- a/system/src/Grav/Framework/File/Formatter/MarkdownFormatter.php
+++ b/system/src/Grav/Framework/File/Formatter/MarkdownFormatter.php
@@ -5,14 +5,19 @@
 /**
  * @package    Grav\Framework\File\Formatter
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\File\Formatter;
 
 use Grav\Framework\File\Interfaces\FileFormatterInterface;
+use RuntimeException;
 
+/**
+ * Class MarkdownFormatter
+ * @package Grav\Framework\File\Formatter
+ */
 class MarkdownFormatter extends AbstractFormatter
 {
     /** @var FileFormatterInterface */
@@ -30,7 +35,7 @@ public function __construct(array $config = [], FileFormatterInterface $headerFo
 
         parent::__construct($config);
 
-        $this->headerFormatter = $headerFormatter ?: new YamlFormatter($config['yaml']);
+        $this->headerFormatter = $headerFormatter ?? new YamlFormatter($config['yaml']);
     }
 
     /**
@@ -93,7 +98,10 @@ public function encode($data): string
         $encoded .= $body;
 
         // Normalize line endings to Unix style.
-        $encoded = preg_replace("/(\r\n|\r)/", "\n", $encoded);
+        $encoded = preg_replace("/(\r\n|\r)/u", "\n", $encoded);
+        if (null === $encoded) {
+            throw new RuntimeException('Encoding markdown failed');
+        }
 
         return $encoded;
     }
@@ -117,11 +125,14 @@ public function decode($data): array
         $headerRegex = "/^---\n(.+?)\n---\n{0,}(.*)$/uis";
 
         // Normalize line endings to Unix style.
-        $data = preg_replace("/(\r\n|\r)/", "\n", $data);
+        $data = preg_replace("/(\r\n|\r)/u", "\n", $data);
+        if (null === $data) {
+            throw new RuntimeException('Decoding markdown failed');
+        }
 
         // Parse header.
         preg_match($headerRegex, ltrim($data), $matches);
-        if(empty($matches)) {
+        if (empty($matches)) {
             $content[$bodyVar] = $data;
         } else {
             // Normalize frontmatter.
@@ -135,4 +146,16 @@ public function decode($data): array
 
         return $content;
     }
+
+    public function __serialize(): array
+    {
+        return parent::__serialize() + ['headerFormatter' => $this->headerFormatter];
+    }
+
+    public function __unserialize(array $data): void
+    {
+        parent::__unserialize($data);
+
+        $this->headerFormatter = $data['headerFormatter'] ?? new YamlFormatter(['inline' => 20]);
+    }
 }
diff --git a/system/src/Grav/Framework/File/Formatter/SerializeFormatter.php b/system/src/Grav/Framework/File/Formatter/SerializeFormatter.php
index 73ed8122f3..25aee813b0 100644
--- a/system/src/Grav/Framework/File/Formatter/SerializeFormatter.php
+++ b/system/src/Grav/Framework/File/Formatter/SerializeFormatter.php
@@ -5,14 +5,22 @@
 /**
  * @package    Grav\Framework\File\Formatter
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\File\Formatter;
 
 use Grav\Framework\File\Interfaces\FileFormatterInterface;
+use RuntimeException;
+use stdClass;
+use function is_array;
+use function is_string;
 
+/**
+ * Class SerializeFormatter
+ * @package Grav\Framework\File\Formatter
+ */
 class SerializeFormatter extends AbstractFormatter
 {
     /**
@@ -23,7 +31,7 @@ public function __construct(array $config = [])
     {
         $config += [
             'file_extension' => '.ser',
-            'decode_options' => ['allowed_classes' => [\stdClass::class]]
+            'decode_options' => ['allowed_classes' => [stdClass::class]]
         ];
 
         parent::__construct($config);
@@ -34,7 +42,7 @@ public function __construct(array $config = [])
      *
      * By default only allow stdClass class.
      *
-     * @return array|bool
+     * @return array
      */
     public function getOptions()
     {
@@ -56,10 +64,11 @@ public function encode($data): string
      */
     public function decode($data)
     {
-        $decoded = @unserialize($data, $this->getOptions());
+        $classes = $this->getOptions()['allowed_classes'] ?? false;
+        $decoded = @unserialize($data, ['allowed_classes' => $classes]);
 
         if ($decoded === false && $data !== serialize(false)) {
-            throw new \RuntimeException('Decoding serialized data failed');
+            throw new RuntimeException('Decoding serialized data failed');
         }
 
         return $this->preserveLines($decoded, ['\\n', '\\r'], ["\n", "\r"]);
@@ -75,9 +84,9 @@ public function decode($data)
      */
     protected function preserveLines($data, array $search, array $replace)
     {
-        if (\is_string($data)) {
+        if (is_string($data)) {
             $data = str_replace($search, $replace, $data);
-        } elseif (\is_array($data)) {
+        } elseif (is_array($data)) {
             foreach ($data as &$value) {
                 $value = $this->preserveLines($value, $search, $replace);
             }
@@ -86,4 +95,4 @@ protected function preserveLines($data, array $search, array $replace)
 
         return $data;
     }
-}
\ No newline at end of file
+}
diff --git a/system/src/Grav/Framework/File/Formatter/YamlFormatter.php b/system/src/Grav/Framework/File/Formatter/YamlFormatter.php
index 189626d28a..31aff2c674 100644
--- a/system/src/Grav/Framework/File/Formatter/YamlFormatter.php
+++ b/system/src/Grav/Framework/File/Formatter/YamlFormatter.php
@@ -5,20 +5,30 @@
 /**
  * @package    Grav\Framework\File\Formatter
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\File\Formatter;
 
 use Grav\Framework\File\Interfaces\FileFormatterInterface;
+use RuntimeException;
 use Symfony\Component\Yaml\Exception\DumpException;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Yaml as YamlParser;
 use RocketTheme\Toolbox\Compat\Yaml\Yaml as FallbackYamlParser;
+use function function_exists;
 
+/**
+ * Class YamlFormatter
+ * @package Grav\Framework\File\Formatter
+ */
 class YamlFormatter extends AbstractFormatter
 {
+    /**
+     * YamlFormatter constructor.
+     * @param array $config
+     */
     public function __construct(array $config = [])
     {
         $config += [
@@ -65,7 +75,10 @@ public function useCompatibleDecoder(): bool
     }
 
     /**
-     * {@inheritdoc}
+     * @param array $data
+     * @param int|null $inline
+     * @param int|null $indent
+     * @return string
      * @see FileFormatterInterface::encode()
      */
     public function encode($data, $inline = null, $indent = null): string
@@ -78,7 +91,7 @@ public function encode($data, $inline = null, $indent = null): string
                 YamlParser::DUMP_EXCEPTION_ON_INVALID_TYPE
             );
         } catch (DumpException $e) {
-            throw new \RuntimeException('Encoding YAML failed: ' . $e->getMessage(), 0, $e);
+            throw new RuntimeException('Encoding YAML failed: ' . $e->getMessage(), 0, $e);
         }
     }
 
@@ -89,12 +102,14 @@ public function encode($data, $inline = null, $indent = null): string
     public function decode($data): array
     {
         // Try native PECL YAML PHP extension first if available.
-        if (\function_exists('yaml_parse') && $this->useNativeDecoder()) {
+        if (function_exists('yaml_parse') && $this->useNativeDecoder()) {
             // Safely decode YAML.
             $saved = @ini_get('yaml.decode_php');
             @ini_set('yaml.decode_php', '0');
             $decoded = @yaml_parse($data);
-            @ini_set('yaml.decode_php', $saved);
+            if ($saved !== false) {
+                @ini_set('yaml.decode_php', $saved);
+            }
 
             if ($decoded !== false) {
                 return (array) $decoded;
@@ -108,7 +123,7 @@ public function decode($data): array
                 return (array) FallbackYamlParser::parse($data);
             }
 
-            throw new \RuntimeException('Decoding YAML failed: ' . $e->getMessage(), 0, $e);
+            throw new RuntimeException('Decoding YAML failed: ' . $e->getMessage(), 0, $e);
         }
     }
 }
diff --git a/system/src/Grav/Framework/File/IniFile.php b/system/src/Grav/Framework/File/IniFile.php
index cc861f94bb..0807ee3c2c 100644
--- a/system/src/Grav/Framework/File/IniFile.php
+++ b/system/src/Grav/Framework/File/IniFile.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -28,4 +28,13 @@ public function __construct($filepath, IniFormatter $formatter)
     {
         parent::__construct($filepath, $formatter);
     }
+
+    /**
+     * @return array
+     */
+    public function load(): array
+    {
+        /** @var array */
+        return parent::load();
+    }
 }
diff --git a/system/src/Grav/Framework/File/Interfaces/FileFormatterInterface.php b/system/src/Grav/Framework/File/Interfaces/FileFormatterInterface.php
index f7b36e20c6..78714af7ef 100644
--- a/system/src/Grav/Framework/File/Interfaces/FileFormatterInterface.php
+++ b/system/src/Grav/Framework/File/Interfaces/FileFormatterInterface.php
@@ -5,12 +5,14 @@
 /**
  * @package    Grav\Framework\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\File\Interfaces;
 
+use Serializable;
+
 /**
  * Defines common interface for all file formatters.
  *
@@ -24,8 +26,14 @@
  *
  * @since 1.6
  */
-interface FileFormatterInterface extends \Serializable
+interface FileFormatterInterface extends Serializable
 {
+    /**
+     * @return string
+     * @since 1.7
+     */
+    public function getMimeType(): string;
+
     /**
      * Get default file extension from current formatter (with dot).
      *
@@ -48,7 +56,6 @@ public function getSupportedFileExtensions(): array;
      * Encode data into a string.
      *
      * @param mixed $data Data to be encoded.
-     *
      * @return string Returns encoded data as a string.
      * @api
      */
@@ -58,7 +65,6 @@ public function encode($data): string;
      * Decode a string into data.
      *
      * @param string $data String to be decoded.
-     *
      * @return mixed Returns decoded data.
      * @api
      */
diff --git a/system/src/Grav/Framework/File/Interfaces/FileInterface.php b/system/src/Grav/Framework/File/Interfaces/FileInterface.php
index c562710bbb..f2cc288a94 100644
--- a/system/src/Grav/Framework/File/Interfaces/FileInterface.php
+++ b/system/src/Grav/Framework/File/Interfaces/FileInterface.php
@@ -5,12 +5,15 @@
 /**
  * @package    Grav\Framework\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\File\Interfaces;
 
+use RuntimeException;
+use Serializable;
+
 /**
  * Defines common interface for all file readers.
  *
@@ -24,7 +27,7 @@
  *
  * @since 1.6
  */
-interface FileInterface extends \Serializable
+interface FileInterface extends Serializable
 {
     /**
      * Get both path and filename of the file.
@@ -98,7 +101,7 @@ public function getModificationTime(): int;
      * @param bool $block For non-blocking lock, set the parameter to `false`.
      *
      * @return bool Returns `true` if the file was successfully locked, `false` otherwise.
-     * @throws \RuntimeException
+     * @throws RuntimeException
      * @api
      */
     public function lock(bool $block = true): bool;
@@ -150,7 +153,7 @@ public function load();
      *
      * @param  mixed $data Data to be saved.
      *
-     * @throws \RuntimeException
+     * @throws RuntimeException
      * @api
      */
     public function save($data): void;
diff --git a/system/src/Grav/Framework/File/JsonFile.php b/system/src/Grav/Framework/File/JsonFile.php
index f8743ff026..7751e84d60 100644
--- a/system/src/Grav/Framework/File/JsonFile.php
+++ b/system/src/Grav/Framework/File/JsonFile.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
diff --git a/system/src/Grav/Framework/File/MarkdownFile.php b/system/src/Grav/Framework/File/MarkdownFile.php
index 7ee7142e1e..a79d5ce77d 100644
--- a/system/src/Grav/Framework/File/MarkdownFile.php
+++ b/system/src/Grav/Framework/File/MarkdownFile.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -28,4 +28,13 @@ public function __construct($filepath, MarkdownFormatter $formatter)
     {
         parent::__construct($filepath, $formatter);
     }
+
+    /**
+     * @return array
+     */
+    public function load(): array
+    {
+        /** @var array */
+        return parent::load();
+    }
 }
diff --git a/system/src/Grav/Framework/File/YamlFile.php b/system/src/Grav/Framework/File/YamlFile.php
index 359161daa5..c4300ade59 100644
--- a/system/src/Grav/Framework/File/YamlFile.php
+++ b/system/src/Grav/Framework/File/YamlFile.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\File
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -28,4 +28,13 @@ public function __construct($filepath, YamlFormatter $formatter)
     {
         parent::__construct($filepath, $formatter);
     }
+
+    /**
+     * @return array
+     */
+    public function load(): array
+    {
+        /** @var array */
+        return parent::load();
+    }
 }
diff --git a/system/src/Grav/Framework/Filesystem/Filesystem.php b/system/src/Grav/Framework/Filesystem/Filesystem.php
index 473a2eca58..ddbbab04dd 100644
--- a/system/src/Grav/Framework/Filesystem/Filesystem.php
+++ b/system/src/Grav/Framework/Filesystem/Filesystem.php
@@ -5,31 +5,39 @@
 /**
  * @package    Grav\Framework\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Filesystem;
 
 use Grav\Framework\Filesystem\Interfaces\FilesystemInterface;
+use RuntimeException;
+use function count;
+use function dirname;
+use function is_array;
+use function pathinfo;
 
+/**
+ * Class Filesystem
+ * @package Grav\Framework\Filesystem
+ */
 class Filesystem implements FilesystemInterface
 {
     /** @var bool|null */
     private $normalize;
 
-    /** @var static */
-    static protected $default;
+    /** @var static|null */
+    protected static $default;
 
-    /** @var static */
-    static protected $unsafe;
+    /** @var static|null */
+    protected static $unsafe;
 
-    /** @var static */
-    static protected $safe;
+    /** @var static|null */
+    protected static $safe;
 
     /**
      * @param bool|null $normalize See $this->setNormalization()
-     *
      * @return Filesystem
      */
     public static function getInstance(bool $normalize = null): Filesystem
@@ -53,6 +61,7 @@ public static function getInstance(bool $normalize = null): Filesystem
      * Always use Filesystem::getInstance() instead.
      *
      * @param bool|null $normalize
+     * @internal
      */
     protected function __construct(bool $normalize = null)
     {
@@ -67,7 +76,6 @@ protected function __construct(bool $normalize = null)
      * not normalized.
      *
      * @param bool|null $normalize
-     *
      * @return Filesystem
      */
     public function setNormalization(bool $normalize = null): self
@@ -75,10 +83,18 @@ public function setNormalization(bool $normalize = null): self
         return static::getInstance($normalize);
     }
 
+    /**
+     * @return bool|null
+     */
+    public function getNormalization(): ?bool
+    {
+        return $this->normalize;
+    }
+
     /**
      * Force all paths to be normalized.
      *
-     * @return static
+     * @return self
      */
     public function unsafe(): self
     {
@@ -88,7 +104,7 @@ public function unsafe(): self
     /**
      * Force all paths not to be normalized (speeds up the calls if given paths are known to be normalized).
      *
-     * @return static
+     * @return self
      */
     public function safe(): self
     {
@@ -129,6 +145,18 @@ public function normalize(string $path): string
         return $this->toString($scheme, $path);
     }
 
+    /**
+     * {@inheritdoc}
+     * @see FilesystemInterface::basename()
+     */
+    public function basename(string $path, ?string $suffix = null): string
+    {
+        // Escape path.
+        $path = str_replace(['%2F', '%5C'], '/', rawurlencode($path));
+
+        return rawurldecode($suffix ? basename($path, $suffix) : basename($path));
+    }
+
     /**
      * {@inheritdoc}
      * @see FilesystemInterface::dirname()
@@ -146,11 +174,26 @@ public function dirname(string $path, int $levels = 1): string
         return $this->toString($scheme, $path);
     }
 
+    /**
+     * Gets full path with trailing slash.
+     *
+     * @param string $path
+     * @param int $levels
+     * @return string
+     * @phpstan-param positive-int $levels
+     */
+    public function pathname(string $path, int $levels = 1): string
+    {
+        $path = $this->dirname($path, $levels);
+
+        return $path !== '.' ? $path . '/' : '';
+    }
+
     /**
      * {@inheritdoc}
      * @see FilesystemInterface::pathinfo()
      */
-    public function pathinfo(string $path, int $options = null)
+    public function pathinfo(string $path, ?int $options = null)
     {
         [$scheme, $path] = $this->getSchemeAndHierarchy($path);
 
@@ -165,17 +208,22 @@ public function pathinfo(string $path, int $options = null)
      * @param string|null $scheme
      * @param string $path
      * @param int $levels
-     *
      * @return array
+     * @phpstan-param positive-int $levels
      */
     protected function dirnameInternal(?string $scheme, string $path, int $levels = 1): array
     {
-        $path = \dirname($path, $levels);
+        $path = dirname($path, $levels);
 
         if (null !== $scheme && $path === '.') {
             return [$scheme, ''];
         }
 
+        // In Windows dirname() may return backslashes, fix that.
+        if (DIRECTORY_SEPARATOR !== '/') {
+            $path = str_replace('\\', '/', $path);
+        }
+
         return [$scheme, $path];
     }
 
@@ -183,18 +231,36 @@ protected function dirnameInternal(?string $scheme, string $path, int $levels =
      * @param string|null $scheme
      * @param string $path
      * @param int|null $options
-     *
-     * @return array
+     * @return array|string
      */
-    protected function pathinfoInternal(?string $scheme, string $path, int $options = null)
+    protected function pathinfoInternal(?string $scheme, string $path, ?int $options = null)
     {
-        $info = $options ? \pathinfo($path, $options) : \pathinfo($path);
+        $path = str_replace(['%2F', '%5C'], ['/', '\\'], rawurlencode($path));
+
+        if (null === $options) {
+            $info = pathinfo($path);
+        } else {
+            $info = pathinfo($path, $options);
+        }
+
+        if (!is_array($info)) {
+            return rawurldecode($info);
+        }
+
+        $info = array_map('rawurldecode', $info);
 
         if (null !== $scheme) {
             $info['scheme'] = $scheme;
-            $dirname = isset($info['dirname']) && $info['dirname'] !== '.' ? $info['dirname'] : null;
 
-            if (null !== $dirname) {
+            /** @phpstan-ignore-next-line because pathinfo('') doesn't have dirname */
+            $dirname = $info['dirname'] ?? '.';
+
+            if ('' !== $dirname && '.' !== $dirname) {
+                // In Windows dirname may be using backslashes, fix that.
+                if (DIRECTORY_SEPARATOR !== '/') {
+                    $dirname = str_replace(DIRECTORY_SEPARATOR, '/', $dirname);
+                }
+
                 $info['dirname'] = $scheme . '://' . $dirname;
             } else {
                 $info = ['dirname' => $scheme . '://'] + $info;
@@ -208,20 +274,18 @@ protected function pathinfoInternal(?string $scheme, string $path, int $options
      * Gets a 2-tuple of scheme (may be null) and hierarchical part of a filename (e.g. file:///tmp -> array(file, tmp)).
      *
      * @param string $filename
-     *
      * @return array
      */
     protected function getSchemeAndHierarchy(string $filename): array
     {
         $components = explode('://', $filename, 2);
 
-        return 2 === \count($components) ? $components : [null, $components[0]];
+        return 2 === count($components) ? $components : [null, $components[0]];
     }
 
     /**
      * @param string|null $scheme
      * @param string $path
-     *
      * @return string
      */
     protected function toString(?string $scheme, string $path): string
@@ -235,9 +299,8 @@ protected function toString(?string $scheme, string $path): string
 
     /**
      * @param string $path
-     *
      * @return string
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     protected function normalizePathPart(string $path): string
     {
@@ -277,14 +340,14 @@ protected function normalizePathPart(string $path): string
 
             // Resolve /../ by removing path part.
             if ($part === '..') {
-                $test = array_shift($list);
+                $test = array_pop($list);
                 if ($test === null) {
                     // Oops, user tried to access something outside of our root folder.
-                    throw new \RuntimeException("Bad path {$path}");
+                    throw new RuntimeException("Bad path {$path}");
                 }
+            } else {
+                $list[] = $part;
             }
-
-            $list[] = $part;
         }
 
         // Build path back together.
diff --git a/system/src/Grav/Framework/Filesystem/Interfaces/FilesystemInterface.php b/system/src/Grav/Framework/Filesystem/Interfaces/FilesystemInterface.php
index 7082ebfc89..4006c8f779 100644
--- a/system/src/Grav/Framework/Filesystem/Interfaces/FilesystemInterface.php
+++ b/system/src/Grav/Framework/Filesystem/Interfaces/FilesystemInterface.php
@@ -5,13 +5,14 @@
 /**
  * @package    Grav\Framework\Filesystem
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Filesystem\Interfaces;
 
 use Grav\Framework\Filesystem\Filesystem;
+use RuntimeException;
 
 /**
  * Defines several stream-save filesystem actions.
@@ -28,9 +29,9 @@ interface FilesystemInterface
      *
      * @param string    $path       A filename or path, does not need to exist as a file.
      * @param int       $levels     The number of parent directories to go up (>= 1).
-     *
      * @return string               Returns parent path.
-     * @throws \RuntimeException
+     * @throws RuntimeException
+     * @phpstan-param positive-int $levels
      * @api
      */
     public function parent(string $path, int $levels = 1): string;
@@ -39,37 +40,45 @@ public function parent(string $path, int $levels = 1): string;
      * Normalize path by cleaning up `\`, `/./`, `//` and `/../`.
      *
      * @param string    $path       A filename or path, does not need to exist as a file.
-     *
      * @return string               Returns normalized path.
-     * @throws \RuntimeException
+     * @throws RuntimeException
      * @api
      */
     public function normalize(string $path): string;
 
     /**
-     * Stream-safe `\dirname()` replacement.
+     * Unicode-safe and stream-safe `\basename()` replacement.
+     *
+     * @param string      $path     A filename or path, does not need to exist as a file.
+     * @param string|null $suffix   If the filename ends in suffix this will also be cut off.
+     * @return string
+     * @api
+     */
+    public function basename(string $path, ?string $suffix = null): string;
+
+    /**
+     * Unicode-safe and stream-safe `\dirname()` replacement.
      *
      * @see   http://php.net/manual/en/function.dirname.php
      *
      * @param string    $path       A filename or path, does not need to exist as a file.
      * @param int       $levels     The number of parent directories to go up (>= 1).
-     *
      * @return string               Returns path to the directory.
-     * @throws \RuntimeException
+     * @throws RuntimeException
+     * @phpstan-param positive-int $levels
      * @api
      */
     public function dirname(string $path, int $levels = 1): string;
 
     /**
-     * Stream-safe `\pathinfo()` replacement.
+     * Unicode-safe and stream-safe `\pathinfo()` replacement.
      *
      * @see   http://php.net/manual/en/function.pathinfo.php
      *
      * @param string    $path       A filename or path, does not need to exist as a file.
-     * @param int       $options    A PATHINFO_* constant.
-     *
+     * @param int|null  $options    A PATHINFO_* constant.
      * @return array|string
      * @api
      */
-    public function pathinfo(string $path, int $options = null);
+    public function pathinfo(string $path, ?int $options = null);
 }
diff --git a/system/src/Grav/Framework/Flex/Flex.php b/system/src/Grav/Framework/Flex/Flex.php
index e87e903e3a..4d662d1929 100644
--- a/system/src/Grav/Framework/Flex/Flex.php
+++ b/system/src/Grav/Framework/Flex/Flex.php
@@ -5,25 +5,30 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Flex;
 
+use Grav\Common\Debugger;
+use Grav\Common\Grav;
 use Grav\Framework\Flex\Interfaces\FlexCollectionInterface;
+use Grav\Framework\Flex\Interfaces\FlexInterface;
 use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
 use Grav\Framework\Object\ObjectCollection;
+use RuntimeException;
+use function count;
+use function is_array;
 
 /**
  * Class Flex
  * @package Grav\Framework\Flex
  */
-class Flex implements \Countable
+class Flex implements FlexInterface
 {
     /** @var array */
     protected $config;
-
     /** @var FlexDirectory[] */
     protected $types;
 
@@ -38,6 +43,13 @@ public function __construct(array $types, array $config)
         $this->types = [];
 
         foreach ($types as $type => $blueprint) {
+            if (!file_exists($blueprint)) {
+                /** @var Debugger $debugger */
+                $debugger = Grav::instance()['debugger'];
+                $debugger->addMessage(sprintf('Flex: blueprint for flex type %s is missing', $type), 'error');
+
+                continue;
+            }
             $this->addDirectoryType($type, $blueprint);
         }
     }
@@ -50,7 +62,7 @@ public function __construct(array $types, array $config)
      */
     public function addDirectoryType(string $type, string $blueprint, array $config = [])
     {
-        $config = array_merge_recursive(['enabled' => true], $this->config['object'] ?? [], $config);
+        $config = array_replace_recursive(['enabled' => true], $this->config, $config);
 
         $this->types[$type] = new FlexDirectory($type, $blueprint, $config);
 
@@ -78,9 +90,9 @@ public function hasDirectory(string $type): bool
     }
 
     /**
-     * @param array|string[] $types
+     * @param array|string[]|null $types
      * @param bool $keepMissing
-     * @return array|FlexDirectory[]
+     * @return array<FlexDirectory|null>
      */
     public function getDirectories(array $types = null, bool $keepMissing = false): array
     {
@@ -111,6 +123,7 @@ public function getDirectory(string $type): ?FlexDirectory
      * @param array|null $keys
      * @param string|null $keyField
      * @return FlexCollectionInterface|null
+     * @phpstan-return FlexCollectionInterface<FlexObjectInterface>|null
      */
     public function getCollection(string $type, array $keys = null, string $keyField = null): ?FlexCollectionInterface
     {
@@ -124,13 +137,14 @@ public function getCollection(string $type, array $keys = null, string $keyField
      * @param array $options            In addition to the options in getObjects(), following options can be passed:
      *                                  collection_class:   Class to be used to create the collection. Defaults to ObjectCollection.
      * @return FlexCollectionInterface
-     * @throws \RuntimeException
+     * @throws RuntimeException
+     * @phpstan-return FlexCollectionInterface<FlexObjectInterface>
      */
     public function getMixedCollection(array $keys, array $options = []): FlexCollectionInterface
     {
         $collectionClass = $options['collection_class'] ?? ObjectCollection::class;
-        if (!class_exists($collectionClass)) {
-            throw new \RuntimeException(sprintf('Cannot create collection: Class %s does not exist', $collectionClass));
+        if (!is_a($collectionClass, FlexCollectionInterface::class, true)) {
+            throw new RuntimeException(sprintf('Cannot create collection: Class %s does not exist', $collectionClass));
         }
 
         $objects = $this->getObjects($keys, $options);
@@ -225,7 +239,7 @@ public function getObjects(array $keys, array $options = []): array
             $results = [];
             foreach ($keys as $key) {
                 $flexKey = $guessed[$key] ?? $key;
-                if (\is_array($flexKey)) {
+                if (is_array($flexKey)) {
                     $result = null;
                     foreach ($flexKey as $tryKey) {
                         if ($result = $list[$tryKey] ?? null) {
@@ -244,7 +258,7 @@ public function getObjects(array $keys, array $options = []): array
         }
 
         // Remove missing objects if not asked to keep them.
-        if (empty($option['keep_missing'])) {
+        if (empty($options['keep_missing'])) {
             $list = array_filter($list);
         }
 
@@ -262,7 +276,7 @@ public function getObject(string $key, string $type = null, string $keyField = n
         if (null === $type && null === $keyField) {
             // Special handling for quick Flex key lookups.
             $keyField = 'storage_key';
-            [$type, $key] = $this->resolveKeyAndType($key, $type);
+            [$key, $type] = $this->resolveKeyAndType($key, $type);
         } else {
             $type = $this->resolveType($type);
         }
@@ -281,14 +295,19 @@ public function getObject(string $key, string $type = null, string $keyField = n
      */
     public function count(): int
     {
-        return \count($this->types);
+        return count($this->types);
     }
 
+    /**
+     * @param string $flexKey
+     * @param string|null $type
+     * @return array
+     */
     protected function resolveKeyAndType(string $flexKey, string $type = null): array
     {
         $guess = false;
         if (strpos($flexKey, ':') !== false) {
-            [$type, $key] = explode(':',  $flexKey, 2);
+            [$type, $key] = explode(':', $flexKey, 2);
 
             $type = $this->resolveType($type);
         } else {
@@ -300,10 +319,14 @@ protected function resolveKeyAndType(string $flexKey, string $type = null): arra
         return [$key, $type, $guess];
     }
 
+    /**
+     * @param string|null $type
+     * @return string
+     */
     protected function resolveType(string $type = null): string
     {
         if (null !== $type && strpos($type, '.') !== false) {
-            return preg_replace('|\.obj$|', '', $type);
+            return preg_replace('|\.obj$|', '', $type) ?? $type;
         }
 
         return $type ?? '';
diff --git a/system/src/Grav/Framework/Flex/FlexCollection.php b/system/src/Grav/Framework/Flex/FlexCollection.php
index 5e5431bbfd..9c5b16c316 100644
--- a/system/src/Grav/Framework/Flex/FlexCollection.php
+++ b/system/src/Grav/Framework/Flex/FlexCollection.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,10 +13,11 @@
 use Doctrine\Common\Collections\Criteria;
 use Grav\Common\Debugger;
 use Grav\Common\Grav;
+use Grav\Common\Inflector;
 use Grav\Common\Twig\Twig;
 use Grav\Common\User\Interfaces\UserInterface;
+use Grav\Common\Utils;
 use Grav\Framework\Cache\CacheInterface;
-use Grav\Framework\ContentBlock\ContentBlockInterface;
 use Grav\Framework\ContentBlock\HtmlBlock;
 use Grav\Framework\Flex\Interfaces\FlexIndexInterface;
 use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
@@ -26,11 +27,20 @@
 use RocketTheme\Toolbox\Event\Event;
 use Twig\Error\LoaderError;
 use Twig\Error\SyntaxError;
+use Twig\Template;
 use Twig\TemplateWrapper;
+use function array_filter;
+use function get_class;
+use function in_array;
+use function is_array;
+use function is_scalar;
 
 /**
  * Class FlexCollection
  * @package Grav\Framework\Flex
+ * @template T of FlexObjectInterface
+ * @extends ObjectCollection<string,T>
+ * @implements FlexCollectionInterface<T>
  */
 class FlexCollection extends ObjectCollection implements FlexCollectionInterface
 {
@@ -38,7 +48,7 @@ class FlexCollection extends ObjectCollection implements FlexCollectionInterface
     private $_flexDirectory;
 
     /** @var string */
-    private $_keyField;
+    private $_keyField = 'storage_key';
 
     /**
      * Get list of cached methods.
@@ -51,8 +61,10 @@ public static function getCachedMethods(): array
             'getTypePrefix' => true,
             'getType' => true,
             'getFlexDirectory' => true,
+            'hasFlexFeature' => true,
+            'getFlexFeatures' => true,
             'getCacheKey' => true,
-            'getCacheChecksum' => true,
+            'getCacheChecksum' => false,
             'getTimestamp' => true,
             'hasProperty' => true,
             'getProperty' => true,
@@ -64,6 +76,7 @@ public static function getCachedMethods(): array
             'isAuthorized' => 'session',
             'search' => true,
             'sort' => true,
+            'getDistinctValues' => true
         ];
     }
 
@@ -85,6 +98,11 @@ public static function createFromArray(array $entries, FlexDirectory $directory,
      */
     public function __construct(array $entries = [], FlexDirectory $directory = null)
     {
+        // @phpstan-ignore-next-line
+        if (get_class($this) === __CLASS__) {
+            user_error('Using ' . __CLASS__ . ' directly is deprecated since Grav 1.7, use \Grav\Common\Flex\Types\Generic\GenericCollection or your own class instead', E_USER_DEPRECATED);
+        }
+
         parent::__construct($entries);
 
         if ($directory) {
@@ -92,22 +110,59 @@ public function __construct(array $entries = [], FlexDirectory $directory = null
         }
     }
 
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function hasFlexFeature(string $name): bool
+    {
+        return in_array($name, $this->getFlexFeatures(), true);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function getFlexFeatures(): array
+    {
+        /** @var array $implements */
+        $implements = class_implements($this);
+
+        $list = [];
+        foreach ($implements as $interface) {
+            if ($pos = strrpos($interface, '\\')) {
+                $interface = substr($interface, $pos+1);
+            }
+
+            $list[] = Inflector::hyphenize(str_replace('Interface', '', $interface));
+        }
+
+        return $list;
+
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexCollectionInterface::search()
      */
     public function search(string $search, $properties = null, array $options = null)
     {
+        $directory = $this->getFlexDirectory();
+        $properties = $directory->getSearchProperties($properties);
+        $options = $directory->getSearchOptions($options);
+
         $matching = $this->call('search', [$search, $properties, $options]);
         $matching = array_filter($matching);
 
         if ($matching) {
-            uksort($matching, function ($a, $b) {
-                return -($a <=> $b);
-            });
+            arsort($matching, SORT_NUMERIC);
         }
 
-        return $this->select(array_keys($matching));
+        /** @var string[] $array */
+        $array = array_keys($matching);
+
+        /** @phpstan-var static<T> */
+        return $this->select($array);
     }
 
     /**
@@ -118,7 +173,7 @@ public function sort(array $order)
     {
         $criteria = Criteria::create()->orderBy($order);
 
-        /** @var FlexCollectionInterface $matching */
+        /** @phpstan-var FlexCollectionInterface<T> $matching */
         $matching = $this->matching($criteria);
 
         return $matching;
@@ -126,7 +181,8 @@ public function sort(array $order)
 
     /**
      * @param array $filters
-     * @return FlexCollectionInterface|Collection
+     * @return static
+     * @phpstan-return static<T>
      */
     public function filterBy(array $filters)
     {
@@ -137,6 +193,7 @@ public function filterBy(array $filters)
             $criteria->andWhere($expr->eq($key, $value));
         }
 
+        /** @phpstan-var static<T> */
         return $this->matching($criteria);
     }
 
@@ -175,7 +232,7 @@ public function getTimestamp(): int
      */
     public function getCacheKey(): string
     {
-        return $this->getTypePrefix() . $this->getFlexType() . '.' . sha1(json_encode($this->call('getKey')));
+        return $this->getTypePrefix() . $this->getFlexType() . '.' . sha1((string)json_encode($this->call('getKey')));
     }
 
     /**
@@ -184,7 +241,16 @@ public function getCacheKey(): string
      */
     public function getCacheChecksum(): string
     {
-        return sha1(json_encode($this->getTimestamps()));
+        $list = [];
+        /**
+         * @var string $key
+         * @var FlexObjectInterface $object
+         */
+        foreach ($this as $key => $object) {
+            $list[$key] = $object->getCacheChecksum();
+        }
+
+        return sha1((string)json_encode($list));
     }
 
     /**
@@ -223,6 +289,33 @@ public function getFlexKeys(): array
         return $keys;
     }
 
+    /**
+     * Get all the values in property.
+     *
+     * Supports either single scalar values or array of scalar values.
+     *
+     * @param string $property      Object property to be used to make groups.
+     * @param string|null $separator     Separator, defaults to '.'
+     * @return array
+     */
+    public function getDistinctValues(string $property, string $separator = null): array
+    {
+        $list = [];
+
+        /** @var FlexObjectInterface $element */
+        foreach ($this->getIterator() as $element) {
+            $value = (array)$element->getNestedProperty($property, null, $separator);
+            foreach ($value as $v) {
+                if (is_scalar($v)) {
+                    $t = gettype($v) . (string)$v;
+                    $list[$t] = $v;
+                }
+            }
+        }
+
+        return array_values($list);
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexCollectionInterface::withKeyField()
@@ -255,18 +348,31 @@ public function withKeyField(string $keyField = null)
      */
     public function getIndex()
     {
+        /** @phpstan-var FlexIndexInterface<T> */
         return $this->getFlexDirectory()->getIndex($this->getKeys(), $this->getKeyField());
     }
 
+    /**
+     * @inheritdoc}
+     * @see FlexCollectionInterface::getCollection()
+     * @return $this
+     */
+    public function getCollection()
+    {
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexCollectionInterface::render()
      */
     public function render(string $layout = null, array $context = [])
     {
-        if (null === $layout) {
-            $layout = 'default';
+        if (!$layout) {
+            $config = $this->getTemplateConfig();
+            $layout = $config['collection']['defaults']['layout'] ?? 'default';
         }
+
         $type = $this->getFlexType();
 
         $grav = Grav::instance();
@@ -275,20 +381,23 @@ public function render(string $layout = null, array $context = [])
         $debugger = $grav['debugger'];
         $debugger->startTimer('flex-collection-' . ($debugKey =  uniqid($type, false)), 'Render Collection ' . $type . ' (' . $layout . ')');
 
-        $cache = $key = null;
+        $key = null;
         foreach ($context as $value) {
-            if (!\is_scalar($value)) {
+            if (!is_scalar($value)) {
                 $key = false;
+                break;
             }
         }
 
         if ($key !== false) {
             $key = md5($this->getCacheKey() . '.' . $layout . json_encode($context));
             $cache = $this->getCache('render');
+        } else {
+            $cache = null;
         }
 
         try {
-            $data = $cache ? $cache->get($key) : null;
+            $data = $cache && $key ? $cache->get($key) : null;
 
             $block = $data ? HtmlBlock::fromArray($data) : null;
         } catch (InvalidArgumentException $e) {
@@ -305,20 +414,30 @@ public function render(string $layout = null, array $context = [])
         }
 
         if (!$block) {
-            $block = HtmlBlock::create($key);
+            $block = HtmlBlock::create($key ?: null);
             $block->setChecksum($checksum);
-            if ($key === false) {
+            if (!$key) {
                 $block->disableCache();
             }
 
-            $grav->fireEvent('onFlexCollectionRender', new Event([
+            $event = new Event([
+                'type' => 'flex',
+                'directory' => $this->getFlexDirectory(),
                 'collection' => $this,
                 'layout' => &$layout,
                 'context' => &$context
-            ]));
+            ]);
+            $this->triggerEvent('onRender', $event);
 
             $output = $this->getTemplate($layout)->render(
-                ['grav' => $grav, 'config' => $grav['config'], 'block' => $block, 'collection' => $this, 'layout' => $layout] + $context
+                [
+                    'grav' => $grav,
+                    'config' => $grav['config'],
+                    'block' => $block,
+                    'directory' => $this->getFlexDirectory(),
+                    'collection' => $this,
+                    'layout' => $layout
+                ] + $context
             );
 
             if ($debugger->enabled()) {
@@ -328,7 +447,7 @@ public function render(string $layout = null, array $context = [])
             $block->setContent($output);
 
             try {
-                $cache && $block->isCached() && $cache->set($key, $block->toArray());
+                $cache && $key && $block->isCached() && $cache->set($key, $block->toArray());
             } catch (InvalidArgumentException $e) {
                 $debugger->addException($e);
             }
@@ -339,20 +458,6 @@ public function render(string $layout = null, array $context = [])
         return $block;
     }
 
-    /**
-     * @param bool $prefix
-     * @return string
-     * @deprecated 1.6 Use `->getFlexType()` instead.
-     */
-    public function getType($prefix = false)
-    {
-        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->getFlexType() method instead', E_USER_DEPRECATED);
-
-        $type = $prefix ? $this->getTypePrefix() : '';
-
-        return $type . $this->getFlexType();
-    }
-
     /**
      * @param FlexDirectory $type
      * @return $this
@@ -365,9 +470,10 @@ public function setFlexDirectory(FlexDirectory $type)
     }
 
     /**
+     * @param string $key
      * @return array
      */
-    public function getMetaData(string $key) : array
+    public function getMetaData($key): array
     {
         $object = $this->get($key);
 
@@ -388,7 +494,7 @@ public function getCache(string $namespace = null)
      */
     public function getKeyField(): string
     {
-        return $this->_keyField ?? 'storage_key';
+        return $this->_keyField;
     }
 
     /**
@@ -396,25 +502,33 @@ public function getKeyField(): string
      * @param string|null $scope
      * @param UserInterface|null $user
      * @return static
+     * @phpstan-return static<T>
      */
     public function isAuthorized(string $action, string $scope = null, UserInterface $user = null)
     {
         $list = $this->call('isAuthorized', [$action, $scope, $user]);
-        $list = \array_filter($list);
+        $list = array_filter($list);
+
+        /** @var string[] $keys */
+        $keys = array_keys($list);
 
-        return $this->select(array_keys($list));
+        /** @phpstan-var static<T> */
+        return $this->select($keys);
     }
 
     /**
      * @param string $value
      * @param string $field
-     * @return FlexObject|null
+     * @return FlexObjectInterface|null
+     * @phpstan-return T|null
      */
     public function find($value, $field = 'id')
     {
-        if ($value) foreach ($this as $element) {
-            if (mb_strtolower($element->getProperty($field)) === mb_strtolower($value)) {
-                return $element;
+        if ($value) {
+            foreach ($this as $element) {
+                if (mb_strtolower($element->getProperty($field)) === mb_strtolower($value)) {
+                    return $element;
+                }
             }
         }
 
@@ -424,6 +538,7 @@ public function find($value, $field = 'id')
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $elements = [];
@@ -433,12 +548,16 @@ public function jsonSerialize()
          * @var array|FlexObject $object
          */
         foreach ($this->getElements() as $key => $object) {
-            $elements[$key] = \is_array($object) ? $object : $object->jsonSerialize();
+            $elements[$key] = is_array($object) ? $object : $object->jsonSerialize();
         }
 
         return $elements;
     }
 
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
     public function __debugInfo()
     {
         return [
@@ -457,8 +576,8 @@ public function __debugInfo()
      *
      * @param array $elements Elements.
      * @param string|null $keyField
-     *
      * @return static
+     * @phpstan-return static<T>
      * @throws \InvalidArgumentException
      */
     protected function createFrom(array $elements, $keyField = null)
@@ -477,9 +596,50 @@ protected function getTypePrefix(): string
         return 'c.';
     }
 
+    /**
+     * @return array
+     */
+    protected function getTemplateConfig(): array
+    {
+        $config = $this->getFlexDirectory()->getConfig('site.templates', []);
+        $defaults = array_replace($config['defaults'] ?? [], $config['collection']['defaults'] ?? []);
+        $config['collection']['defaults'] = $defaults;
+
+        return $config;
+    }
+
     /**
      * @param string $layout
-     * @return TemplateWrapper
+     * @return array
+     */
+    protected function getTemplatePaths(string $layout): array
+    {
+        $config = $this->getTemplateConfig();
+        $type = $this->getFlexType();
+        $defaults = $config['collection']['defaults'] ?? [];
+
+        $ext = $defaults['ext'] ?? '.html.twig';
+        $types = array_unique(array_merge([$type], (array)($defaults['type'] ?? null)));
+        $paths = $config['collection']['paths'] ?? [
+                'flex/{TYPE}/collection/{LAYOUT}{EXT}',
+                'flex-objects/layouts/{TYPE}/collection/{LAYOUT}{EXT}'
+            ];
+        $table = ['TYPE' => '%1$s', 'LAYOUT' => '%2$s', 'EXT' => '%3$s'];
+
+        $lookups = [];
+        foreach ($paths as $path) {
+            $path = Utils::simpleTemplate($path, $table);
+            foreach ($types as $type) {
+                $lookups[] = sprintf($path, $type, $layout, $ext);
+            }
+        }
+
+        return array_unique($lookups);
+    }
+
+    /**
+     * @param string $layout
+     * @return Template|TemplateWrapper
      * @throws LoaderError
      * @throws SyntaxError
      */
@@ -491,18 +651,13 @@ protected function getTemplate($layout)
         $twig = $grav['twig'];
 
         try {
-            return $twig->twig()->resolveTemplate(
-                [
-                    "flex-objects/layouts/{$this->getFlexType()}/collection/{$layout}.html.twig",
-                    "flex-objects/layouts/_default/collection/{$layout}.html.twig"
-                ]
-            );
+            return $twig->twig()->resolveTemplate($this->getTemplatePaths($layout));
         } catch (LoaderError $e) {
             /** @var Debugger $debugger */
             $debugger = Grav::instance()['debugger'];
             $debugger->addException($e);
 
-            return $twig->twig()->resolveTemplate(['flex-objects/layouts/404.html.twig']);
+            return $twig->twig()->resolveTemplate(['flex/404.html.twig']);
         }
     }
 
@@ -513,13 +668,65 @@ protected function getTemplate($layout)
     protected function getRelatedDirectory($type): ?FlexDirectory
     {
         /** @var Flex $flex */
-        $flex = Grav::instance()['flex_objects'];
+        $flex = Grav::instance()['flex'];
 
         return $flex->getDirectory($type);
     }
 
+    /**
+     * @param string|null $keyField
+     * @return void
+     */
     protected function setKeyField($keyField = null): void
     {
         $this->_keyField = $keyField ?? 'storage_key';
     }
+
+    // DEPRECATED METHODS
+
+    /**
+     * @param bool $prefix
+     * @return string
+     * @deprecated 1.6 Use `->getFlexType()` instead.
+     */
+    public function getType($prefix = false)
+    {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->getFlexType() method instead', E_USER_DEPRECATED);
+
+        $type = $prefix ? $this->getTypePrefix() : '';
+
+        return $type . $this->getFlexType();
+    }
+
+    /**
+     * @param string $name
+     * @param object|null $event
+     * @return $this
+     * @deprecated 1.7, moved to \Grav\Common\Flex\Traits\FlexObjectTrait
+     */
+    public function triggerEvent(string $name, $event = null)
+    {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, moved to \Grav\Common\Flex\Traits\FlexObjectTrait', E_USER_DEPRECATED);
+
+        if (null === $event) {
+            $event = new Event([
+                'type' => 'flex',
+                'directory' => $this->getFlexDirectory(),
+                'collection' => $this
+            ]);
+        }
+        if (strpos($name, 'onFlexCollection') !== 0 && strpos($name, 'on') === 0) {
+            $name = 'onFlexCollection' . substr($name, 2);
+        }
+
+        $grav = Grav::instance();
+        if ($event instanceof Event) {
+            $grav->fireEvent($name, $event);
+        } else {
+            $grav->dispatchEvent($event);
+        }
+
+
+        return $this;
+    }
 }
diff --git a/system/src/Grav/Framework/Flex/FlexDirectory.php b/system/src/Grav/Framework/Flex/FlexDirectory.php
index c75a901525..7197284e0d 100644
--- a/system/src/Grav/Framework/Flex/FlexDirectory.php
+++ b/system/src/Grav/Framework/Flex/FlexDirectory.php
@@ -3,37 +3,50 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Flex;
 
+use Exception;
 use Grav\Common\Cache;
 use Grav\Common\Config\Config;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Debugger;
 use Grav\Common\Grav;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\User\Interfaces\UserInterface;
 use Grav\Common\Utils;
 use Grav\Framework\Cache\Adapter\DoctrineCache;
 use Grav\Framework\Cache\Adapter\MemoryCache;
 use Grav\Framework\Cache\CacheInterface;
-use Grav\Framework\Flex\Interfaces\FlexAuthorizeInterface;
+use Grav\Framework\Filesystem\Filesystem;
 use Grav\Framework\Flex\Interfaces\FlexCollectionInterface;
+use Grav\Framework\Flex\Interfaces\FlexDirectoryInterface;
+use Grav\Framework\Flex\Interfaces\FlexFormInterface;
 use Grav\Framework\Flex\Interfaces\FlexIndexInterface;
 use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
 use Grav\Framework\Flex\Interfaces\FlexStorageInterface;
 use Grav\Framework\Flex\Storage\SimpleStorage;
 use Grav\Framework\Flex\Traits\FlexAuthorizeTrait;
 use Psr\SimpleCache\InvalidArgumentException;
+use RocketTheme\Toolbox\File\YamlFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 use RuntimeException;
+use function call_user_func_array;
+use function count;
+use function is_array;
+use Grav\Common\Flex\Types\Generic\GenericObject;
+use Grav\Common\Flex\Types\Generic\GenericCollection;
+use Grav\Common\Flex\Types\Generic\GenericIndex;
+use function is_callable;
 
 /**
  * Class FlexDirectory
  * @package Grav\Framework\Flex
  */
-class FlexDirectory implements FlexAuthorizeInterface
+class FlexDirectory implements FlexDirectoryInterface
 {
     use FlexAuthorizeTrait;
 
@@ -43,11 +56,15 @@ class FlexDirectory implements FlexAuthorizeInterface
     protected $blueprint_file;
     /** @var Blueprint[] */
     protected $blueprints;
-    /** @var bool[] */
-    protected $blueprints_init;
-    /** @var FlexIndexInterface|null */
-    protected $index;
-    /** @var FlexCollectionInterface|null */
+    /**
+     * @var FlexIndexInterface[]
+     * @phpstan-var FlexIndexInterface<FlexObjectInterface>[]
+     */
+    protected $indexes = [];
+    /**
+     * @var FlexCollectionInterface|null
+     * @phpstan-var FlexCollectionInterface<FlexObjectInterface>|null
+     */
     protected $collection;
     /** @var bool */
     protected $enabled;
@@ -57,8 +74,10 @@ class FlexDirectory implements FlexAuthorizeInterface
     protected $config;
     /** @var FlexStorageInterface */
     protected $storage;
-    /** @var CacheInterface */
+    /** @var CacheInterface[] */
     protected $cache;
+    /** @var FlexObjectInterface[] */
+    protected $objects;
     /** @var string */
     protected $objectClassName;
     /** @var string */
@@ -66,6 +85,9 @@ class FlexDirectory implements FlexAuthorizeInterface
     /** @var string */
     protected $indexClassName;
 
+    /** @var string|null */
+    private $_authorize;
+
     /**
      * FlexDirectory constructor.
      * @param string $type
@@ -79,25 +101,29 @@ public function __construct(string $type, string $blueprint_file, array $default
         $this->blueprint_file = $blueprint_file;
         $this->defaults = $defaults;
         $this->enabled = !empty($defaults['enabled']);
+        $this->objects = [];
     }
 
     /**
      * @return bool
      */
-    public function isEnabled(): bool
+    public function isListed(): bool
     {
-        return $this->enabled;
+        $grav = Grav::instance();
+
+        /** @var Flex $flex */
+        $flex = $grav['flex'];
+        $directory = $flex->getDirectory($this->type);
+
+        return null !== $directory;
     }
 
     /**
-     * @return string
-     * @deprecated 1.6 Use ->getFlexType() method instead.
+     * @return bool
      */
-    public function getType(): string
+    public function isEnabled(): bool
     {
-        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->getFlexType() method instead', E_USER_DEPRECATED);
-
-        return $this->type;
+        return $this->enabled;
     }
 
     /**
@@ -132,34 +158,196 @@ public function getDescription(): string
     public function getConfig(string $name = null, $default = null)
     {
         if (null === $this->config) {
-            $this->config = new Config(array_merge_recursive($this->getBlueprintInternal()->get('config', []), $this->defaults));
+            $config = $this->getBlueprintInternal()->get('config', []);
+            $config = is_array($config) ? array_replace_recursive($config, $this->defaults, $this->getDirectoryConfig($config['admin']['views']['configure']['form'] ?? $config['admin']['configure']['form'] ?? null)) : null;
+            if (!is_array($config)) {
+                throw new RuntimeException('Bad configuration');
+            }
+
+            $this->config = new Config($config);
         }
 
         return null === $name ? $this->config : $this->config->get($name, $default);
     }
 
     /**
-     * @param string $type
-     * @param string $context
+     * @param string|string[]|null $properties
+     * @return array
+     */
+    public function getSearchProperties($properties = null): array
+    {
+        if (null !== $properties) {
+            return (array)$properties;
+        }
+
+        $properties = $this->getConfig('data.search.fields');
+        if (!$properties) {
+            $fields = $this->getConfig('admin.views.list.fields') ?? $this->getConfig('admin.list.fields', []);
+            foreach ($fields as $property => $value) {
+                if (!empty($value['link'])) {
+                    $properties[] = $property;
+                }
+            }
+        }
+
+        return $properties;
+    }
+
+    /**
+     * @param array|null $options
+     * @return array
+     */
+    public function getSearchOptions(array $options = null): array
+    {
+        if (empty($options['merge'])) {
+            return $options ?? (array)$this->getConfig('data.search.options');
+        }
+
+        unset($options['merge']);
+
+        return $options + (array)$this->getConfig('data.search.options');
+    }
+
+    /**
+     * @param string|null $name
+     * @param array $options
+     * @return FlexFormInterface
+     * @internal
+     */
+    public function getDirectoryForm(string $name = null, array $options = [])
+    {
+        $name = $name ?: $this->getConfig('admin.views.configure.form', '') ?: $this->getConfig('admin.configure.form', '');
+
+        return new FlexDirectoryForm($name ?? '', $this, $options);
+    }
+
+    /**
      * @return Blueprint
+     * @internal
      */
-    public function getBlueprint(string $type = '', string $context = '')
+    public function getDirectoryBlueprint()
     {
-        $blueprint = $this->getBlueprintInternal($type, $context);
+        $name = 'configure';
 
-        if (empty($this->blueprints_init[$type])) {
-            $this->blueprints_init[$type] = true;
+        $type = $this->getBlueprint();
+        $overrides = $type->get("blueprints/{$name}");
 
-            $blueprint->setScope('object');
-            $blueprint->init();
-            if (empty($blueprint->fields())) {
-                throw new RuntimeException(sprintf('Flex: Blueprint for %s is missing', $this->type));
-            }
+        $path = "blueprints://flex/shared/{$name}.yaml";
+        $blueprint = new Blueprint($path);
+        $blueprint->load();
+        if (isset($overrides['fields'])) {
+            $blueprint->embed('form/fields/tabs/fields', $overrides['fields']);
         }
+        $blueprint->init();
 
         return $blueprint;
     }
 
+    /**
+     * @param string $name
+     * @param array $data
+     * @return void
+     * @throws Exception
+     * @internal
+     */
+    public function saveDirectoryConfig(string $name, array $data)
+    {
+        $grav = Grav::instance();
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $grav['locator'];
+
+        $filename = $this->getDirectoryConfigUri($name);
+        if (file_exists($filename)) {
+            $filename = $locator->findResource($filename, true);
+        } else {
+            $filesystem = Filesystem::getInstance();
+            $dirname = $filesystem->dirname($filename);
+            $basename = $filesystem->basename($filename);
+            $dirname = $locator->findResource($dirname, true) ?: $locator->findResource($dirname, true, true);
+            $filename = "{$dirname}/{$basename}";
+        }
+
+        $file = YamlFile::instance($filename);
+        if (!empty($data)) {
+            $file->save($data);
+        } else {
+            $file->delete();
+        }
+    }
+
+    /**
+     * @param string $name
+     * @return array
+     * @internal
+     */
+    public function loadDirectoryConfig(string $name): array
+    {
+        $grav = Grav::instance();
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $grav['locator'];
+        $uri = $this->getDirectoryConfigUri($name);
+
+        // If configuration is found in main configuration, use it.
+        if (str_starts_with($uri, 'config://')) {
+            $path = str_replace('/', '.', substr($uri, 9, -5));
+
+            return (array)$grav['config']->get($path);
+        }
+
+        // Load the configuration file.
+        $filename = $locator->findResource($uri, true);
+        if ($filename === false) {
+            return [];
+        }
+
+        $file = YamlFile::instance($filename);
+
+        return $file->content();
+    }
+
+    /**
+     * @param string|null $name
+     * @return string
+     */
+    public function getDirectoryConfigUri(string $name = null): string
+    {
+        $name = $name ?: $this->getFlexType();
+        $blueprint = $this->getBlueprint();
+
+        return $blueprint->get('blueprints/views/configure/file') ?? $blueprint->get('blueprints/configure/file') ?? "config://flex/{$name}.yaml";
+    }
+
+    /**
+     * @param string|null $name
+     * @return array
+     */
+    protected function getDirectoryConfig(string $name = null): array
+    {
+        $grav = Grav::instance();
+
+        /** @var Config $config */
+        $config = $grav['config'];
+        $name = $name ?: $this->getFlexType();
+
+        return $config->get("flex.{$name}", []);
+    }
+
+    /**
+     * Returns a new uninitialized instance of blueprint.
+     *
+     * Always use $object->getBlueprint() or $object->getForm()->getBlueprint() instead.
+     *
+     * @param string $type
+     * @param string $context
+     * @return Blueprint
+     */
+    public function getBlueprint(string $type = '', string $context = '')
+    {
+        return clone $this->getBlueprintInternal($type, $context);
+    }
+
     /**
      * @param string $view
      * @return string
@@ -171,7 +359,7 @@ public function getBlueprintFile(string $view = ''): string
             $file = preg_replace('/\.yaml/', "/{$view}.yaml", $file);
         }
 
-        return $file;
+        return (string)$file;
     }
 
     /**
@@ -182,6 +370,7 @@ public function getBlueprintFile(string $view = ''): string
      * @param array|null $keys  Array of keys.
      * @param string|null $keyField  Field to be used as the key.
      * @return FlexCollectionInterface
+     * @phpstan-return FlexCollectionInterface<FlexObjectInterface>
      */
     public function getCollection(array $keys = null, string $keyField = null): FlexCollectionInterface
     {
@@ -208,13 +397,16 @@ public function getCollection(array $keys = null, string $keyField = null): Flex
      * @param array|null $keys  Array of keys.
      * @param string|null $keyField  Field to be used as the key.
      * @return FlexIndexInterface
+     * @phpstan-return FlexIndexInterface<FlexObjectInterface>
      */
     public function getIndex(array $keys = null, string $keyField = null): FlexIndexInterface
     {
-        $index = clone $this->loadIndex();
-        $index = $index->withKeyField($keyField);
+        $keyField = $keyField ?? '';
+        $index = $this->indexes[$keyField] ?? $this->loadIndex($keyField);
+        $index = clone $index;
 
         if (null !== $keys) {
+            /** @var FlexIndexInterface<FlexObjectInterface> $index */
             $index = $index->select($keys);
         }
 
@@ -222,80 +414,24 @@ public function getIndex(array $keys = null, string $keyField = null): FlexIndex
     }
 
     /**
-     * Returns an object if it exists.
+     * Returns an object if it exists. If no arguments are passed (or both of them are null), method creates a new empty object.
      *
      * Note: It is not safe to use the object without checking if the user can access it.
      *
-     * @param string $key
-     * @param string|null $keyField  Field to be used as the key.
-     * @return FlexObjectInterface|null
-     */
-    public function getObject($key, string $keyField = null): ?FlexObjectInterface
-    {
-        return $this->getIndex(null, $keyField)->get($key);
-    }
-
-    /**
-     * @param array $data
      * @param string|null $key
-     * @return FlexObjectInterface
-     */
-    public function update(array $data, string $key = null): FlexObjectInterface
-    {
-        $object = null !== $key ? $this->getIndex()->get($key): null;
-
-        $storage = $this->getStorage();
-
-        if (null === $object) {
-            $object = $this->createObject($data, $key, true);
-            $key = $object->getStorageKey();
-
-            if ($key) {
-                $rows = $storage->replaceRows([$key => $object->prepareStorage()]);
-            } else {
-                $rows = $storage->createRows([$object->prepareStorage()]);
-            }
-        } else {
-            $oldKey = $object->getStorageKey();
-            $object->update($data);
-            $newKey = $object->getStorageKey();
-
-            if ($oldKey !== $newKey) {
-                $object->triggerEvent('move');
-                $storage->renameRow($oldKey, $newKey);
-                // TODO: media support.
-            }
-
-            $object->save();
-        }
-
-        try {
-            $this->clearCache();
-        } catch (InvalidArgumentException $e) {
-            /** @var Debugger $debugger */
-            $debugger = Grav::instance()['debugger'];
-            $debugger->addException($e);
-
-            // Caching failed, but we can ignore that for now.
-        }
-
-        return $object;
-    }
-
-    /**
-     * @param string $key
+     * @param string|null $keyField  Field to be used as the key.
      * @return FlexObjectInterface|null
      */
-    public function remove(string $key): ?FlexObjectInterface
+    public function getObject($key = null, string $keyField = null): ?FlexObjectInterface
     {
-        $object = $this->getIndex()->get($key);
-        if (!$object) {
-            return null;
+        if (null === $key) {
+            return $this->createObject([], '');
         }
 
-        $object->delete();
+        $keyField = $keyField ?? '';
+        $index = $this->indexes[$keyField] ?? $this->loadIndex($keyField);
 
-        return $object;
+        return $index->get($key);
     }
 
     /**
@@ -313,19 +449,19 @@ public function getCache(string $namespace = null)
 
                 /** @var Cache $gravCache */
                 $gravCache = $grav['cache'];
-                $config = $this->getConfig('cache.' . $namespace);
+                $config = $this->getConfig('object.cache.' . $namespace);
                 if (empty($config['enabled'])) {
                     $cache = new MemoryCache('flex-objects-' . $this->getFlexType());
                 } else {
-                    $timeout = $config['timeout'] ?? 60;
+                    $lifetime = $config['lifetime'] ?? 60;
 
                     $key = $gravCache->getKey();
                     if (Utils::isAdminPlugin()) {
                         $key = substr($key, 0, -1);
                     }
-                    $cache = new DoctrineCache($gravCache->getCacheDriver(), 'flex-objects-' . $this->getFlexType() . $key, $timeout);
+                    $cache = new DoctrineCache($gravCache->getCacheDriver(), 'flex-objects-' . $this->getFlexType() . $key, $lifetime);
                 }
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 /** @var Debugger $debugger */
                 $debugger = Grav::instance()['debugger'];
                 $debugger->addException($e);
@@ -360,25 +496,26 @@ public function clearCache()
         $this->getCache('object')->clear();
         $this->getCache('render')->clear();
 
-        $this->index = null;
+        $this->indexes = [];
+        $this->objects = [];
 
         return $this;
     }
 
     /**
      * @param string|null $key
-     * @return string
+     * @return string|null
      */
-    public function getStorageFolder(string $key = null): string
+    public function getStorageFolder(string $key = null): ?string
     {
         return $this->getStorage()->getStoragePath($key);
     }
 
     /**
      * @param string|null $key
-     * @return string
+     * @return string|null
      */
-    public function getMediaFolder(string $key = null): string
+    public function getMediaFolder(string $key = null): ?string
     {
         return $this->getStorage()->getMediaPath($key);
     }
@@ -403,34 +540,45 @@ public function getStorage(): FlexStorageInterface
      */
     public function createObject(array $data, string $key = '', bool $validate = false): FlexObjectInterface
     {
-        /** @var string|FlexObjectInterface $className */
+        /** @phpstan-var class-string $className */
         $className = $this->objectClassName ?: $this->getObjectClass();
+        if (!is_a($className, FlexObjectInterface::class, true)) {
+            throw new \RuntimeException('Bad object class: ' . $className);
+        }
 
         return new $className($data, $key, $this, $validate);
     }
 
     /**
      * @param array $entries
-     * @param string $keyField
+     * @param string|null $keyField
      * @return FlexCollectionInterface
+     * @phpstan-return FlexCollectionInterface<FlexObjectInterface>
      */
     public function createCollection(array $entries, string $keyField = null): FlexCollectionInterface
     {
-        /** @var string|FlexCollectionInterface $className */
+        /** phpstan-var class-string $className */
         $className = $this->collectionClassName ?: $this->getCollectionClass();
+        if (!is_a($className, FlexCollectionInterface::class, true)) {
+            throw new \RuntimeException('Bad collection class: ' . $className);
+        }
 
         return $className::createFromArray($entries, $this, $keyField);
     }
 
     /**
      * @param array $entries
-     * @param string $keyField
+     * @param string|null $keyField
      * @return FlexIndexInterface
+     * @phpstan-return FlexIndexInterface<FlexObjectInterface>
      */
     public function createIndex(array $entries, string $keyField = null): FlexIndexInterface
     {
-        /** @var string|FlexIndexInterface $className */
+        /** @phpstan-var class-string $className */
         $className = $this->indexClassName ?: $this->getIndexClass();
+        if (!is_a($className, FlexIndexInterface::class, true)) {
+            throw new \RuntimeException('Bad index class: ' . $className);
+        }
 
         return $className::createFromArray($entries, $this, $keyField);
     }
@@ -441,11 +589,10 @@ public function createIndex(array $entries, string $keyField = null): FlexIndexI
     public function getObjectClass(): string
     {
         if (!$this->objectClassName) {
-            $this->objectClassName = $this->getConfig('data.object', 'Grav\\Framework\\Flex\\FlexObject');
+            $this->objectClassName = $this->getConfig('data.object', GenericObject::class);
         }
 
         return $this->objectClassName;
-
     }
 
     /**
@@ -454,7 +601,7 @@ public function getObjectClass(): string
     public function getCollectionClass(): string
     {
         if (!$this->collectionClassName) {
-            $this->collectionClassName = $this->getConfig('data.collection', 'Grav\\Framework\\Flex\\FlexCollection');
+            $this->collectionClassName = $this->getConfig('data.collection', GenericCollection::class);
         }
 
         return $this->collectionClassName;
@@ -467,7 +614,7 @@ public function getCollectionClass(): string
     public function getIndexClass(): string
     {
         if (!$this->indexClassName) {
-            $this->indexClassName = $this->getConfig('data.index', 'Grav\\Framework\\Flex\\FlexIndex');
+            $this->indexClassName = $this->getConfig('data.index', GenericIndex::class);
         }
 
         return $this->indexClassName;
@@ -475,8 +622,9 @@ public function getIndexClass(): string
 
     /**
      * @param array $entries
-     * @param string $keyField
+     * @param string|null $keyField
      * @return FlexCollectionInterface
+     * @phpstan-return FlexCollectionInterface<FlexObjectInterface>
      */
     public function loadCollection(array $entries, string $keyField = null): FlexCollectionInterface
     {
@@ -492,74 +640,177 @@ public function loadObjects(array $entries): array
     {
         /** @var Debugger $debugger */
         $debugger = Grav::instance()['debugger'];
-        $debugger->startTimer('flex-objects', sprintf('Flex: Initializing %d %s', \count($entries), $this->type));
 
-        $storage = $this->getStorage();
-        $cache = $this->getCache('object');
-
-        // Get storage keys for the objects.
         $keys = [];
         $rows = [];
+        $fetch = [];
+
+        // Build lookup arrays with storage keys for the objects.
         foreach ($entries as $key => $value) {
-            $k = $value['storage_key'];
+            $k = $value['storage_key'] ?? '';
+            if ($k === '') {
+                continue;
+            }
+            $v = $this->objects[$k] ?? null;
             $keys[$k] = $key;
-            $rows[$k] = null;
+            $rows[$k] = $v;
+            if (!$v) {
+                $fetch[] = $k;
+            }
         }
 
-        // Fetch rows from the cache.
-        try {
-            $rows = $cache->getMultiple(array_keys($rows));
-        } catch (InvalidArgumentException $e) {
-            $debugger->addException($e);
+        // Attempt to fetch missing rows from the cache.
+        if ($fetch) {
+             $rows = (array)array_replace($rows, $this->loadCachedObjects($fetch));
         }
 
         // Read missing rows from the storage.
         $updated = [];
+        $storage = $this->getStorage();
         $rows = $storage->readRows($rows, $updated);
 
+        // Create objects from the rows.
+        $isListed = $this->isListed();
+        $list = [];
+        foreach ($rows as $storageKey => $row) {
+            $usedKey = $keys[$storageKey];
+
+            if ($row instanceof FlexObjectInterface) {
+                $object = $row;
+            } else {
+                if ($row === null) {
+                    $debugger->addMessage(sprintf('Flex: Object %s was not found from %s storage', $storageKey, $this->type), 'debug');
+                    continue;
+                }
+
+                if (isset($row['__ERROR'])) {
+                    $message = sprintf('Flex: Object %s is broken in %s storage: %s', $storageKey, $this->type, $row['__ERROR']);
+                    $debugger->addException(new RuntimeException($message));
+                    $debugger->addMessage($message, 'error');
+                    continue;
+                }
+
+                if (!isset($row['__META'])) {
+                    $row['__META'] = [
+                        'storage_key' => $storageKey,
+                        'storage_timestamp' => $entries[$usedKey]['storage_timestamp'] ?? 0,
+                    ];
+                }
+
+                $key = $row['__META']['key'] ?? $entries[$usedKey]['key'] ?? $usedKey;
+                $object = $this->createObject($row, $key, false);
+                $this->objects[$storageKey] = $object;
+                if ($isListed) {
+                    // If unserialize works for the object, serialize the object to speed up the loading.
+                    $updated[$storageKey] = $object;
+                }
+            }
+
+            $list[$usedKey] = $object;
+        }
+
         // Store updated rows to the cache.
         if ($updated) {
+            $cache = $this->getCache('object');
+            if (!$cache instanceof MemoryCache) {
+                ///** @var Debugger $debugger */
+                //$debugger = Grav::instance()['debugger'];
+                //$debugger->addMessage(sprintf('Flex: Caching %d %s', \count($entries), $this->type), 'debug');
+            }
             try {
-                if (!$cache instanceof MemoryCache) {
-                    $debugger->addMessage(sprintf('Flex: Caching %d %s: %s', \count($updated), $this->type, implode(', ', array_keys($updated))), 'debug');
-                }
                 $cache->setMultiple($updated);
             } catch (InvalidArgumentException $e) {
                 $debugger->addException($e);
-
                 // TODO: log about the issue.
             }
         }
 
-        // Create objects from the rows.
-        $list = [];
-        foreach ($rows as $storageKey => $row) {
-            if ($row === null) {
-                $debugger->addMessage(sprintf('Flex: Object %s was not found from %s storage', $storageKey, $this->type), 'debug');
-                continue;
-            }
+        if ($fetch) {
+            $debugger->stopTimer('flex-objects');
+        }
 
-            if (isset($row['__error'])) {
-                $message = sprintf('Flex: Object %s is broken in %s storage: %s', $storageKey, $this->type, $row['__error']);
-                $debugger->addException(new \RuntimeException($message));
-                $debugger->addMessage($message, 'error');
-                continue;
-            }
+        return $list;
+    }
 
-            $usedKey = $keys[$storageKey];
-            $row += [
-                'storage_key' => $storageKey,
-                'storage_timestamp' => $entries[$usedKey]['storage_timestamp'],
-            ];
+    protected function loadCachedObjects(array $fetch): array
+    {
+        if (!$fetch) {
+            return [];
+        }
 
-            $key = $entries[$usedKey]['key'] ?? $usedKey;
-            $object = $this->createObject($row, $key, false);
-            $list[$usedKey] = $object;
+        /** @var Debugger $debugger */
+        $debugger = Grav::instance()['debugger'];
+
+        $cache = $this->getCache('object');
+
+        // Attempt to fetch missing rows from the cache.
+        $fetched = [];
+        try {
+            $loading = count($fetch);
+
+            $debugger->startTimer('flex-objects', sprintf('Flex: Loading %d %s', $loading, $this->type));
+
+            $fetched = (array)$cache->getMultiple($fetch);
+            if ($fetched) {
+                $index = $this->loadIndex('storage_key');
+
+                // Make sure cached objects are up to date: compare against index checksum/timestamp.
+                /**
+                 * @var string $key
+                 * @var mixed $value
+                 */
+                foreach ($fetched as $key => $value) {
+                    if ($value instanceof FlexObjectInterface) {
+                        $objectMeta = $value->getMetaData();
+                    } else {
+                        $objectMeta = $value['__META'] ?? [];
+                    }
+                    $indexMeta = $index->getMetaData($key);
+
+                    $indexChecksum = $indexMeta['checksum'] ?? $indexMeta['storage_timestamp'] ?? null;
+                    $objectChecksum = $objectMeta['checksum'] ?? $objectMeta['storage_timestamp'] ?? null;
+                    if ($indexChecksum !== $objectChecksum) {
+                        unset($fetched[$key]);
+                    }
+                }
+            }
+
+        } catch (InvalidArgumentException $e) {
+            $debugger->addException($e);
         }
 
-        $debugger->stopTimer('flex-objects');
+        return $fetched;
+    }
 
-        return $list;
+    /**
+     * @return void
+     */
+    public function reloadIndex(): void
+    {
+        $this->getCache('index')->clear();
+        $this->getIndex()::loadEntriesFromStorage($this->getStorage());
+
+        $this->indexes = [];
+        $this->objects = [];
+    }
+
+    /**
+     * @param string $scope
+     * @param string $action
+     * @return string
+     */
+    public function getAuthorizeRule(string $scope, string $action): string
+    {
+        if (!$this->_authorize) {
+            $config = $this->getConfig('admin.permissions');
+            if ($config) {
+                $this->_authorize = array_key_first($config) . '.%2$s';
+            } else {
+                $this->_authorize = '%1$s.flex-object.%2$s';
+            }
+        }
+
+        return sprintf($this->_authorize, $scope, $action);
     }
 
     /**
@@ -579,6 +830,16 @@ protected function getBlueprintInternal(string $type_view = '', string $context
             $view = array_shift($parts) ?: '';
 
             $blueprint = new Blueprint($this->getBlueprintFile($view));
+            $blueprint->addDynamicHandler('data', function (array &$field, $property, array &$call) {
+                $this->dynamicDataField($field, $property, $call);
+            });
+            $blueprint->addDynamicHandler('flex', function (array &$field, $property, array &$call) {
+                $this->dynamicFlexField($field, $property, $call);
+            });
+            $blueprint->addDynamicHandler('authorize', function (array &$field, $property, array &$call) {
+                $this->dynamicAuthorizeField($field, $property, $call);
+            });
+
             if ($context) {
                 $blueprint->setContext($context);
             }
@@ -595,6 +856,126 @@ protected function getBlueprintInternal(string $type_view = '', string $context
         return $this->blueprints[$type_view];
     }
 
+    /**
+     * @param array $field
+     * @param string $property
+     * @param array $call
+     * @return void
+     */
+    protected function dynamicDataField(array &$field, $property, array $call)
+    {
+        $params = $call['params'];
+        if (is_array($params)) {
+            $function = array_shift($params);
+        } else {
+            $function = $params;
+            $params = [];
+        }
+
+        $object = $call['object'];
+        if ($function === '\Grav\Common\Page\Pages::pageTypes') {
+            $params = [$object instanceof PageInterface && $object->isModule() ? 'modular' : 'standard'];
+        }
+
+        $data = null;
+        if (is_callable($function)) {
+            $data = call_user_func_array($function, $params);
+        }
+
+        // If function returns a value,
+        if (null !== $data) {
+            if (is_array($data) && isset($field[$property]) && is_array($field[$property])) {
+                // Combine field and @data-field together.
+                $field[$property] += $data;
+            } else {
+                // Or create/replace field with @data-field.
+                $field[$property] = $data;
+            }
+        }
+    }
+
+    /**
+     * @param array $field
+     * @param string $property
+     * @param array $call
+     * @return void
+     */
+    protected function dynamicFlexField(array &$field, $property, array $call): void
+    {
+        $params = (array)$call['params'];
+        $object = $call['object'] ?? null;
+        $method = array_shift($params);
+        $not = false;
+        if (str_starts_with($method, '!')) {
+            $method = substr($method, 1);
+            $not = true;
+        } elseif (str_starts_with($method, 'not ')) {
+            $method = substr($method, 4);
+            $not = true;
+        }
+        $method = trim($method);
+
+        if ($object && method_exists($object, $method)) {
+            $value = $object->{$method}(...$params);
+            if (is_array($value) && isset($field[$property]) && is_array($field[$property])) {
+                $value = $this->mergeArrays($field[$property], $value);
+            }
+            $value = $not ? !$value : $value;
+
+            if ($property === 'ignore' && $value) {
+                Blueprint::addPropertyRecursive($field, 'validate', ['ignore' => true]);
+            } else {
+                $field[$property] = $value;
+            }
+        }
+    }
+
+    /**
+     * @param array $field
+     * @param string $property
+     * @param array $call
+     * @return void
+     */
+    protected function dynamicAuthorizeField(array &$field, $property, array $call): void
+    {
+        $params = (array)$call['params'];
+        $object = $call['object'] ?? null;
+        $permission = array_shift($params);
+        $not = false;
+        if (str_starts_with($permission, '!')) {
+            $permission = substr($permission, 1);
+            $not = true;
+        } elseif (str_starts_with($permission, 'not ')) {
+            $permission = substr($permission, 4);
+            $not = true;
+        }
+        $permission = trim($permission);
+
+        if ($object) {
+            $value = $object->isAuthorized($permission) ?? false;
+
+            $field[$property] = $not ? !$value : $value;
+        }
+    }
+
+    /**
+     * @param array $array1
+     * @param array $array2
+     * @return array
+     */
+    protected function mergeArrays(array $array1, array $array2): array
+    {
+        foreach ($array2 as $key => $value) {
+            if (is_array($value) && isset($array1[$key]) && is_array($array1[$key])) {
+                $array1[$key] = $this->mergeArrays($array1[$key], $value);
+            } else {
+                $array1[$key] = $value;
+            }
+        }
+
+        return $array1;
+    }
+
     /**
      * @return FlexStorageInterface
      */
@@ -604,27 +985,38 @@ protected function createStorage(): FlexStorageInterface
 
         $storage = $this->getConfig('data.storage');
 
-        if (!\is_array($storage)) {
+        if (!is_array($storage)) {
             $storage = ['options' => ['folder' => $storage]];
         }
 
         $className = $storage['class'] ?? SimpleStorage::class;
         $options = $storage['options'] ?? [];
 
+        if (!is_a($className, FlexStorageInterface::class, true)) {
+            throw new \RuntimeException('Bad storage class: ' . $className);
+        }
+
         return new $className($options);
     }
 
     /**
+     * @param string $keyField
      * @return FlexIndexInterface
+     * @phpstan-return FlexIndexInterface<FlexObjectInterface>
      */
-    protected function loadIndex(): FlexIndexInterface
+    protected function loadIndex(string $keyField): FlexIndexInterface
     {
         static $i = 0;
 
-        $index = $this->index;
+        $index = $this->indexes[$keyField] ?? null;
+        if (null !== $index) {
+            return $index;
+        }
 
+        $index = $this->indexes['storage_key'] ?? null;
         if (null === $index) {
-            $i++; $j = $i;
+            $i++;
+            $j = $i;
             /** @var Debugger $debugger */
             $debugger = Grav::instance()['debugger'];
             $debugger->startTimer('flex-keys-' . $this->type . $j, "Flex: Loading {$this->type} index");
@@ -639,13 +1031,15 @@ protected function loadIndex(): FlexIndexInterface
                 $keys = null;
             }
 
-            if (null === $keys) {
-                /** @var string|FlexIndexInterface $className */
+            if (!is_array($keys)) {
+                /** @phpstan-var class-string $className */
                 $className = $this->getIndexClass();
                 $keys = $className::loadEntriesFromStorage($storage);
                 if (!$cache instanceof MemoryCache) {
-                    $debugger->addMessage(sprintf('Flex: Caching %s index of %d objects', $this->type, \count($keys)),
-                        'debug');
+                    $debugger->addMessage(
+                        sprintf('Flex: Caching %s index of %d objects', $this->type, count($keys)),
+                        'debug'
+                    );
                 }
                 try {
                     $cache->set('__keys', $keys);
@@ -655,15 +1049,139 @@ protected function loadIndex(): FlexIndexInterface
                 }
             }
 
+            $ordering = $this->getConfig('data.ordering', []);
+
             // We need to do this in two steps as orderBy() calls loadIndex() again and we do not want infinite loop.
-            $this->index = $this->createIndex($keys);
-            /** @var FlexCollectionInterface $collection */
-            $collection = $this->index->orderBy($this->getConfig('data.ordering', []));
-            $this->index = $index = $collection->getIndex();
+            $this->indexes['storage_key'] = $index = $this->createIndex($keys, 'storage_key');
+            if ($ordering) {
+                /** @var FlexCollectionInterface<FlexObjectInterface> $collection */
+                $collection = $this->indexes['storage_key']->orderBy($ordering);
+                $this->indexes['storage_key'] = $index = $collection->getIndex();
+            }
 
             $debugger->stopTimer('flex-keys-' . $this->type . $j);
         }
 
+        if ($keyField !== 'storage_key') {
+            $this->indexes[$keyField] = $index = $index->withKeyField($keyField ?: null);
+        }
+
         return $index;
     }
+
+    /**
+     * @param string $action
+     * @return string
+     */
+    protected function getAuthorizeAction(string $action): string
+    {
+        // Handle special action save, which can mean either update or create.
+        if ($action === 'save') {
+            $action = 'create';
+        }
+
+        return $action;
+    }
+    /**
+     * @return UserInterface|null
+     */
+    protected function getActiveUser(): ?UserInterface
+    {
+        /** @var UserInterface|null $user */
+        $user = Grav::instance()['user'] ?? null;
+
+        return $user;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getAuthorizeScope(): string
+    {
+        return isset(Grav::instance()['admin']) ? 'admin' : 'site';
+    }
+
+    // DEPRECATED METHODS
+
+    /**
+     * @return string
+     * @deprecated 1.6 Use ->getFlexType() method instead.
+     */
+    public function getType(): string
+    {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->getFlexType() method instead', E_USER_DEPRECATED);
+
+        return $this->type;
+    }
+
+    /**
+     * @param array $data
+     * @param string|null $key
+     * @return FlexObjectInterface
+     * @deprecated 1.7 Use $object->update()->save() instead.
+     */
+    public function update(array $data, string $key = null): FlexObjectInterface
+    {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() should not be used anymore: use $object->update()->save() instead.', E_USER_DEPRECATED);
+
+        $object = null !== $key ? $this->getIndex()->get($key): null;
+
+        $storage = $this->getStorage();
+
+        if (null === $object) {
+            $object = $this->createObject($data, $key ?? '', true);
+            $key = $object->getStorageKey();
+
+            if ($key) {
+                $storage->replaceRows([$key => $object->prepareStorage()]);
+            } else {
+                $storage->createRows([$object->prepareStorage()]);
+            }
+        } else {
+            $oldKey = $object->getStorageKey();
+            $object->update($data);
+            $newKey = $object->getStorageKey();
+
+            if ($oldKey !== $newKey) {
+                if (method_exists($object, 'triggerEvent')) {
+                    $object->triggerEvent('move');
+                }
+                $storage->renameRow($oldKey, $newKey);
+                // TODO: media support.
+            }
+
+            $object->save();
+        }
+
+        try {
+            $this->clearCache();
+        } catch (InvalidArgumentException $e) {
+            /** @var Debugger $debugger */
+            $debugger = Grav::instance()['debugger'];
+            $debugger->addException($e);
+
+            // Caching failed, but we can ignore that for now.
+        }
+
+        return $object;
+    }
+
+    /**
+     * @param string $key
+     * @return FlexObjectInterface|null
+     * @deprecated 1.7 Use $object->delete() instead.
+     */
+    public function remove(string $key): ?FlexObjectInterface
+    {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() should not be used anymore: use $object->delete() instead.', E_USER_DEPRECATED);
+
+        $object = $this->getIndex()->get($key);
+        if (!$object) {
+            return null;
+        }
+
+        $object->delete();
+
+        return $object;
+    }
 }
diff --git a/system/src/Grav/Framework/Flex/FlexDirectoryForm.php b/system/src/Grav/Framework/Flex/FlexDirectoryForm.php
new file mode 100644
index 0000000000..1e715a5002
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/FlexDirectoryForm.php
@@ -0,0 +1,509 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex;
+
+use ArrayAccess;
+use Exception;
+use Grav\Common\Data\Blueprint;
+use Grav\Common\Data\Data;
+use Grav\Common\Grav;
+use Grav\Common\Twig\Twig;
+use Grav\Common\Utils;
+use Grav\Framework\Flex\Interfaces\FlexDirectoryFormInterface;
+use Grav\Framework\Flex\Interfaces\FlexFormInterface;
+use Grav\Framework\Form\Interfaces\FormFlashInterface;
+use Grav\Framework\Form\Traits\FormTrait;
+use Grav\Framework\Route\Route;
+use JsonSerializable;
+use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccessWithGetters;
+use RuntimeException;
+use Twig\Error\LoaderError;
+use Twig\Error\SyntaxError;
+use Twig\Template;
+use Twig\TemplateWrapper;
+
+/**
+ * Class FlexForm
+ * @package Grav\Framework\Flex
+ */
+class FlexDirectoryForm implements FlexDirectoryFormInterface, JsonSerializable
+{
+    use NestedArrayAccessWithGetters {
+        NestedArrayAccessWithGetters::get as private traitGet;
+        NestedArrayAccessWithGetters::set as private traitSet;
+    }
+    use FormTrait {
+        FormTrait::doSerialize as doTraitSerialize;
+        FormTrait::doUnserialize as doTraitUnserialize;
+    }
+
+    /** @var array|null */
+    private $form;
+    /** @var FlexDirectory */
+    private $directory;
+    /** @var string */
+    private $flexName;
+
+    /**
+     * @param array $options    Options to initialize the form instance:
+     *                          (string) name: Form name, allows you to use custom form.
+     *                          (string) unique_id: Unique id for this form instance.
+     *                          (array) form: Custom form fields.
+     *                          (FlexDirectory) directory: Flex Directory, mandatory.
+     *
+     * @return FlexFormInterface
+     */
+    public static function instance(array $options = []): FlexFormInterface
+    {
+        if (isset($options['directory'])) {
+            $directory = $options['directory'];
+            if (!$directory instanceof FlexDirectory) {
+                throw new RuntimeException(__METHOD__ . "(): 'directory' should be instance of FlexDirectory", 400);
+            }
+            unset($options['directory']);
+        } else {
+            throw new RuntimeException(__METHOD__ . "(): You need to pass option 'directory'", 400);
+        }
+
+        $name = $options['name'] ?? '';
+
+        return $directory->getDirectoryForm($name, $options);
+    }
+
+    /**
+     * FlexForm constructor.
+     * @param string $name
+     * @param FlexDirectory $directory
+     * @param array|null $options
+     */
+    public function __construct(string $name, FlexDirectory $directory, array $options = null)
+    {
+        $this->name = $name;
+        $this->setDirectory($directory);
+        $this->setName($directory->getFlexType(), $name);
+        $this->setId($this->getName());
+
+        $uniqueId = $options['unique_id'] ?? null;
+        if (!$uniqueId) {
+            $uniqueId = md5($directory->getFlexType() . '-directory-' . $this->name);
+        }
+        $this->setUniqueId($uniqueId);
+
+        $this->setFlashLookupFolder($directory->getDirectoryBlueprint()->get('form/flash_folder') ?? 'tmp://forms/[SESSIONID]');
+        $this->form = $options['form'] ?? null;
+
+        if (Utils::isPositive($this->form['disabled'] ?? false)) {
+            $this->disable();
+        }
+
+        $this->initialize();
+    }
+
+    /**
+     * @return $this
+     */
+    public function initialize()
+    {
+        $this->messages = [];
+        $this->submitted = false;
+        $this->data =  new Data($this->directory->loadDirectoryConfig($this->name), $this->getBlueprint());
+        $this->files = [];
+        $this->unsetFlash();
+
+        /** @var FlexFormFlash $flash */
+        $flash = $this->getFlash();
+        if ($flash->exists()) {
+            $data = $flash->getData();
+            $includeOriginal = (bool)($this->getBlueprint()->form()['images']['original'] ?? null);
+
+            $directory = $flash->getDirectory();
+            if (null === $directory) {
+                throw new RuntimeException('Flash has no directory');
+            }
+            $this->directory = $directory;
+            $this->data = $data ? new Data($data, $this->getBlueprint()) : null;
+            $this->files = $flash->getFilesByFields($includeOriginal);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param string $uniqueId
+     * @return void
+     */
+    public function setUniqueId(string $uniqueId): void
+    {
+        if ($uniqueId !== '') {
+            $this->uniqueid = $uniqueId;
+        }
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $default
+     * @param string|null $separator
+     * @return mixed
+     */
+    public function get($name, $default = null, $separator = null)
+    {
+        switch (strtolower($name)) {
+            case 'id':
+            case 'uniqueid':
+            case 'name':
+            case 'noncename':
+            case 'nonceaction':
+            case 'action':
+            case 'data':
+            case 'files':
+            case 'errors';
+            case 'fields':
+            case 'blueprint':
+            case 'page':
+                $method = 'get' . $name;
+                return $this->{$method}();
+        }
+
+        return $this->traitGet($name, $default, $separator);
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @param string|null $separator
+     * @return $this
+     */
+    public function set($name, $value, $separator = null)
+    {
+        switch (strtolower($name)) {
+            case 'id':
+            case 'uniqueid':
+                $method = 'set' . $name;
+                return $this->{$method}();
+        }
+
+        return $this->traitSet($name, $value, $separator);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->flexName;
+    }
+
+    protected function setName(string $type, string $name): void
+    {
+        // Make sure that both type and name do not have dash (convert dashes to underscores).
+        $type = str_replace('-', '_', $type);
+        $name = str_replace('-', '_', $name);
+        $this->flexName = $name ? "flex_conf-{$type}-{$name}" : "flex_conf-{$type}";
+    }
+
+    /**
+     * @return Data|object
+     */
+    public function getData()
+    {
+        if (null === $this->data) {
+            $this->data = new Data([], $this->getBlueprint());
+        }
+
+        return $this->data;
+    }
+
+    /**
+     * Get a value from the form.
+     *
+     * Note: Used in form fields.
+     *
+     * @param string $name
+     * @return mixed
+     */
+    public function getValue(string $name)
+    {
+        // Attempt to get value from the form data.
+        $value = $this->data ? $this->data[$name] : null;
+
+        // Return the form data or fall back to the object property.
+        return $value ?? null;
+    }
+
+    /**
+     * @param string $name
+     * @return array|mixed|null
+     */
+    public function getDefaultValue(string $name)
+    {
+        return $this->getBlueprint()->getDefaultValue($name);
+    }
+
+    /**
+     * @return array
+     */
+    public function getDefaultValues(): array
+    {
+        return $this->getBlueprint()->getDefaults();
+    }
+    /**
+     * @return string
+     */
+    public function getFlexType(): string
+    {
+        return $this->directory->getFlexType();
+    }
+
+    /**
+     * Get form flash object.
+     *
+     * @return FormFlashInterface|FlexFormFlash
+     */
+    public function getFlash()
+    {
+        if (null === $this->flash) {
+            $grav = Grav::instance();
+            $config = [
+                'session_id' => $this->getSessionId(),
+                'unique_id' => $this->getUniqueId(),
+                'form_name' => $this->getName(),
+                'folder' => $this->getFlashFolder(),
+                'id' => $this->getFlashId(),
+                'directory' => $this->getDirectory()
+            ];
+
+            $this->flash = new FlexFormFlash($config);
+            $this->flash
+                ->setUrl($grav['uri']->url)
+                ->setUser($grav['user'] ?? null);
+        }
+
+        return $this->flash;
+    }
+
+    /**
+     * @return FlexDirectory
+     */
+    public function getDirectory(): FlexDirectory
+    {
+        return $this->directory;
+    }
+
+    /**
+     * @return Blueprint
+     */
+    public function getBlueprint(): Blueprint
+    {
+        if (null === $this->blueprint) {
+            try {
+                $blueprint = $this->getDirectory()->getDirectoryBlueprint();
+                if ($this->form) {
+                    // We have field overrides available.
+                    $blueprint->extend(['form' => $this->form], true);
+                    $blueprint->init();
+                }
+            } catch (RuntimeException $e) {
+                if (!isset($this->form['fields'])) {
+                    throw $e;
+                }
+
+                // Blueprint is not defined, but we have custom form fields available.
+                $blueprint = new Blueprint(null, ['form' => $this->form]);
+                $blueprint->load();
+                $blueprint->setScope('directory');
+                $blueprint->init();
+            }
+
+            $this->blueprint = $blueprint;
+        }
+
+        return $this->blueprint;
+    }
+
+    /**
+     * @return Route|null
+     */
+    public function getFileUploadAjaxRoute(): ?Route
+    {
+        return null;
+    }
+
+    /**
+     * @param string|null $field
+     * @param string|null $filename
+     * @return Route|null
+     */
+    public function getFileDeleteAjaxRoute($field = null, $filename = null): ?Route
+    {
+        return null;
+    }
+
+    /**
+     * @param array $params
+     * @param string|null $extension
+     * @return string
+     */
+    public function getMediaTaskRoute(array $params = [], string $extension = null): string
+    {
+        return '';
+    }
+
+    /**
+     * @param string $name
+     * @return mixed|null
+     */
+    #[\ReturnTypeWillChange]
+    public function __get($name)
+    {
+        $method = "get{$name}";
+        if (method_exists($this, $method)) {
+            return $this->{$method}();
+        }
+
+        $form = $this->getBlueprint()->form();
+
+        return $form[$name] ?? null;
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     */
+    #[\ReturnTypeWillChange]
+    public function __set($name, $value)
+    {
+        $method = "set{$name}";
+        if (method_exists($this, $method)) {
+            $this->{$method}($value);
+        }
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    #[\ReturnTypeWillChange]
+    public function __isset($name)
+    {
+        $method = "get{$name}";
+        if (method_exists($this, $method)) {
+            return true;
+        }
+
+        $form = $this->getBlueprint()->form();
+
+        return isset($form[$name]);
+    }
+
+    /**
+     * @param string $name
+     * @return void
+     */
+    #[\ReturnTypeWillChange]
+    public function __unset($name)
+    {
+    }
+
+    /**
+     * @return array|bool
+     */
+    protected function getUnserializeAllowedClasses()
+    {
+        return [FlexObject::class];
+    }
+
+    /**
+     * Note: this method clones the object.
+     *
+     * @param FlexDirectory $directory
+     * @return $this
+     */
+    protected function setDirectory(FlexDirectory $directory): self
+    {
+        $this->directory = $directory;
+
+        return $this;
+    }
+
+    /**
+     * @param string $layout
+     * @return Template|TemplateWrapper
+     * @throws LoaderError
+     * @throws SyntaxError
+     */
+    protected function getTemplate($layout)
+    {
+        $grav = Grav::instance();
+
+        /** @var Twig $twig */
+        $twig = $grav['twig'];
+
+        return $twig->twig()->resolveTemplate(
+            [
+                "flex-objects/layouts/{$this->getFlexType()}/form/{$layout}.html.twig",
+                "flex-objects/layouts/_default/form/{$layout}.html.twig",
+                "forms/{$layout}/form.html.twig",
+                'forms/default/form.html.twig'
+            ]
+        );
+    }
+
+    /**
+     * @param array $data
+     * @param array $files
+     * @return void
+     * @throws Exception
+     */
+    protected function doSubmit(array $data, array $files)
+    {
+        $this->directory->saveDirectoryConfig($this->name, $data);
+
+        $this->reset();
+    }
+
+    /**
+     * @return array
+     */
+    protected function doSerialize(): array
+    {
+        return $this->doTraitSerialize() + [
+                'form' => $this->form,
+                'directory' => $this->directory,
+                'flexName' => $this->flexName
+            ];
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    protected function doUnserialize(array $data): void
+    {
+        $this->doTraitUnserialize($data);
+
+        $this->form = $data['form'];
+        $this->directory = $data['directory'];
+        $this->flexName = $data['flexName'];
+    }
+
+    /**
+     * Filter validated data.
+     *
+     * @param ArrayAccess|Data|null $data
+     * @phpstan-param ArrayAccess<string,mixed>|Data|null $data
+     */
+    protected function filterData($data = null): void
+    {
+        if ($data instanceof Data) {
+            $data->filter(false, true);
+        }
+    }
+}
diff --git a/system/src/Grav/Framework/Flex/FlexForm.php b/system/src/Grav/Framework/Flex/FlexForm.php
index 6ded34590d..55759dff27 100644
--- a/system/src/Grav/Framework/Flex/FlexForm.php
+++ b/system/src/Grav/Framework/Flex/FlexForm.php
@@ -3,21 +3,28 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Flex;
 
+use ArrayAccess;
+use Exception;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\Data;
 use Grav\Common\Grav;
 use Grav\Common\Twig\Twig;
 use Grav\Common\Utils;
 use Grav\Framework\Flex\Interfaces\FlexFormInterface;
+use Grav\Framework\Flex\Interfaces\FlexObjectFormInterface;
 use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use Grav\Framework\Form\Interfaces\FormFlashInterface;
 use Grav\Framework\Form\Traits\FormTrait;
 use Grav\Framework\Route\Route;
+use JsonSerializable;
+use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccessWithGetters;
+use RuntimeException;
 use Twig\Error\LoaderError;
 use Twig\Error\SyntaxError;
 use Twig\Template;
@@ -27,48 +34,205 @@
  * Class FlexForm
  * @package Grav\Framework\Flex
  */
-class FlexForm implements FlexFormInterface
+class FlexForm implements FlexObjectFormInterface, JsonSerializable
 {
+    use NestedArrayAccessWithGetters {
+        NestedArrayAccessWithGetters::get as private traitGet;
+        NestedArrayAccessWithGetters::set as private traitSet;
+    }
     use FormTrait {
         FormTrait::doSerialize as doTraitSerialize;
         FormTrait::doUnserialize as doTraitUnserialize;
     }
 
+    /** @var array */
+    private $items = [];
+
     /** @var array|null */
     private $form;
-
     /** @var FlexObjectInterface */
     private $object;
+    /** @var string */
+    private $flexName;
+    /** @var callable|null */
+    private $submitMethod;
+
+    /**
+     * @param array $options    Options to initialize the form instance:
+     *                          (string) name: Form name, allows you to use custom form.
+     *                          (string) unique_id: Unique id for this form instance.
+     *                          (array) form: Custom form fields.
+     *                          (FlexObjectInterface) object: Object instance.
+     *                          (string) key: Object key, used only if object instance isn't given.
+     *                          (FlexDirectory) directory: Flex Directory, mandatory if object isn't given.
+     *
+     * @return FlexFormInterface
+     */
+    public static function instance(array $options = [])
+    {
+        if (isset($options['object'])) {
+            $object = $options['object'];
+            if (!$object instanceof FlexObjectInterface) {
+                throw new RuntimeException(__METHOD__ . "(): 'object' should be instance of FlexObjectInterface", 400);
+            }
+        } elseif (isset($options['directory'])) {
+            $directory = $options['directory'];
+            if (!$directory instanceof FlexDirectory) {
+                throw new RuntimeException(__METHOD__ . "(): 'directory' should be instance of FlexDirectory", 400);
+            }
+            $key = $options['key'] ?? '';
+            $object = $directory->getObject($key) ?? $directory->createObject([], $key);
+        } else {
+            throw new RuntimeException(__METHOD__ . "(): You need to pass option 'directory' or 'object'", 400);
+        }
+
+        $name = $options['name'] ?? '';
+
+        // There is no reason to pass object and directory.
+        unset($options['object'], $options['directory']);
+
+        return $object->getForm($name, $options);
+    }
 
     /**
      * FlexForm constructor.
      * @param string $name
      * @param FlexObjectInterface $object
-     * @param array|null $form
+     * @param array|null $options
      */
-    public function __construct(string $name, FlexObjectInterface $object, array $form = null)
+    public function __construct(string $name, FlexObjectInterface $object, array $options = null)
     {
         $this->name = $name;
-        $this->form = $form;
-
-        $uniqueId = $object->exists() ? $object->getStorageKey() : "{$object->getFlexType()}:new";
         $this->setObject($object);
+
+        if (isset($options['form']['name'])) {
+            // Use custom form name.
+            $this->flexName = $options['form']['name'];
+        } else {
+            // Use standard form name.
+            $this->setName($object->getFlexType(), $name);
+        }
         $this->setId($this->getName());
-        $this->setUniqueId(md5($uniqueId));
+
+        $uniqueId = $options['unique_id'] ?? null;
+        if (!$uniqueId) {
+            if ($object->exists()) {
+                $uniqueId = $object->getStorageKey();
+            } elseif ($object->hasKey()) {
+                $uniqueId = "{$object->getKey()}:new";
+            } else {
+                $uniqueId = "{$object->getFlexType()}:new";
+            }
+            $uniqueId = md5($uniqueId);
+        }
+        $this->setUniqueId($uniqueId);
+
+        $directory = $object->getFlexDirectory();
+        $this->setFlashLookupFolder($options['flash_folder'] ?? $directory->getBlueprint()->get('form/flash_folder') ?? 'tmp://forms/[SESSIONID]');
+        $this->form = $options['form'] ?? null;
+
+        if (Utils::isPositive($this->items['disabled'] ?? $this->form['disabled'] ?? false)) {
+            $this->disable();
+        }
+
+        if (!empty($options['reset'])) {
+            $this->getFlash()->delete();
+        }
+
+        $this->initialize();
+    }
+
+    /**
+     * @return $this
+     */
+    public function initialize()
+    {
         $this->messages = [];
         $this->submitted = false;
+        $this->data = null;
+        $this->files = [];
+        $this->unsetFlash();
 
+        /** @var FlexFormFlash $flash */
         $flash = $this->getFlash();
         if ($flash->exists()) {
             $data = $flash->getData();
-            $includeOriginal = (bool)($this->getBlueprint()->form()['images']['original'] ?? null);
+            if (null !== $data) {
+                $data = new Data($data, $this->getBlueprint());
+                $data->setKeepEmptyValues(true);
+                $data->setMissingValuesAsNull(true);
+            }
+
+            $object = $flash->getObject();
+            if (null === $object) {
+                throw new RuntimeException('Flash has no object');
+            }
+
+            $this->object = $object;
+            $this->data = $data;
 
-            $this->data = $data ? new Data($data, $this->getBlueprint()) : null;
+            $includeOriginal = (bool)($this->getBlueprint()->form()['images']['original'] ?? null);
             $this->files = $flash->getFilesByFields($includeOriginal);
-        } else {
-            $this->data = null;
-            $this->files = [];
         }
+
+        return $this;
+    }
+
+    /**
+     * @param string $uniqueId
+     * @return void
+     */
+    public function setUniqueId(string $uniqueId): void
+    {
+        if ($uniqueId !== '') {
+            $this->uniqueid = $uniqueId;
+        }
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $default
+     * @param string|null $separator
+     * @return mixed
+     */
+    public function get($name, $default = null, $separator = null)
+    {
+        switch (strtolower($name)) {
+            case 'id':
+            case 'uniqueid':
+            case 'name':
+            case 'noncename':
+            case 'nonceaction':
+            case 'action':
+            case 'data':
+            case 'files':
+            case 'errors';
+            case 'fields':
+            case 'blueprint':
+            case 'page':
+                $method = 'get' . $name;
+                return $this->{$method}();
+        }
+
+        return $this->traitGet($name, $default, $separator);
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @param string|null $separator
+     * @return FlexForm
+     */
+    public function set($name, $value, $separator = null)
+    {
+        switch (strtolower($name)) {
+            case 'id':
+            case 'uniqueid':
+                $method = 'set' . $name;
+                return $this->{$method}();
+        }
+
+        return $this->traitSet($name, $value, $separator);
     }
 
     /**
@@ -76,10 +240,27 @@ public function __construct(string $name, FlexObjectInterface $object, array $fo
      */
     public function getName(): string
     {
-        $object = $this->getObject();
-        $name = $this->name ?: 'object';
+        return $this->flexName;
+    }
+
+    /**
+     * @param callable|null $submitMethod
+     */
+    public function setSubmitMethod(?callable $submitMethod): void
+    {
+        $this->submitMethod = $submitMethod;
+    }
 
-        return "flex-{$object->getFlexType()}-{$name}";
+    /**
+     * @param string $type
+     * @param string $name
+     */
+    protected function setName(string $type, string $name): void
+    {
+        // Make sure that both type and name do not have dash (convert dashes to underscores).
+        $type = str_replace('-', '_', $type);
+        $name = str_replace('-', '_', $name);
+        $this->flexName = $name ? "flex-{$type}-{$name}" : "flex-{$type}";
     }
 
     /**
@@ -107,6 +288,10 @@ public function getValue(string $name)
         return $value ?? $this->getObject()->getFormValue($name);
     }
 
+    /**
+     * @param string $name
+     * @return array|mixed|null
+     */
     public function getDefaultValue(string $name)
     {
         return $this->object->getDefaultValue($name);
@@ -127,6 +312,33 @@ public function getFlexType(): string
         return $this->object->getFlexType();
     }
 
+    /**
+     * Get form flash object.
+     *
+     * @return FormFlashInterface|FlexFormFlash
+     */
+    public function getFlash()
+    {
+        if (null === $this->flash) {
+            $grav = Grav::instance();
+            $config = [
+                'session_id' => $this->getSessionId(),
+                'unique_id' => $this->getUniqueId(),
+                'form_name' => $this->getName(),
+                'folder' => $this->getFlashFolder(),
+                'id' => $this->getFlashId(),
+                'object' => $this->getObject()
+            ];
+
+            $this->flash = new FlexFormFlash($config);
+            $this->flash
+                ->setUrl($grav['uri']->url)
+                ->setUser($grav['user'] ?? null);
+        }
+
+        return $this->flash;
+    }
+
     /**
      * @return FlexObjectInterface
      */
@@ -135,6 +347,9 @@ public function getObject(): FlexObjectInterface
         return $this->object;
     }
 
+    /**
+     * @return FlexObjectInterface
+     */
     public function updateObject(): FlexObjectInterface
     {
         $data = $this->data instanceof Data ? $this->data->toArray() : [];
@@ -150,13 +365,13 @@ public function getBlueprint(): Blueprint
     {
         if (null === $this->blueprint) {
             try {
-                $blueprint = $this->getObject()->getBlueprint(Utils::isAdminPlugin() ? '' : $this->name);
+                $blueprint = $this->getObject()->getBlueprint($this->name);
                 if ($this->form) {
                     // We have field overrides available.
                     $blueprint->extend(['form' => $this->form], true);
                     $blueprint->init();
                 }
-            } catch (\RuntimeException $e) {
+            } catch (RuntimeException $e) {
                 if (!isset($this->form['fields'])) {
                     throw $e;
                 }
@@ -181,28 +396,39 @@ public function getFileUploadAjaxRoute(): ?Route
     {
         $object = $this->getObject();
         if (!method_exists($object, 'route')) {
-            return null;
+            /** @var Route $route */
+            $route = Grav::instance()['route'];
+
+            return $route->withExtension('json')->withGravParam('task', 'media.upload');
         }
 
         return $object->route('/edit.json/task:media.upload');
     }
 
     /**
-     * @param string $field
-     * @param string $filename
+     * @param string|null $field
+     * @param string|null $filename
      * @return Route|null
      */
-    public function getFileDeleteAjaxRoute($field, $filename): ?Route
+    public function getFileDeleteAjaxRoute($field = null, $filename = null): ?Route
     {
         $object = $this->getObject();
         if (!method_exists($object, 'route')) {
-            return null;
+            /** @var Route $route */
+            $route = Grav::instance()['route'];
+
+            return $route->withExtension('json')->withGravParam('task', 'media.delete');
         }
 
         return $object->route('/edit.json/task:media.delete');
     }
 
-    public function getMediaTaskRoute(array $params = [], $extension = null): string
+    /**
+     * @param array $params
+     * @param string|null $extension
+     * @return string
+     */
+    public function getMediaTaskRoute(array $params = [], string $extension = null): string
     {
         $grav = Grav::instance();
         /** @var Flex $flex */
@@ -216,17 +442,10 @@ public function getMediaTaskRoute(array $params = [], $extension = null): string
     }
 
     /**
-     * Implements \Serializable::unserialize().
-     *
-     * @param string $data
+     * @param string $name
+     * @return mixed|null
      */
-    public function unserialize($data): void
-    {
-        $data = unserialize($data, ['allowed_classes' => [FlexObject::class]]);
-
-        $this->doUnserialize($data);
-    }
-
+    #[\ReturnTypeWillChange]
     public function __get($name)
     {
         $method = "get{$name}";
@@ -239,6 +458,12 @@ public function __get($name)
         return $form[$name] ?? null;
     }
 
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     */
+    #[\ReturnTypeWillChange]
     public function __set($name, $value)
     {
         $method = "set{$name}";
@@ -247,6 +472,11 @@ public function __set($name, $value)
         }
     }
 
+    /**
+     * @param string $name
+     * @return bool
+     */
+    #[\ReturnTypeWillChange]
     public function __isset($name)
     {
         $method = "get{$name}";
@@ -259,10 +489,23 @@ public function __isset($name)
         return isset($form[$name]);
     }
 
+    /**
+     * @param string $name
+     * @return void
+     */
+    #[\ReturnTypeWillChange]
     public function __unset($name)
     {
     }
 
+    /**
+     * @return array|bool
+     */
+    protected function getUnserializeAllowedClasses()
+    {
+        return [FlexObject::class];
+    }
+
     /**
      * Note: this method clones the object.
      *
@@ -302,40 +545,63 @@ protected function getTemplate($layout)
     /**
      * @param array $data
      * @param array $files
-     * @throws \Exception
+     * @return void
+     * @throws Exception
      */
     protected function doSubmit(array $data, array $files)
     {
         /** @var FlexObject $object */
         $object = clone $this->getObject();
 
-        $object->update($data, $files);
-        $object->save();
+        $method = $this->submitMethod;
+        if ($method) {
+            $method($data, $files, $object);
+        } else {
+            $object->update($data, $files);
+            $object->save();
+        }
 
         $this->setObject($object);
         $this->reset();
     }
 
+    /**
+     * @return array
+     */
     protected function doSerialize(): array
     {
         return $this->doTraitSerialize() + [
+                'items' => $this->items,
+                'form' => $this->form,
                 'object' => $this->object,
+                'flexName' => $this->flexName,
+                'submitMethod' => $this->submitMethod,
             ];
     }
 
+    /**
+     * @param array $data
+     * @return void
+     */
     protected function doUnserialize(array $data): void
     {
         $this->doTraitUnserialize($data);
 
-        $this->object = $data['object'];
+        $this->items = $data['items'] ?? null;
+        $this->form = $data['form'] ?? null;
+        $this->object = $data['object'] ?? null;
+        $this->flexName = $data['flexName'] ?? null;
+        $this->submitMethod = $data['submitMethod'] ?? null;
     }
 
-        /**
+    /**
      * Filter validated data.
      *
-     * @param \ArrayAccess $data
+     * @param ArrayAccess|Data|null $data
+     * @return void
+     * @phpstan-param ArrayAccess<string,mixed>|Data|null $data
      */
-    protected function filterData(\ArrayAccess $data): void
+    protected function filterData($data = null): void
     {
         if ($data instanceof Data) {
             $data->filter(true, true);
diff --git a/system/src/Grav/Framework/Flex/FlexFormFlash.php b/system/src/Grav/Framework/Flex/FlexFormFlash.php
new file mode 100644
index 0000000000..3f52cdb6f0
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/FlexFormFlash.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex;
+
+use Grav\Framework\Flex\Interfaces\FlexInterface;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use Grav\Framework\Form\FormFlash;
+
+/**
+ * Class FlexFormFlash
+ * @package Grav\Framework\Flex
+ */
+class FlexFormFlash extends FormFlash
+{
+    /** @var FlexDirectory|null */
+    protected $directory;
+    /** @var FlexObjectInterface|null */
+    protected $object;
+
+    /** @var FlexInterface */
+    static protected $flex;
+
+    public static function setFlex(FlexInterface $flex): void
+    {
+        static::$flex = $flex;
+    }
+
+    /**
+     * @param FlexObjectInterface $object
+     * @return void
+     */
+    public function setObject(FlexObjectInterface $object): void
+    {
+        $this->object = $object;
+        $this->directory = $object->getFlexDirectory();
+    }
+
+    /**
+     * @return FlexObjectInterface|null
+     */
+    public function getObject(): ?FlexObjectInterface
+    {
+        return $this->object;
+    }
+
+    /**
+     * @param FlexDirectory $directory
+     */
+    public function setDirectory(FlexDirectory $directory): void
+    {
+        $this->directory = $directory;
+    }
+
+    /**
+     * @return FlexDirectory|null
+     */
+    public function getDirectory(): ?FlexDirectory
+    {
+        return $this->directory;
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize(): array
+    {
+        $serialized = parent::jsonSerialize();
+
+        $object = $this->getObject();
+        if ($object instanceof FlexObjectInterface) {
+            $serialized['object'] = [
+                'type' => $object->getFlexType(),
+                'key' => $object->getKey() ?: null,
+                'storage_key' => $object->getStorageKey(),
+                'timestamp' => $object->getTimestamp(),
+                'serialized' => $object->prepareStorage()
+            ];
+        } else {
+            $directory = $this->getDirectory();
+            if ($directory instanceof FlexDirectory) {
+                $serialized['directory'] = [
+                    'type' => $directory->getFlexType()
+                ];
+            }
+        }
+
+        return $serialized;
+    }
+
+    /**
+     * @param array|null $data
+     * @param array $config
+     * @return void
+     */
+    protected function init(?array $data, array $config): void
+    {
+        parent::init($data, $config);
+
+        $data = $data ?? [];
+        /** @var FlexObjectInterface|null $object */
+        $object = $config['object'] ?? null;
+        $create = true;
+        if ($object) {
+            $directory = $object->getFlexDirectory();
+            $create = !$object->exists();
+        } elseif (null === ($directory = $config['directory'] ?? null)) {
+            $flex = $config['flex'] ?? static::$flex;
+            $type = $data['object']['type'] ?? $data['directory']['type'] ?? null;
+            $directory = $flex && $type ? $flex->getDirectory($type) : null;
+        }
+
+        if ($directory && $create && isset($data['object']['serialized'])) {
+            // TODO: update instead of create new.
+            $object = $directory->createObject($data['object']['serialized'], $data['object']['key'] ?? '');
+        }
+
+        if ($object) {
+            $this->setObject($object);
+        } elseif ($directory) {
+            $this->setDirectory($directory);
+        }
+    }
+}
diff --git a/system/src/Grav/Framework/Flex/FlexIdentifier.php b/system/src/Grav/Framework/Flex/FlexIdentifier.php
new file mode 100644
index 0000000000..ec47ed8c97
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/FlexIdentifier.php
@@ -0,0 +1,75 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Flex;
+
+use Grav\Common\Grav;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use Grav\Framework\Object\Identifiers\Identifier;
+use RuntimeException;
+
+/**
+ * Interface IdentifierInterface
+ *
+ * @template T of FlexObjectInterface
+ * @extends Identifier<T>
+ */
+class FlexIdentifier extends Identifier
+{
+    /** @var string */
+    private $keyField;
+    /** @var FlexObjectInterface|null */
+    private $object = null;
+
+    /**
+     * @param FlexObjectInterface $object
+     * @return FlexIdentifier<T>
+     */
+    public static function createFromObject(FlexObjectInterface $object): FlexIdentifier
+    {
+        $instance = new static($object->getKey(), $object->getFlexType(), 'key');
+        $instance->setObject($object);
+
+        return $instance;
+    }
+
+    /**
+     * IdentifierInterface constructor.
+     * @param string $id
+     * @param string $type
+     * @param string $keyField
+     */
+    public function __construct(string $id, string $type, string $keyField = 'key')
+    {
+        parent::__construct($id, $type);
+
+        $this->keyField = $keyField;
+    }
+
+    /**
+     * @return T
+     */
+    public function getObject(): ?FlexObjectInterface
+    {
+        if (!isset($this->object)) {
+            /** @var Flex $flex */
+            $flex = Grav::instance()['flex'];
+
+            $this->object = $flex->getObject($this->getId(), $this->getType(), $this->keyField);
+        }
+
+        return $this->object;
+    }
+
+    /**
+     * @param T $object
+     */
+    public function setObject(FlexObjectInterface $object): void
+    {
+        $type = $this->getType();
+        if ($type !== $object->getFlexType()) {
+            throw new RuntimeException(sprintf('Object has to be type %s, %s given', $type, $object->getFlexType()));
+        }
+
+        $this->object = $object;
+    }
+}
diff --git a/system/src/Grav/Framework/Flex/FlexIndex.php b/system/src/Grav/Framework/Flex/FlexIndex.php
index 8b96b4a9ae..d02065fb7d 100644
--- a/system/src/Grav/Framework/Flex/FlexIndex.php
+++ b/system/src/Grav/Framework/Flex/FlexIndex.php
@@ -3,15 +3,18 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Flex;
 
+use Exception;
 use Grav\Common\Debugger;
+use Grav\Common\File\CompiledJsonFile;
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Grav;
+use Grav\Common\Inflector;
 use Grav\Common\Session;
 use Grav\Framework\Cache\CacheInterface;
 use Grav\Framework\Collection\CollectionInterface;
@@ -19,26 +22,39 @@
 use Grav\Framework\Flex\Interfaces\FlexIndexInterface;
 use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
 use Grav\Framework\Flex\Interfaces\FlexStorageInterface;
-use Grav\Framework\Object\Interfaces\ObjectCollectionInterface;
 use Grav\Framework\Object\Interfaces\ObjectInterface;
 use Grav\Framework\Object\ObjectIndex;
 use Monolog\Logger;
 use Psr\SimpleCache\InvalidArgumentException;
+use RuntimeException;
+use function count;
+use function get_class;
+use function in_array;
 
-class FlexIndex extends ObjectIndex implements FlexCollectionInterface, FlexIndexInterface
+/**
+ * Class FlexIndex
+ * @package Grav\Framework\Flex
+ * @template T of FlexObjectInterface
+ * @template C of FlexCollectionInterface
+ * @extends ObjectIndex<string,T,C>
+ * @implements FlexIndexInterface<T>
+ * @mixin C
+ */
+class FlexIndex extends ObjectIndex implements FlexIndexInterface
 {
-    /** @var FlexDirectory */
-    private $_flexDirectory;
+    const VERSION = 1;
 
+    /** @var FlexDirectory|null */
+    private $_flexDirectory;
     /** @var string */
-    private $_keyField;
-
+    private $_keyField = 'storage_key';
     /** @var array */
     private $_indexKeys;
 
     /**
      * @param FlexDirectory $directory
      * @return static
+     * @phpstan-return static<T,C>
      */
     public static function createFromStorage(FlexDirectory $directory)
     {
@@ -66,6 +82,23 @@ public static function loadEntriesFromStorage(FlexStorageInterface $storage): ar
         return $storage->getExistingKeys();
     }
 
+    /**
+     * You can define indexes for fast lookup.
+     *
+     * Primary key: $meta['key']
+     * Secondary keys:  $meta['my_field']
+     *
+     * @param array $meta
+     * @param array $data
+     * @param FlexStorageInterface $storage
+     * @return void
+     */
+    public static function updateObjectMeta(array &$meta, array $data, FlexStorageInterface $storage)
+    {
+        // For backwards compatibility, no need to call this method when you override this method.
+        static::updateIndexData($meta, $data);
+    }
+
     /**
      * Initializes a new FlexIndex.
      *
@@ -74,18 +107,65 @@ public static function loadEntriesFromStorage(FlexStorageInterface $storage): ar
      */
     public function __construct(array $entries = [], FlexDirectory $directory = null)
     {
+        // @phpstan-ignore-next-line
+        if (get_class($this) === __CLASS__) {
+            user_error('Using ' . __CLASS__ . ' directly is deprecated since Grav 1.7, use \Grav\Common\Flex\Types\Generic\GenericIndex or your own class instead', E_USER_DEPRECATED);
+        }
+
         parent::__construct($entries);
 
         $this->_flexDirectory = $directory;
         $this->setKeyField(null);
     }
 
+    /**
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->_key ?: $this->getFlexType() . '@@' . spl_object_hash($this);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function hasFlexFeature(string $name): bool
+    {
+        return in_array($name, $this->getFlexFeatures(), true);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function getFlexFeatures(): array
+    {
+        /** @var array $implements */
+        $implements = class_implements($this->getFlexDirectory()->getCollectionClass());
+
+        $list = [];
+        foreach ($implements as $interface) {
+            if ($pos = strrpos($interface, '\\')) {
+                $interface = substr($interface, $pos+1);
+            }
+
+            $list[] = Inflector::hyphenize(str_replace('Interface', '', $interface));
+        }
+
+        return $list;
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexCollectionInterface::search()
      */
     public function search(string $search, $properties = null, array $options = null)
     {
+        $directory = $this->getFlexDirectory();
+        $properties = $directory->getSearchProperties($properties);
+        $options = $directory->getSearchOptions($options);
+
         return $this->__call('search', [$search, $properties, $options]);
     }
 
@@ -98,7 +178,6 @@ public function sort(array $orderings)
         return $this->orderBy($orderings);
     }
 
-
     /**
      * {@inheritdoc}
      * @see FlexCollectionInterface::filterBy()
@@ -114,7 +193,7 @@ public function filterBy(array $filters)
      */
     public function getFlexType(): string
     {
-        return $this->_flexDirectory->getFlexType();
+        return $this->getFlexDirectory()->getFlexType();
     }
 
     /**
@@ -123,6 +202,10 @@ public function getFlexType(): string
      */
     public function getFlexDirectory(): FlexDirectory
     {
+        if (null === $this->_flexDirectory) {
+            throw new RuntimeException('Flex Directory not defined, object is not fully defined');
+        }
+
         return $this->_flexDirectory;
     }
 
@@ -152,7 +235,12 @@ public function getCacheKey(): string
      */
     public function getCacheChecksum(): string
     {
-        return sha1($this->getCacheKey() . json_encode($this->getTimestamps()));
+        $list = [];
+        foreach ($this->getEntries() as $key => $value) {
+            $list[$key] = $value['checksum'] ?? $value['storage_timestamp'];
+        }
+
+        return sha1((string)json_encode($list));
     }
 
     /**
@@ -181,7 +269,7 @@ public function getFlexKeys(): array
     {
         // Get storage keys for the objects.
         $keys = [];
-        $type = $this->_flexDirectory->getFlexType() . '.obj:';
+        $type = $this->getFlexDirectory()->getFlexType() . '.obj:';
 
         foreach ($this->getEntries() as $key => $value) {
             $keys[$key] = $value['flex_key'] ?? $type . $value['storage_key'];
@@ -201,7 +289,7 @@ public function withKeyField(string $keyField = null)
             return $this;
         }
 
-        $type = $keyField === 'flex_key' ? $this->_flexDirectory->getFlexType() . '.obj:' : '';
+        $type = $keyField === 'flex_key' ? $this->getFlexDirectory()->getFlexType() . '.obj:' : '';
         $entries = [];
         foreach ($this->getEntries() as $key => $value) {
             if (!isset($value['key'])) {
@@ -228,26 +316,21 @@ public function getIndex()
     }
 
     /**
-     * {@inheritdoc}
-     * @see FlexCollectionInterface::render()
+     * @return FlexCollectionInterface
+     * @phpstan-return C
      */
-    public function render(string $layout = null, array $context = [])
+    public function getCollection()
     {
-        return $this->__call('render', [$layout, $context]);
+        return $this->loadCollection();
     }
 
     /**
-     * @param bool $prefix
-     * @return string
-     * @deprecated 1.6 Use `->getFlexType()` instead.
+     * {@inheritdoc}
+     * @see FlexCollectionInterface::render()
      */
-    public function getType($prefix = false)
+    public function render(string $layout = null, array $context = [])
     {
-        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->getFlexType() method instead', E_USER_DEPRECATED);
-
-        $type = $prefix ? $this->getTypePrefix() : '';
-
-        return $type . $this->getFlexType();
+        return $this->__call('render', [$layout, $context]);
     }
 
     /**
@@ -270,9 +353,10 @@ public function getIndexMap(string $indexKey = null)
     }
 
     /**
+     * @param string $key
      * @return array
      */
-    public function getMetaData(string $key): array
+    public function getMetaData($key): array
     {
         return $this->getEntries()[$key] ?? [];
     }
@@ -280,9 +364,9 @@ public function getMetaData(string $key): array
     /**
      * @return string
      */
-    public function getKeyField() : string
+    public function getKeyField(): string
     {
-        return $this->_keyField ?? 'storage_key';
+        return $this->_keyField;
     }
 
     /**
@@ -291,12 +375,13 @@ public function getKeyField() : string
      */
     public function getCache(string $namespace = null)
     {
-        return $this->_flexDirectory->getCache($namespace);
+        return $this->getFlexDirectory()->getCache($namespace);
     }
 
     /**
      * @param array $orderings
-     * @return FlexIndex|FlexCollection
+     * @return static
+     * @phpstan-return static<T,C>
      */
     public function orderBy(array $orderings)
     {
@@ -304,6 +389,13 @@ public function orderBy(array $orderings)
             return $this;
         }
 
+        // Handle primary key alias.
+        $keyField = $this->getFlexDirectory()->getStorage()->getKeyField();
+        if ($keyField !== 'key' && $keyField !== 'storage_key' && isset($orderings[$keyField])) {
+            $orderings['key'] = $orderings[$keyField];
+            unset($orderings[$keyField]);
+        }
+
         // Check if ordering needs to load the objects.
         if (array_diff_key($orderings, $this->getIndexKeys())) {
             return $this->__call('orderBy', [$orderings]);
@@ -328,16 +420,16 @@ public function orderBy(array $orderings)
             }
 
             // Order by current field.
-            if ($ordering === 'DESC') {
-                arsort($search, SORT_NATURAL);
+            if (strtoupper($ordering) === 'DESC') {
+                arsort($search, SORT_NATURAL | SORT_FLAG_CASE);
             } else {
-                asort($search, SORT_NATURAL);
+                asort($search, SORT_NATURAL | SORT_FLAG_CASE);
             }
 
             $previous = $search;
         }
 
-        return $this->createFrom(array_replace($previous, $this->getEntries()));
+        return $this->createFrom(array_replace($previous ?? [], $this->getEntries()));
     }
 
     /**
@@ -348,13 +440,19 @@ public function call($method, array $arguments = [])
         return $this->__call('call', [$method, $arguments]);
     }
 
+    /**
+     * @param string $name
+     * @param array $arguments
+     * @return mixed
+     */
+    #[\ReturnTypeWillChange]
     public function __call($name, $arguments)
     {
         /** @var Debugger $debugger */
         $debugger = Grav::instance()['debugger'];
 
-        /** @var FlexCollection $className */
-        $className = $this->_flexDirectory->getCollectionClass();
+        /** @phpstan-var class-string $className */
+        $className = $this->getFlexDirectory()->getCollectionClass();
         $cachedMethods = $className::getCachedMethods();
 
         $flexType = $this->getFlexType();
@@ -364,30 +462,32 @@ public function __call($name, $arguments)
             if ($type === 'session') {
                 /** @var Session $session */
                 $session = Grav::instance()['session'];
-                $cacheKey = $session->getId() . $session->user->username;
+                $cacheKey = $session->getId() . ($session->user->username ?? '');
             } else {
                 $cacheKey = '';
             }
             $key = "{$flexType}.idx." . sha1($name . '.' . $cacheKey . json_encode($arguments) . $this->getCacheKey());
+            $checksum = $this->getCacheChecksum();
 
             $cache = $this->getCache('object');
 
             try {
-                $result = $cache->get($key);
+                $cached = $cache->get($key);
+                $test = $cached[0] ?? null;
+                $result = $test === $checksum ? ($cached[1] ?? null) : null;
 
                 // Make sure the keys aren't changed if the returned type is the same index type.
                 if ($result instanceof self && $flexType === $result->getFlexType()) {
                     $result = $result->withKeyField($this->getKeyField());
                 }
             } catch (InvalidArgumentException $e) {
-                /** @var Debugger $debugger */
-                $debugger = Grav::instance()['debugger'];
                 $debugger->addException($e);
             }
 
             if (!isset($result)) {
                 $collection = $this->loadCollection();
                 $result = $collection->{$name}(...$arguments);
+                $debugger->addMessage("Cache miss: '{$flexType}::{$name}()'", 'debug');
 
                 try {
                     // If flex collection is returned, convert it back to flex index.
@@ -397,7 +497,7 @@ public function __call($name, $arguments)
                         $cached = $result;
                     }
 
-                    $cache->set($key, $cached);
+                    $cache->set($key, [$checksum, $cached]);
                 } catch (InvalidArgumentException $e) {
                     $debugger->addException($e);
 
@@ -406,10 +506,13 @@ public function __call($name, $arguments)
             }
         } else {
             $collection = $this->loadCollection();
-            $result = $collection->{$name}(...$arguments);
-            if (!isset($cachedMethods[$name])) {
-                $class = \get_class($collection);
-                $debugger->addMessage("Call '{$class}:{$name}()' isn't cached", 'debug');
+            if (\is_callable([$collection, $name])) {
+                $result = $collection->{$name}(...$arguments);
+                if (!isset($cachedMethods[$name])) {
+                    $debugger->addMessage("Call '{$flexType}:{$name}()' isn't cached", 'debug');
+                }
+            } else {
+                $result = null;
             }
         }
 
@@ -417,32 +520,47 @@ public function __call($name, $arguments)
     }
 
     /**
-     * @return string
+     * @return array
      */
-    public function serialize()
+    public function __serialize(): array
     {
-        return serialize(['type' => $this->getFlexType(), 'entries' => $this->getEntries()]);
+        return ['type' => $this->getFlexType(), 'entries' => $this->getEntries()];
     }
 
     /**
-     * @param string $serialized
+     * @param array $data
+     * @return void
      */
-    public function unserialize($serialized)
+    public function __unserialize(array $data): void
     {
-        $data = unserialize($serialized, ['allowed_classes' => false]);
-
-        $this->_flexDirectory = Grav::instance()['flex_objects']->getDirectory($data['type']);
+        $this->_flexDirectory = Grav::instance()['flex']->getDirectory($data['type']);
         $this->setEntries($data['entries']);
     }
 
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
+    public function __debugInfo()
+    {
+        return [
+            'type:private' => $this->getFlexType(),
+            'key:private' => $this->getKey(),
+            'entries_key:private' => $this->getKeyField(),
+            'entries:private' => $this->getEntries()
+        ];
+    }
+
     /**
      * @param array $entries
-     * @param string $keyField
+     * @param string|null $keyField
      * @return static
+     * @phpstan-return static<T,C>
      */
     protected function createFrom(array $entries, string $keyField = null)
     {
-        $index = new static($entries, $this->_flexDirectory);
+        /** @phpstan-var static<T,C> $index */
+        $index = new static($entries, $this->getFlexDirectory());
         $index->setKeyField($keyField ?? $this->_keyField);
 
         return $index;
@@ -450,12 +568,16 @@ protected function createFrom(array $entries, string $keyField = null)
 
     /**
      * @param string|null $keyField
+     * @return void
      */
     protected function setKeyField(string $keyField = null)
     {
         $this->_keyField = $keyField ?? 'storage_key';
     }
 
+    /**
+     * @return array
+     */
     protected function getIndexKeys()
     {
         if (null === $this->_indexKeys) {
@@ -476,6 +598,7 @@ protected function getIndexKeys()
 
     /**
      * @param array $indexKeys
+     * @return void
      */
     protected function setIndexKeys(array $indexKeys)
     {
@@ -503,10 +626,12 @@ protected function getTypePrefix()
      * @param string $key
      * @param mixed $value
      * @return ObjectInterface|null
+     * @phpstan-return T|null
      */
     protected function loadElement($key, $value): ?ObjectInterface
     {
-        $objects = $this->_flexDirectory->loadObjects([$key => $value]);
+        /** @phpstan-var T[] $objects */
+        $objects = $this->getFlexDirectory()->loadObjects([$key => $value]);
 
         return $objects ? reset($objects): null;
     }
@@ -514,19 +639,27 @@ protected function loadElement($key, $value): ?ObjectInterface
     /**
      * @param array|null $entries
      * @return ObjectInterface[]
+     * @phpstan-return T[]
      */
     protected function loadElements(array $entries = null): array
     {
-        return $this->_flexDirectory->loadObjects($entries ?? $this->getEntries());
+        /** @phpstan-var T[] $objects */
+        $objects = $this->getFlexDirectory()->loadObjects($entries ?? $this->getEntries());
+
+        return $objects;
     }
 
     /**
      * @param array|null $entries
-     * @return ObjectCollectionInterface
+     * @return CollectionInterface
+     * @phpstan-return C
      */
     protected function loadCollection(array $entries = null): CollectionInterface
     {
-        return $this->_flexDirectory->loadCollection($entries ?? $this->getEntries(), $this->_keyField);
+        /** @var C $collection */
+        $collection = $this->getFlexDirectory()->loadCollection($entries ?? $this->getEntries(), $this->_keyField);
+
+        return $collection;
     }
 
     /**
@@ -544,17 +677,43 @@ protected function isAllowedElement($value): bool
      */
     protected function getElementMeta($object)
     {
-        return $object->getTimestamp();
+        return $object->getMetaData();
+    }
+
+    /**
+     * @param FlexObjectInterface $element
+     * @return string
+     */
+    protected function getCurrentKey($element)
+    {
+        $keyField = $this->getKeyField();
+        if ($keyField === 'storage_key') {
+            return $element->getStorageKey();
+        }
+        if ($keyField === 'flex_key') {
+            return $element->getFlexKey();
+        }
+        if ($keyField === 'key') {
+            return $element->getKey();
+        }
+
+        return $element->getKey();
     }
 
     /**
      * @param FlexStorageInterface $storage
      * @param array $index      Saved index
      * @param array $entries    Updated index
+     * @param array $options
      * @return array            Compiled list of entries
      */
-    protected static function updateIndexFile(FlexStorageInterface $storage, array $index, array $entries): array
+    protected static function updateIndexFile(FlexStorageInterface $storage, array $index, array $entries, array $options = []): array
     {
+        $indexFile = static::getIndexFile($storage);
+        if (null === $indexFile) {
+            return $entries;
+        }
+
         // Calculate removed objects.
         $removed = array_diff_key($index, $entries);
 
@@ -563,7 +722,7 @@ protected static function updateIndexFile(FlexStorageInterface $storage, array $
             $index = array_diff_key($index, $removed);
         }
 
-        if ($entries) {
+        if ($entries && empty($options['force_update'])) {
             // Calculate difference between saved index and current data.
             foreach ($index as $key => $entry) {
                 $storage_key = $entry['storage_key'] ?? null;
@@ -583,87 +742,139 @@ protected static function updateIndexFile(FlexStorageInterface $storage, array $
         }
 
         // Index should be updated, lock the index file for saving.
-        $indexFile = static::getIndexFile($storage);
         $indexFile->lock();
 
-        // Read all the data rows into an array.
+        // Read all the data rows into an array using chunks of 100.
         $keys = array_fill_keys(array_keys($entries), null);
-        $rows = $storage->readRows($keys);
+        $chunks = array_chunk($keys, 100, true);
+        $updated = $added = [];
+        foreach ($chunks as $keys) {
+            $rows = $storage->readRows($keys);
 
-        $keyField = $storage->getKeyField();
+            $keyField = $storage->getKeyField();
 
-        // Go through all the updated objects and refresh their index data.
-        $updated = $added = [];
-        foreach ($rows as $key => $row) {
-            if (null !== $row) {
-                $entry = ['key' => $key] + $entries[$key];
-                if ($keyField !== 'storage_key' && isset($row[$keyField])) {
-                    $entry['key'] = $row[$keyField];
-                }
-                static::updateIndexData($entry, $row);
-                if (isset($row['__error'])) {
-                    $entry['__error'] = true;
-                    static::onException(new \RuntimeException(sprintf('Object failed to load: %s (%s)', $key, $row['__error'])));
-                }
-                if (isset($index[$key])) {
-                    // Update object in the index.
-                    $updated[$key] = $entry;
-                } else {
-                    // Add object into the index.
-                    $added[$key] = $entry;
-                }
+            // Go through all the updated objects and refresh their index data.
+            foreach ($rows as $key => $row) {
+                if (null !== $row || !empty($options['include_missing'])) {
+                    $entry = $entries[$key] + ['key' => $key];
+                    if ($keyField !== 'storage_key' && isset($row[$keyField])) {
+                        $entry['key'] = $row[$keyField];
+                    }
+                    static::updateObjectMeta($entry, $row ?? [], $storage);
+                    if (isset($row['__ERROR'])) {
+                        $entry['__ERROR'] = true;
+                        static::onException(new RuntimeException(sprintf('Object failed to load: %s (%s)', $key,
+                            $row['__ERROR'])));
+                    }
+                    if (isset($index[$key])) {
+                        // Update object in the index.
+                        $updated[$key] = $entry;
+                    } else {
+                        // Add object into the index.
+                        $added[$key] = $entry;
+                    }
 
-                // Either way, update the entry.
-                $index[$key] = $entry;
-            } elseif (isset($index[$key])) {
-                // Remove object from the index.
-                $removed[$key] = $index[$key];
-                unset($index[$key]);
+                    // Either way, update the entry.
+                    $index[$key] = $entry;
+                } elseif (isset($index[$key])) {
+                    // Remove object from the index.
+                    $removed[$key] = $index[$key];
+                    unset($index[$key]);
+                }
             }
+            unset($rows);
         }
 
         // Sort the index before saving it.
-        ksort($index, SORT_NATURAL);
+        ksort($index, SORT_NATURAL | SORT_FLAG_CASE);
 
         static::onChanges($index, $added, $updated, $removed);
 
-        $indexFile->save(['count' => \count($index), 'index' => $index]);
+        $indexFile->save(['version' => static::VERSION, 'timestamp' => time(), 'count' => count($index), 'index' => $index]);
         $indexFile->unlock();
 
         return $index;
     }
 
+    /**
+     * @param array $entry
+     * @param array $data
+     * @return void
+     * @deprecated 1.7 Use static ::updateObjectMeta() method instead.
+     */
     protected static function updateIndexData(array &$entry, array $data)
     {
     }
 
-    protected static function loadEntriesFromIndex(FlexStorageInterface $storage)
+    /**
+     * @param FlexStorageInterface $storage
+     * @return array
+     */
+    protected static function loadIndex(FlexStorageInterface $storage)
     {
         $indexFile = static::getIndexFile($storage);
 
-        $data = [];
-        try {
-            $data = (array)$indexFile->content();
-        } catch (\Exception $e) {
-            $e = new \RuntimeException(sprintf('Index failed to load: %s', $e->getMessage()), $e->getCode(), $e);
+        if ($indexFile) {
+            $data = [];
+            try {
+                $data = (array)$indexFile->content();
+                $version = $data['version'] ?? null;
+                if ($version !== static::VERSION) {
+                    $data = [];
+                }
+            } catch (Exception $e) {
+                $e = new RuntimeException(sprintf('Index failed to load: %s', $e->getMessage()), $e->getCode(), $e);
 
-            static::onException($e);
+                static::onException($e);
+            }
+
+            if ($data) {
+                return $data;
+            }
         }
 
+        return ['version' => static::VERSION, 'timestamp' => 0, 'count' => 0, 'index' => []];
+    }
+
+    /**
+     * @param FlexStorageInterface $storage
+     * @return array
+     */
+    protected static function loadEntriesFromIndex(FlexStorageInterface $storage)
+    {
+        $data = static::loadIndex($storage);
+
         return $data['index'] ?? [];
     }
 
+    /**
+     * @param FlexStorageInterface $storage
+     * @return CompiledYamlFile|CompiledJsonFile|null
+     */
     protected static function getIndexFile(FlexStorageInterface $storage)
     {
+        if (!method_exists($storage, 'isIndexed') || !$storage->isIndexed()) {
+            return null;
+        }
+
+        $path = $storage->getStoragePath();
+        if (!$path) {
+            return null;
+        }
+
         // Load saved index file.
         $grav = Grav::instance();
         $locator = $grav['locator'];
-        $filename = $locator->findResource($storage->getStoragePath() . '/index.yaml', true, true);
+        $filename = $locator->findResource("{$path}/index.yaml", true, true);
 
         return CompiledYamlFile::instance($filename);
     }
 
-    protected static function onException(\Exception $e)
+    /**
+     * @param Exception $e
+     * @return void
+     */
+    protected static function onException(Exception $e)
     {
         $grav = Grav::instance();
 
@@ -677,28 +888,43 @@ protected static function onException(\Exception $e)
         $debugger->addMessage($e, 'error');
     }
 
+    /**
+     * @param array $entries
+     * @param array $added
+     * @param array $updated
+     * @param array $removed
+     * @return void
+     */
     protected static function onChanges(array $entries, array $added, array $updated, array $removed)
     {
-        $message = sprintf('Index updated, %d objects (%d added, %d updated, %d removed).', \count($entries), \count($added), \count($updated), \count($removed));
+        $addedCount = count($added);
+        $updatedCount = count($updated);
+        $removedCount = count($removed);
 
-        $grav = Grav::instance();
+        if ($addedCount + $updatedCount + $removedCount) {
+            $message = sprintf('Index updated, %d objects (%d added, %d updated, %d removed).', count($entries), $addedCount, $updatedCount, $removedCount);
 
-        /** @var Logger $logger */
-        $logger = $grav['log'];
-        $logger->addDebug($message);
+            $grav = Grav::instance();
 
-        /** @var Debugger $debugger */
-        $debugger = $grav['debugger'];
-        $debugger->addMessage($message, 'debug');
+            /** @var Debugger $debugger */
+            $debugger = $grav['debugger'];
+            $debugger->addMessage($message, 'debug');
+        }
     }
 
-    public function __debugInfo()
+    // DEPRECATED METHODS
+
+    /**
+     * @param bool $prefix
+     * @return string
+     * @deprecated 1.6 Use `->getFlexType()` instead.
+     */
+    public function getType($prefix = false)
     {
-        return [
-            'type:private' => $this->getFlexType(),
-            'key:private' => $this->getKey(),
-            'entries_key:private' => $this->getKeyField(),
-            'entries:private' => $this->getEntries()
-        ];
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->getFlexType() method instead', E_USER_DEPRECATED);
+
+        $type = $prefix ? $this->getTypePrefix() : '';
+
+        return $type . $this->getFlexType();
     }
 }
diff --git a/system/src/Grav/Framework/Flex/FlexObject.php b/system/src/Grav/Framework/Flex/FlexObject.php
index 7fbdbc0769..3808b2c649 100644
--- a/system/src/Grav/Framework/Flex/FlexObject.php
+++ b/system/src/Grav/Framework/Flex/FlexObject.php
@@ -3,23 +3,28 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Flex;
 
+use ArrayAccess;
+use Exception;
 use Grav\Common\Data\Blueprint;
+use Grav\Common\Data\Data;
 use Grav\Common\Debugger;
 use Grav\Common\Grav;
+use Grav\Common\Inflector;
 use Grav\Common\Twig\Twig;
+use Grav\Common\User\Interfaces\UserInterface;
 use Grav\Common\Utils;
 use Grav\Framework\Cache\CacheInterface;
 use Grav\Framework\ContentBlock\HtmlBlock;
 use Grav\Framework\Flex\Interfaces\FlexAuthorizeInterface;
-use Grav\Framework\Flex\Interfaces\FlexCollectionInterface;
 use Grav\Framework\Flex\Interfaces\FlexFormInterface;
 use Grav\Framework\Flex\Traits\FlexAuthorizeTrait;
+use Grav\Framework\Flex\Traits\FlexRelatedDirectoryTrait;
 use Grav\Framework\Object\Access\NestedArrayAccessTrait;
 use Grav\Framework\Object\Access\NestedPropertyTrait;
 use Grav\Framework\Object\Access\OverloadedPropertyTrait;
@@ -29,10 +34,18 @@
 use Grav\Framework\Object\Property\LazyPropertyTrait;
 use Psr\SimpleCache\InvalidArgumentException;
 use RocketTheme\Toolbox\Event\Event;
+use RuntimeException;
 use Twig\Error\LoaderError;
 use Twig\Error\SyntaxError;
 use Twig\Template;
 use Twig\TemplateWrapper;
+use function get_class;
+use function in_array;
+use function is_array;
+use function is_object;
+use function is_scalar;
+use function is_string;
+use function json_encode;
 
 /**
  * Class FlexObject
@@ -48,15 +61,22 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
     use OverloadedPropertyTrait;
     use NestedArrayAccessTrait;
     use FlexAuthorizeTrait;
+    use FlexRelatedDirectoryTrait;
 
     /** @var FlexDirectory */
     private $_flexDirectory;
     /** @var FlexFormInterface[] */
     private $_forms = [];
-    /** @var array */
-    private $_storage;
-    /** @var array */
-    protected $_changes;
+    /** @var Blueprint[] */
+    private $_blueprint = [];
+    /** @var array|null */
+    private $_meta;
+    /** @var array|null */
+    protected $_original;
+    /** @var string|null */
+    protected $storage_key;
+    /** @var int|null */
+    protected $storage_timestamp;
 
     /**
      * @return array
@@ -68,8 +88,10 @@ public static function getCachedMethods(): array
             'getType' => true,
             'getFlexType' => true,
             'getFlexDirectory' => true,
+            'hasFlexFeature' => true,
+            'getFlexFeatures' => true,
             'getCacheKey' => true,
-            'getCacheChecksum' => true,
+            'getCacheChecksum' => false,
             'getTimestamp' => true,
             'value' => true,
             'exists' => true,
@@ -81,10 +103,17 @@ public static function getCachedMethods(): array
         ];
     }
 
+    /**
+     * @param array $elements
+     * @param array $storage
+     * @param FlexDirectory $directory
+     * @param bool $validate
+     * @return static
+     */
     public static function createFromStorage(array $elements, array $storage, FlexDirectory $directory, bool $validate = false)
     {
         $instance = new static($elements, $storage['key'], $directory, $validate);
-        $instance->setStorage($storage);
+        $instance->setMetaData($storage);
 
         return $instance;
     }
@@ -95,14 +124,23 @@ public static function createFromStorage(array $elements, array $storage, FlexDi
      */
     public function __construct(array $elements, $key, FlexDirectory $directory, bool $validate = false)
     {
+        if (get_class($this) === __CLASS__) {
+            user_error('Using ' . __CLASS__ . ' directly is deprecated since Grav 1.7, use \Grav\Common\Flex\Types\Generic\GenericObject or your own class instead', E_USER_DEPRECATED);
+        }
+
         $this->_flexDirectory = $directory;
 
+        if (isset($elements['__META'])) {
+            $this->setMetaData($elements['__META']);
+            unset($elements['__META']);
+        }
+
         if ($validate) {
             $blueprint = $this->getFlexDirectory()->getBlueprint();
 
-            $blueprint->validate($elements);
+            $blueprint->validate($elements, ['xss_check' => false]);
 
-            $elements = $blueprint->filter($elements);
+            $elements = $blueprint->filter($elements, true, true);
         }
 
         $this->filterElements($elements);
@@ -110,6 +148,36 @@ public function __construct(array $elements, $key, FlexDirectory $directory, boo
         $this->objectConstruct($elements, $key);
     }
 
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function hasFlexFeature(string $name): bool
+    {
+        return in_array($name, $this->getFlexFeatures(), true);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexCommonInterface::hasFlexFeature()
+     */
+    public function getFlexFeatures(): array
+    {
+        /** @var array $implements */
+        $implements = class_implements($this);
+
+        $list = [];
+        foreach ($implements as $interface) {
+            if ($pos = strrpos($interface, '\\')) {
+                $interface = substr($interface, $pos+1);
+            }
+
+            $list[] = Inflector::hyphenize(str_replace('Interface', '', $interface));
+        }
+
+        return $list;
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexObjectInterface::getFlexType()
@@ -128,13 +196,71 @@ public function getFlexDirectory(): FlexDirectory
         return $this->_flexDirectory;
     }
 
+    /**
+     * Refresh object from the storage.
+     *
+     * @param bool $keepMissing
+     * @return bool True if the object was refreshed
+     */
+    public function refresh(bool $keepMissing = false): bool
+    {
+        $key = $this->getStorageKey();
+        if ('' === $key) {
+            return false;
+        }
+
+        $storage = $this->getFlexDirectory()->getStorage();
+        $meta = $storage->getMetaData([$key])[$key] ?? null;
+
+        $newChecksum = $meta['checksum'] ?? $meta['storage_timestamp'] ?? null;
+        $curChecksum = $this->_meta['checksum'] ?? $this->_meta['storage_timestamp'] ?? null;
+
+        // Check if object is up to date with the storage.
+        if (null === $newChecksum || $newChecksum === $curChecksum) {
+            return false;
+        }
+
+        // Get current elements (if requested).
+        $current = $keepMissing ? $this->getElements() : [];
+        // Get elements from the filesystem.
+        $elements = $storage->readRows([$key => null])[$key] ?? null;
+        if (null !== $elements) {
+            $meta = $elements['__META'] ?? $meta;
+            unset($elements['__META']);
+            $this->filterElements($elements);
+            $newKey = $meta['key'] ?? $this->getKey();
+            if ($meta) {
+                $this->setMetaData($meta);
+            }
+            $this->objectConstruct($elements, $newKey);
+
+            if ($current) {
+                // Inject back elements which are missing in the filesystem.
+                $data = $this->getBlueprint()->flattenData($current);
+                foreach ($data as $property => $value) {
+                    if (strpos($property, '.') === false) {
+                        $this->defProperty($property, $value);
+                    } else {
+                        $this->defNestedProperty($property, $value);
+                    }
+                }
+            }
+
+            /** @var Debugger $debugger */
+            $debugger = Grav::instance()['debugger'];
+            $debugger->addMessage("Refreshed {$this->getFlexType()} object {$this->getKey()}", 'debug');
+        }
+
+        return true;
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexObjectInterface::getTimestamp()
      */
     public function getTimestamp(): int
     {
-        return $this->_storage['storage_timestamp'] ?? 0;
+        return $this->_meta['storage_timestamp'] ?? 0;
     }
 
     /**
@@ -143,7 +269,7 @@ public function getTimestamp(): int
      */
     public function getCacheKey(): string
     {
-        return $this->getTypePrefix() . $this->getFlexType() . '.' . $this->getStorageKey();
+        return $this->hasKey() ? $this->getTypePrefix() . $this->getFlexType() . '.' . $this->getKey() : '';
     }
 
     /**
@@ -152,7 +278,7 @@ public function getCacheKey(): string
      */
     public function getCacheChecksum(): string
     {
-        return (string)$this->getTimestamp();
+        return (string)($this->_meta['checksum'] ?? $this->getTimestamp());
     }
 
     /**
@@ -161,19 +287,17 @@ public function getCacheChecksum(): string
      */
     public function search(string $search, $properties = null, array $options = null): float
     {
-        $options = $options ?? $this->getFlexDirectory()->getConfig('data.search.options', []);
-        $properties = $properties ?? $this->getFlexDirectory()->getConfig('data.search.fields', []);
-        if (!$properties) {
-            foreach ($this->getFlexDirectory()->getConfig('admin.list.fields', []) as $property => $value) {
-                if (!empty($value['link'])) {
-                    $properties[] = $property;
-                }
-            }
-        }
+        $directory = $this->getFlexDirectory();
+        $properties = $directory->getSearchProperties($properties);
+        $options = $directory->getSearchOptions($options);
 
         $weight = 0;
-        foreach ((array)$properties as $property) {
-            $weight += $this->searchNestedProperty($property, $search, $options);
+        foreach ($properties as $property) {
+            if (strpos($property, '.')) {
+                $weight += $this->searchNestedProperty($property, $search, $options);
+            } else {
+                $weight += $this->searchProperty($property, $search, $options);
+            }
         }
 
         return $weight > 0 ? min($weight, 1) : 0;
@@ -185,7 +309,7 @@ public function search(string $search, $properties = null, array $options = null
      */
     public function getKey()
     {
-        return $this->_key ?: $this->getFlexType() . '@@' . spl_object_hash($this);
+        return (string)$this->_key;
     }
 
     /**
@@ -194,7 +318,13 @@ public function getKey()
      */
     public function getFlexKey(): string
     {
-        return $this->_storage['flex_key'] ?? $this->_flexDirectory->getFlexType() . '.obj:' . $this->getStorageKey();
+        $key = $this->_meta['flex_key'] ?? null;
+
+        if (!$key && $key = $this->getStorageKey()) {
+            $key = $this->_flexDirectory->getFlexType() . '.obj:' . $key;
+        }
+
+        return (string)$key;
     }
 
     /**
@@ -203,7 +333,7 @@ public function getFlexKey(): string
      */
     public function getStorageKey(): string
     {
-        return $this->_storage['storage_key'] ?? $this->getTypePrefix() . $this->getFlexType() . '@@' . spl_object_hash($this);
+        return (string)($this->storage_key ?? $this->_meta['storage_key'] ?? null);
     }
 
     /**
@@ -212,7 +342,7 @@ public function getStorageKey(): string
      */
     public function getMetaData(): array
     {
-        return $this->getStorage();
+        return $this->_meta ?? [];
     }
 
     /**
@@ -234,7 +364,7 @@ public function exists(): bool
      */
     public function searchProperty(string $property, string $search, array $options = null): float
     {
-        $options = $options ?? $this->getFlexDirectory()->getConfig('data.search.options', []);
+        $options = $options ?? (array)$this->getFlexDirectory()->getConfig('data.search.options');
         $value = $this->getProperty($property);
 
         return $this->searchValue($property, $value, $search, $options);
@@ -248,8 +378,12 @@ public function searchProperty(string $property, string $search, array $options
      */
     public function searchNestedProperty(string $property, string $search, array $options = null): float
     {
-        $options = $options ?? $this->getFlexDirectory()->getConfig('data.search.options', []);
-        $value = $this->getNestedProperty($property);
+        $options = $options ?? (array)$this->getFlexDirectory()->getConfig('data.search.options');
+        if ($property === 'key') {
+            $value = $this->getKey();
+        } else {
+            $value = $this->getNestedProperty($property);
+        }
 
         return $this->searchValue($property, $value, $search, $options);
     }
@@ -263,24 +397,38 @@ public function searchNestedProperty(string $property, string $search, array $op
      */
     protected function searchValue(string $name, $value, string $search, array $options = null): float
     {
-        $search = trim($search);
+        $options = $options ?? [];
 
+        // Ignore empty search strings.
+        $search = trim($search);
         if ($search === '') {
             return 0;
         }
 
-        if (!\is_string($value) || $value === '') {
+        // Search only non-empty string values.
+        if (!is_string($value) || $value === '') {
             return 0;
         }
 
+        $caseSensitive = $options['case_sensitive'] ?? false;
+
         $tested = false;
-        if (($tested |= !empty($options['starts_with'])) && Utils::startsWith($value, $search, $options['case_sensitive'] ?? false)) {
+        if (($tested |= !empty($options['same_as']))) {
+            if ($caseSensitive) {
+                if ($value === $search) {
+                    return (float)$options['same_as'];
+                }
+            } elseif (mb_strtolower($value) === mb_strtolower($search)) {
+                return (float)$options['same_as'];
+            }
+        }
+        if (($tested |= !empty($options['starts_with'])) && Utils::startsWith($value, $search, $caseSensitive)) {
             return (float)$options['starts_with'];
         }
-        if (($tested |= !empty($options['ends_with'])) && Utils::endsWith($value, $search, $options['case_sensitive'] ?? false)) {
+        if (($tested |= !empty($options['ends_with'])) && Utils::endsWith($value, $search, $caseSensitive)) {
             return (float)$options['ends_with'];
         }
-        if ((!$tested || !empty($options['contains'])) && Utils::contains($value, $search, $options['case_sensitive'] ?? false)) {
+        if ((!$tested || !empty($options['contains'])) && Utils::contains($value, $search, $caseSensitive)) {
             return (float)($options['contains'] ?? 1);
         }
 
@@ -288,35 +436,68 @@ protected function searchValue(string $name, $value, string $search, array $opti
     }
 
     /**
-     * Get any changes based on data sent to update
+     * Get original data before update
      *
      * @return array
      */
-    public function getChanges(): array
+    public function getOriginalData(): array
     {
-        return $this->_changes ?? [];
+        return $this->_original ?? [];
     }
 
     /**
-     * @return string
+     * Get diff array from the object.
+     *
+     * @return array
      */
-    protected function getTypePrefix(): string
+    public function getDiff(): array
     {
-        return 'o.';
+        $blueprint = $this->getBlueprint();
+
+        $flattenOriginal = $blueprint->flattenData($this->getOriginalData());
+        $flattenElements = $blueprint->flattenData($this->getElements());
+        $removedElements = array_diff_key($flattenOriginal, $flattenElements);
+        $diff = [];
+
+        // Include all added or changed keys.
+        foreach ($flattenElements as $key => $value) {
+            $orig = $flattenOriginal[$key] ?? null;
+            if ($orig !== $value) {
+                $diff[$key] = ['old' => $orig, 'new' => $value];
+            }
+        }
+
+        // Include all removed keys.
+        foreach ($removedElements as $key => $value) {
+            $diff[$key] = ['old' => $value, 'new' => null];
+        }
+
+        return $diff;
     }
 
     /**
-     * @param bool $prefix
-     * @return string
-     * @deprecated 1.6 Use `->getFlexType()` instead.
+     * Get any changes from the object.
+     *
+     * @return array
      */
-    public function getType($prefix = false)
+    public function getChanges(): array
     {
-        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use ->getFlexType() method instead', E_USER_DEPRECATED);
+        $diff = $this->getDiff();
 
-        $type = $prefix ? $this->getTypePrefix() : '';
+        $data = new Data();
+        foreach ($diff as $key => $change) {
+            $data->set($key, $change['new']);
+        }
 
-        return $type . $this->getFlexType();
+        return $data->toArray();
+    }
+
+    /**
+     * @return string
+     */
+    protected function getTypePrefix(): string
+    {
+        return 'o.';
     }
 
     /**
@@ -345,7 +526,7 @@ public function getCache(string $namespace = null)
      */
     public function setStorageKey($key = null)
     {
-        $this->_storage['storage_key'] = $key;
+        $this->storage_key = $key ?? '';
 
         return $this;
     }
@@ -356,7 +537,7 @@ public function setStorageKey($key = null)
      */
     public function setTimestamp($timestamp = null)
     {
-        $this->_storage['storage_timestamp'] = $timestamp ?? time();
+        $this->storage_timestamp = $timestamp ?? time();
 
         return $this;
     }
@@ -367,8 +548,9 @@ public function setTimestamp($timestamp = null)
      */
     public function render(string $layout = null, array $context = [])
     {
-        if (null === $layout) {
-            $layout = 'default';
+        if (!$layout) {
+            $config = $this->getTemplateConfig();
+            $layout = $config['object']['defaults']['layout'] ?? 'default';
         }
 
         $type = $this->getFlexType();
@@ -379,20 +561,28 @@ public function render(string $layout = null, array $context = [])
         $debugger = $grav['debugger'];
         $debugger->startTimer('flex-object-' . ($debugKey =  uniqid($type, false)), 'Render Object ' . $type . ' (' . $layout . ')');
 
-        $cache = $key = null;
-        foreach ($context as $value) {
-            if (!\is_scalar($value)) {
-                $key = false;
+        $key = $this->getCacheKey();
+
+        // Disable caching if context isn't all scalars.
+        if ($key) {
+            foreach ($context as $value) {
+                if (!is_scalar($value)) {
+                    $key = '';
+                    break;
+                }
             }
         }
 
-        if ($key !== false) {
-            $key = md5($this->getCacheKey() . '.' . $layout . json_encode($context));
+        if ($key) {
+            // Create a new key which includes layout and context.
+            $key = md5($key . '.' . $layout . json_encode($context));
             $cache = $this->getCache('render');
+        } else {
+            $cache = null;
         }
 
         try {
-            $data = $cache && $key ? $cache->get($key) : null;
+            $data = $cache ? $cache->get($key) : null;
 
             $block = $data ? HtmlBlock::fromArray($data) : null;
         } catch (InvalidArgumentException $e) {
@@ -413,18 +603,28 @@ public function render(string $layout = null, array $context = [])
         if (!$block) {
             $block = HtmlBlock::create($key ?: null);
             $block->setChecksum($checksum);
-            if ($key === false) {
+            if (!$cache) {
                 $block->disableCache();
             }
 
-            $grav->fireEvent('onFlexObjectRender', new Event([
+            $event = new Event([
+                'type' => 'flex',
+                'directory' => $this->getFlexDirectory(),
                 'object' => $this,
                 'layout' => &$layout,
                 'context' => &$context
-            ]));
+            ]);
+            $this->triggerEvent('onRender', $event);
 
             $output = $this->getTemplate($layout)->render(
-                ['grav' => $grav, 'config' => $grav['config'], 'block' => $block, 'object' => $this, 'layout' => $layout] + $context
+                [
+                    'grav' => $grav,
+                    'config' => $grav['config'],
+                    'block' => $block,
+                    'directory' => $this->getFlexDirectory(),
+                    'object' => $this,
+                    'layout' => $layout
+                ] + $context
             );
 
             if ($debugger->enabled()) {
@@ -435,7 +635,7 @@ public function render(string $layout = null, array $context = [])
             $block->setContent($output);
 
             try {
-                $cache && $key && $block->isCached() && $cache->set($key, $block->toArray());
+                $cache && $block->isCached() && $cache->set($key, $block->toArray());
             } catch (InvalidArgumentException $e) {
                 $debugger->addException($e);
             }
@@ -449,6 +649,7 @@ public function render(string $layout = null, array $context = [])
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getElements();
@@ -460,16 +661,7 @@ public function jsonSerialize()
      */
     public function prepareStorage(): array
     {
-        return $this->getElements();
-    }
-
-    /**
-     * @param string $name
-     * @return $this
-     */
-    public function triggerEvent($name)
-    {
-        return $this;
+        return ['__META' => $this->getMetaData()] + $this->getElements();
     }
 
     /**
@@ -479,32 +671,35 @@ public function triggerEvent($name)
     public function update(array $data, array $files = [])
     {
         if ($data) {
+            // Get currently stored data.
+            $elements = $this->getElements();
+
+            // Store original version of the object.
+            if ($this->_original === null) {
+                $this->_original = $elements;
+            }
+
             $blueprint = $this->getBlueprint();
 
             // Process updated data through the object filters.
             $this->filterElements($data);
 
-            // Get currently stored data.
-            $elements = $this->getElements();
-
             // Merge existing object to the test data to be validated.
             $test = $blueprint->mergeData($elements, $data);
 
             // Validate and filter elements and throw an error if any issues were found.
-            $blueprint->validate($test + ['storage_key' => $this->getStorageKey(), 'timestamp' => $this->getTimestamp()]);
-            $data = $blueprint->filter($data, false, true);
+            $blueprint->validate($test + ['storage_key' => $this->getStorageKey(), 'timestamp' => $this->getTimestamp()], ['xss_check' => false]);
+            $data = $blueprint->filter($data, true, true);
 
             // Finally update the object.
-            foreach ($blueprint->flattenData($data) as $key => $value) {
+            $flattenData = $blueprint->flattenData($data);
+            foreach ($flattenData as $key => $value) {
                 if ($value === null) {
                     $this->unsetNestedProperty($key);
                 } else {
                     $this->setNestedProperty($key, $value);
                 }
             }
-
-            // Store the changes
-            $this->_changes = Utils::arrayDiffMultidimensional($this->getElements(), $elements);
         }
 
         if ($files && method_exists($this, 'setUpdatedMedia')) {
@@ -525,12 +720,34 @@ public function create(string $key = null)
         }
 
         if ($this->exists()) {
-            throw new \RuntimeException('Cannot create new object (Already exists)');
+            throw new RuntimeException('Cannot create new object (Already exists)');
         }
 
         return $this->save();
     }
 
+    /**
+     * @param string|null $key
+     * @return FlexObject|FlexObjectInterface
+     */
+    public function createCopy(string $key = null)
+    {
+        $this->markAsCopy();
+
+        return $this->create($key);
+    }
+
+    /**
+     * @param UserInterface|null $user
+     */
+    public function check(UserInterface $user = null): void
+    {
+        // If user has been provided, check if the user has permissions to save this object.
+        if ($user && !$this->isAuthorized('save', null, $user)) {
+            throw new \RuntimeException('Forbidden', 403);
+        }
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexObjectInterface::save()
@@ -539,36 +756,49 @@ public function save()
     {
         $this->triggerEvent('onBeforeSave');
 
-        $result = $this->getFlexDirectory()->getStorage()->replaceRows([$this->getStorageKey() => $this->prepareStorage()]);
+        $storage = $this->getFlexDirectory()->getStorage();
+
+        $storageKey = $this->getStorageKey() ?:  '@@' . spl_object_hash($this);
+
+        $result = $storage->replaceRows([$storageKey => $this->prepareStorage()]);
+
+        if (method_exists($this, 'clearMediaCache')) {
+            $this->clearMediaCache();
+        }
 
         $value = reset($result);
-        $storageKey = (string)key($result);
-        if ($value && $storageKey) {
-            $this->setStorageKey($storageKey);
-            if (!$this->hasKey()) {
-                $this->setKey($storageKey);
+        $meta = $value['__META'] ?? null;
+        if ($meta) {
+            /** @phpstan-var class-string $indexClass */
+            $indexClass = $this->getFlexDirectory()->getIndexClass();
+            $indexClass::updateObjectMeta($meta, $value, $storage);
+            $this->_meta = $meta;
+        }
+
+        if ($value) {
+            $storageKey = $meta['storage_key'] ?? (string)key($result);
+            if ($storageKey !== '') {
+                $this->setStorageKey($storageKey);
             }
+
+            $newKey = $meta['key'] ?? ($this->hasKey() ? $this->getKey() : null);
+            $this->setKey($newKey ?? $storageKey);
         }
 
         // FIXME: For some reason locator caching isn't cleared for the file, investigate!
         $locator = Grav::instance()['locator'];
         $locator->clearCache();
 
-        // Make sure that the object exists before continuing (just in case).
-        if (!$this->exists()) {
-            throw new \RuntimeException('Saving failed: Object does not exist!');
-        }
-
         if (method_exists($this, 'saveUpdatedMedia')) {
             $this->saveUpdatedMedia();
         }
 
         try {
-            $this->getFlexDirectory()->clearCache();
+            $this->getFlexDirectory()->reloadIndex();
             if (method_exists($this, 'clearMediaCache')) {
                 $this->clearMediaCache();
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             /** @var Debugger $debugger */
             $debugger = Grav::instance()['debugger'];
             $debugger->addException($e);
@@ -587,16 +817,20 @@ public function save()
      */
     public function delete()
     {
+        if (!$this->exists()) {
+            return $this;
+        }
+
         $this->triggerEvent('onBeforeDelete');
 
         $this->getFlexDirectory()->getStorage()->deleteRows([$this->getStorageKey() => $this->prepareStorage()]);
 
         try {
-            $this->getFlexDirectory()->clearCache();
+            $this->getFlexDirectory()->reloadIndex();
             if (method_exists($this, 'clearMediaCache')) {
                 $this->clearMediaCache();
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             /** @var Debugger $debugger */
             $debugger = Grav::instance()['debugger'];
             $debugger->addException($e);
@@ -615,20 +849,29 @@ public function delete()
      */
     public function getBlueprint(string $name = '')
     {
-        return $this->_flexDirectory->getBlueprint($name ? '.' . $name : $name);
+        if (!isset($this->_blueprint[$name])) {
+            $blueprint = $this->doGetBlueprint($name);
+            $blueprint->setScope('object');
+            $blueprint->setObject($this);
+
+            $this->_blueprint[$name] = $blueprint->init();
+        }
+
+        return $this->_blueprint[$name];
     }
 
     /**
      * {@inheritdoc}
      * @see FlexObjectInterface::getForm()
      */
-    public function getForm(string $name = '', array $form = null)
+    public function getForm(string $name = '', array $options = null)
     {
-        if (!isset($this->_forms[$name])) {
-            $this->_forms[$name] = $this->createFormObject($name, $form);
+        $hash = $name . '-' . md5(json_encode($options, JSON_THROW_ON_ERROR));
+        if (!isset($this->_forms[$hash])) {
+            $this->_forms[$hash] = $this->createFormObject($name, $options);
         }
 
-        return $this->_forms[$name];
+        return $this->_forms[$hash];
     }
 
     /**
@@ -638,8 +881,8 @@ public function getForm(string $name = '', array $form = null)
     public function getDefaultValue(string $name, string $separator = null)
     {
         $separator = $separator ?: '.';
-        $path = explode($separator, $name) ?: [];
-        $offset = array_shift($path) ?? '';
+        $path = explode($separator, $name);
+        $offset = array_shift($path);
 
         $current = $this->getDefaultValues();
 
@@ -652,9 +895,9 @@ public function getDefaultValue(string $name, string $separator = null)
         while ($path) {
             $offset = array_shift($path);
 
-            if ((\is_array($current) || $current instanceof \ArrayAccess) && isset($current[$offset])) {
+            if ((is_array($current) || $current instanceof ArrayAccess) && isset($current[$offset])) {
                 $current = $current[$offset];
-            } elseif (\is_object($current) && isset($current->{$offset})) {
+            } elseif (is_object($current) && isset($current->{$offset})) {
                 $current = $current->{$offset};
             } else {
                 return null;
@@ -689,16 +932,11 @@ public function getFormValue(string $name, $default = null, string $separator =
     }
 
     /**
-     * @param string $name
-     * @param mixed|null $default
-     * @param string|null $separator
-     * @return mixed
-     *
-     * @deprecated 1.6 Use ->getFormValue() method instead.
+     * @param FlexDirectory $directory
      */
-    public function value($name, $default = null, $separator = null)
+    public function setFlexDirectory(FlexDirectory $directory): void
     {
-        return $this->getFormValue($name, $default, $separator);
+        $this->_flexDirectory = $directory;
     }
 
     /**
@@ -706,21 +944,61 @@ public function value($name, $default = null, $separator = null)
      *
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function __toString()
     {
         return $this->getFlexKey();
     }
 
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
     public function __debugInfo()
     {
         return [
             'type:private' => $this->getFlexType(),
+            'storage_key:protected' => $this->getStorageKey(),
+            'storage_timestamp:protected' => $this->getTimestamp(),
             'key:private' => $this->getKey(),
             'elements:private' => $this->getElements(),
-            'storage:private' => $this->getStorage()
+            'storage:private' => $this->getMetaData()
         ];
     }
 
+    /**
+     * Clone object.
+     */
+    #[\ReturnTypeWillChange]
+    public function __clone()
+    {
+        // Allows future compatibility as parent::__clone() works.
+    }
+
+    protected function markAsCopy(): void
+    {
+        $meta = $this->getMetaData();
+        $meta['copy'] = true;
+        $this->_meta = $meta;
+    }
+
+    /**
+     * @param string $name
+     * @return Blueprint
+     */
+    protected function doGetBlueprint(string $name = ''): Blueprint
+    {
+        return $this->_flexDirectory->getBlueprint($name ? '.' . $name : $name);
+    }
+
+    /**
+     * @param array $meta
+     */
+    protected function setMetaData(array $meta): void
+    {
+        $this->_meta = $meta;
+    }
+
     /**
      * @return array
      */
@@ -730,14 +1008,16 @@ protected function doSerialize(): array
             'type' => $this->getFlexType(),
             'key' => $this->getKey(),
             'elements' => $this->getElements(),
-            'storage' => $this->getStorage()
+            'storage' => $this->getMetaData()
         ];
     }
 
     /**
      * @param array $serialized
+     * @param FlexDirectory|null $directory
+     * @return void
      */
-    protected function doUnserialize(array $serialized): void
+    protected function doUnserialize(array $serialized, FlexDirectory $directory = null): void
     {
         $type = $serialized['type'] ?? 'unknown';
 
@@ -745,74 +1025,198 @@ protected function doUnserialize(array $serialized): void
             throw new \InvalidArgumentException("Cannot unserialize '{$type}': Bad data");
         }
 
-        $grav = Grav::instance();
-        /** @var Flex|null $flex */
-        $flex = $grav['flex_objects'] ?? null;
-        $directory = $flex ? $flex->getDirectory($type) : null;
-        if (!$directory) {
-            throw new \InvalidArgumentException("Cannot unserialize '{$type}': Not found");
+        if (null === $directory) {
+            $directory = $this->getFlexContainer()->getDirectory($type);
+            if (!$directory) {
+                throw new \InvalidArgumentException("Cannot unserialize Flex type '{$type}': Directory not found");
+            }
         }
+
         $this->setFlexDirectory($directory);
-        $this->setStorage($serialized['storage']);
+        $this->setMetaData($serialized['storage']);
         $this->setKey($serialized['key']);
         $this->setElements($serialized['elements']);
     }
 
     /**
-     * @param FlexDirectory $directory
+     * @return array
      */
-    public function setFlexDirectory(FlexDirectory $directory): void
+    protected function getTemplateConfig()
     {
-        $this->_flexDirectory = $directory;
+        $config = $this->getFlexDirectory()->getConfig('site.templates', []);
+        $defaults = array_replace($config['defaults'] ?? [], $config['object']['defaults'] ?? []);
+        $config['object']['defaults'] = $defaults;
+
+        return $config;
     }
+
     /**
-     * @param array $storage
+     * @param string $layout
+     * @return array
      */
-    protected function setStorage(array $storage) : void
+    protected function getTemplatePaths(string $layout): array
     {
-        $this->_storage = $storage;
+        $config = $this->getTemplateConfig();
+        $type = $this->getFlexType();
+        $defaults = $config['object']['defaults'] ?? [];
+
+        $ext = $defaults['ext'] ?? '.html.twig';
+        $types = array_unique(array_merge([$type], (array)($defaults['type'] ?? null)));
+        $paths = $config['object']['paths'] ?? [
+                'flex/{TYPE}/object/{LAYOUT}{EXT}',
+                'flex-objects/layouts/{TYPE}/object/{LAYOUT}{EXT}'
+            ];
+        $table = ['TYPE' => '%1$s', 'LAYOUT' => '%2$s', 'EXT' => '%3$s'];
+
+        $lookups = [];
+        foreach ($paths as $path) {
+            $path = Utils::simpleTemplate($path, $table);
+            foreach ($types as $type) {
+                $lookups[] = sprintf($path, $type, $layout, $ext);
+            }
+        }
+
+        return array_unique($lookups);
     }
 
     /**
-     * @return array
+     * Filter data coming to constructor or $this->update() request.
+     *
+     * NOTE: The incoming data can be an arbitrary array so do not assume anything from its content.
+     *
+     * @param array $elements
      */
-    protected function getStorage() : array
+    protected function filterElements(array &$elements): void
     {
-        return $this->_storage ?? [];
+        if (isset($elements['storage_key'])) {
+            $elements['storage_key'] = trim($elements['storage_key']);
+        }
+        if (isset($elements['storage_timestamp'])) {
+            $elements['storage_timestamp'] = (int)$elements['storage_timestamp'];
+        }
+
+        unset($elements['_post_entries_save']);
     }
 
     /**
-     * @param string $type
-     * @param string $property
-     * @return FlexCollectionInterface
+     * This methods allows you to override form objects in child classes.
+     *
+     * @param string $name Form name
+     * @param array|null $options Form optiosn
+     * @return FlexFormInterface
      */
-    protected function getCollectionByProperty($type, $property)
+    protected function createFormObject(string $name, array $options = null)
     {
-        $directory = $this->getRelatedDirectory($type);
-        $collection = $directory->getCollection();
-        $list = $this->getNestedProperty($property) ?: [];
+        return new FlexForm($name, $this, $options);
+    }
 
-        /** @var FlexCollection $collection */
-        $collection = $collection->filter(function ($object) use ($list) { return \in_array($object->id, $list, true); });
+    /**
+     * @param string $action
+     * @return string
+     */
+    protected function getAuthorizeAction(string $action): string
+    {
+        // Handle special action save, which can mean either update or create.
+        if ($action === 'save') {
+            $action = $this->exists() ? 'update' : 'create';
+        }
 
-        return $collection;
+        return $action;
     }
 
     /**
-     * @param string $type
-     * @return FlexDirectory
-     * @throws \RuntimeException
+     * Method to reset blueprints if the type changes.
+     *
+     * @return void
+     * @since 1.7.18
      */
-    protected function getRelatedDirectory($type): FlexDirectory
+    protected function resetBlueprints(): void
     {
-        /** @var Flex $flex */
-        $flex = Grav::instance()['flex_objects'];
-        $directory = $flex->getDirectory($type);
-        if (!$directory) {
-            throw new \RuntimeException(ucfirst($type). ' directory does not exist!');
+        $this->_blueprint = [];
+    }
+
+    // DEPRECATED METHODS
+
+    /**
+     * @param bool $prefix
+     * @return string
+     * @deprecated 1.6 Use `->getFlexType()` instead.
+     */
+    public function getType($prefix = false)
+    {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.6, use ->getFlexType() method instead', E_USER_DEPRECATED);
+
+        $type = $prefix ? $this->getTypePrefix() : '';
+
+        return $type . $this->getFlexType();
+    }
+
+    /**
+     * @param string $name
+     * @param mixed|null $default
+     * @param string|null $separator
+     * @return mixed
+     *
+     * @deprecated 1.6 Use ->getFormValue() method instead.
+     */
+    public function value($name, $default = null, $separator = null)
+    {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.6, use ->getFormValue() method instead', E_USER_DEPRECATED);
+
+        return $this->getFormValue($name, $default, $separator);
+    }
+
+    /**
+     * @param string $name
+     * @param object|null $event
+     * @return $this
+     * @deprecated 1.7 Moved to \Grav\Common\Flex\Traits\FlexObjectTrait
+     */
+    public function triggerEvent(string $name, $event = null)
+    {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, moved to \Grav\Common\Flex\Traits\FlexObjectTrait', E_USER_DEPRECATED);
+
+        if (null === $event) {
+            $event = new Event([
+                'type' => 'flex',
+                'directory' => $this->getFlexDirectory(),
+                'object' => $this
+            ]);
+        }
+        if (strpos($name, 'onFlexObject') !== 0 && strpos($name, 'on') === 0) {
+            $name = 'onFlexObject' . substr($name, 2);
+        }
+
+        $grav = Grav::instance();
+        if ($event instanceof Event) {
+            $grav->fireEvent($name, $event);
+        } else {
+            $grav->dispatchEvent($event);
         }
 
-        return $directory;
+        return $this;
+    }
+
+    /**
+     * @param array $storage
+     * @deprecated 1.7 Use `->setMetaData()` instead.
+     */
+    protected function setStorage(array $storage): void
+    {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, use ->setMetaData() method instead', E_USER_DEPRECATED);
+
+        $this->setMetaData($storage);
+    }
+
+    /**
+     * @return array
+     * @deprecated 1.7 Use `->getMetaData()` instead.
+     */
+    protected function getStorage(): array
+    {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, use ->getMetaData() method instead', E_USER_DEPRECATED);
+
+        return $this->getMetaData();
     }
 
     /**
@@ -820,58 +1224,64 @@ protected function getRelatedDirectory($type): FlexDirectory
      * @return Template|TemplateWrapper
      * @throws LoaderError
      * @throws SyntaxError
+     * @deprecated 1.7 Moved to \Grav\Common\Flex\Traits\GravTrait
      */
     protected function getTemplate($layout)
     {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, moved to \Grav\Common\Flex\Traits\GravTrait', E_USER_DEPRECATED);
+
         $grav = Grav::instance();
 
         /** @var Twig $twig */
         $twig = $grav['twig'];
 
         try {
-            return $twig->twig()->resolveTemplate(
-                [
-                    "flex-objects/layouts/{$this->getFlexType()}/object/{$layout}.html.twig",
-                    "flex-objects/layouts/_default/object/{$layout}.html.twig"
-                ]
-            );
+            return $twig->twig()->resolveTemplate($this->getTemplatePaths($layout));
         } catch (LoaderError $e) {
             /** @var Debugger $debugger */
             $debugger = Grav::instance()['debugger'];
             $debugger->addException($e);
 
-            return $twig->twig()->resolveTemplate(['flex-objects/layouts/404.html.twig']);
+            return $twig->twig()->resolveTemplate(['flex/404.html.twig']);
         }
     }
 
     /**
-     * Filter data coming to constructor or $this->update() request.
-     *
-     * NOTE: The incoming data can be an arbitrary array so do not assume anything from its content.
-     *
-     * @param array $elements
+     * @return Flex
+     * @deprecated 1.7 Moved to \Grav\Common\Flex\Traits\GravTrait
      */
-    protected function filterElements(array &$elements): void
+    protected function getFlexContainer(): Flex
     {
-        if (!empty($elements['storage_key'])) {
-            $this->_storage['storage_key'] = trim($elements['storage_key']);
-        }
-        if (!empty($elements['storage_timestamp'])) {
-            $this->_storage['storage_timestamp'] = (int)$elements['storage_timestamp'];
-        }
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, moved to \Grav\Common\Flex\Traits\GravTrait', E_USER_DEPRECATED);
+
+        /** @var Flex $flex */
+        $flex = Grav::instance()['flex'];
 
-        unset ($elements['storage_key'], $elements['storage_timestamp'], $elements['_post_entries_save']);
+        return $flex;
     }
 
     /**
-     * This methods allows you to override form objects in child classes.
-     *
-     * @param string $name Form name
-     * @param array|null $form Form fields
-     * @return FlexFormInterface
+     * @return UserInterface|null
+     * @deprecated 1.7 Moved to \Grav\Common\Flex\Traits\GravTrait
      */
-    protected function createFormObject(string $name, array $form = null)
+    protected function getActiveUser(): ?UserInterface
     {
-        return new FlexForm($name, $this, $form);
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, moved to \Grav\Common\Flex\Traits\GravTrait', E_USER_DEPRECATED);
+
+        /** @var UserInterface|null $user */
+        $user = Grav::instance()['user'] ?? null;
+
+        return $user;
+    }
+
+    /**
+     * @return string
+     * @deprecated 1.7 Moved to \Grav\Common\Flex\Traits\GravTrait
+     */
+    protected function getAuthorizeScope(): string
+    {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, moved to \Grav\Common\Flex\Traits\GravTrait', E_USER_DEPRECATED);
+
+        return isset(Grav::instance()['admin']) ? 'admin' : 'site';
     }
 }
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexAuthorizeInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexAuthorizeInterface.php
index cfcb8a98e7..c1025a4b73 100644
--- a/system/src/Grav/Framework/Flex/Interfaces/FlexAuthorizeInterface.php
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexAuthorizeInterface.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -19,14 +19,15 @@
 interface FlexAuthorizeInterface
 {
     /**
-     * Check if user is authorized to perform an action for the object.
+     * Check if user is authorized for the action.
      *
-     * @param string $action            One of: `create`, `read`, `update`, `delete`, `save`, `list`
-     * @param string|null $scope        One of: `admin`, `site`
-     * @param UserInterface|null $user  Optional user. Defaults to the current user.
+     * Note: There are two deny values: denied (false), not set (null). This allows chaining multiple rules together
+     * when the previous rules were not matched.
      *
-     * @return bool Returns `true` if user is authorized to perform action, `false` otherwise.
-     * @api
+     * @param string $action
+     * @param string|null $scope
+     * @param UserInterface|null $user
+     * @return bool|null
      */
-    public function isAuthorized(string $action, string $scope = null, UserInterface $user = null): bool;
+    public function isAuthorized(string $action, string $scope = null, UserInterface $user = null): ?bool;
 }
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexCollectionInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexCollectionInterface.php
index b6eace519d..d14b69f40e 100644
--- a/system/src/Grav/Framework/Flex/Interfaces/FlexCollectionInterface.php
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexCollectionInterface.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,12 +15,15 @@
 use Grav\Framework\Object\Interfaces\NestedObjectInterface;
 use Grav\Framework\Object\Interfaces\ObjectCollectionInterface;
 use Grav\Framework\Flex\FlexDirectory;
+use InvalidArgumentException;
 
 /**
  * Defines a collection of Flex Objects.
  *
  * @used-by \Grav\Framework\Flex\FlexCollection
  * @since 1.6
+ * @template T
+ * @extends ObjectCollectionInterface<string,T>
  */
 interface FlexCollectionInterface extends FlexCommonInterface, ObjectCollectionInterface, NestedObjectInterface
 {
@@ -31,8 +34,7 @@ interface FlexCollectionInterface extends FlexCommonInterface, ObjectCollectionI
      *
      * @param FlexObjectInterface[] $entries    Associated array of Flex Objects to be included in the collection.
      * @param FlexDirectory         $directory  Flex Directory where all the objects belong into.
-     * @param string                $keyField   Key field used to index the collection.
-     *
+     * @param string|null               $keyField   Key field used to index the collection.
      * @return static                           Returns a new Flex Collection.
      */
     public static function createFromArray(array $entries, FlexDirectory $directory, string $keyField = null);
@@ -43,9 +45,8 @@ public static function createFromArray(array $entries, FlexDirectory $directory,
      * @used-by FlexDirectory::createCollection()   Official method to create Flex Collection.
      *
      * @param FlexObjectInterface[] $entries    Associated array of Flex Objects to be included in the collection.
-     * @param FlexDirectory         $directory  Flex Directory where all the objects belong into.
-     *
-     * @throws \InvalidArgumentException
+     * @param FlexDirectory|null        $directory  Flex Directory where all the objects belong into.
+     * @throws InvalidArgumentException
      */
     public function __construct(array $entries = [], FlexDirectory $directory = null);
 
@@ -55,8 +56,8 @@ public function __construct(array $entries = [], FlexDirectory $directory = null
      * @param string                $search     Search string.
      * @param string|string[]|null  $properties Properties to search for, defaults to configured properties.
      * @param array|null            $options    Search options, defaults to configured options.
-     *
      * @return FlexCollectionInterface          Returns a Flex Collection with only matching objects.
+     * @phpstan-return static<T>
      * @api
      */
     public function search(string $search, $properties = null, array $options = null);
@@ -67,6 +68,7 @@ public function search(string $search, $properties = null, array $options = null
      * @param array $orderings Pair of [property => 'ASC'|'DESC', ...].
      *
      * @return FlexCollectionInterface Returns a sorted version from the collection.
+     * @phpstan-return static<T>
      */
     public function sort(array $orderings);
 
@@ -75,6 +77,7 @@ public function sort(array $orderings);
      *
      * @param array $filters
      * @return FlexCollectionInterface
+     * @phpstan-return static<T>
      */
     public function filterBy(array $filters);
 
@@ -109,8 +112,8 @@ public function getFlexKeys(): array;
      * Return new collection with a different key.
      *
      * @param string|null $keyField Switch key field of the collection.
-     *
      * @return FlexCollectionInterface  Returns a new Flex Collection with new key field.
+     * @phpstan-return static<T>
      * @api
      */
     public function withKeyField(string $keyField = null);
@@ -119,6 +122,23 @@ public function withKeyField(string $keyField = null);
      * Get Flex Index from the Flex Collection.
      *
      * @return FlexIndexInterface   Returns a Flex Index from the current collection.
+     * @phpstan-return FlexIndexInterface<T>
      */
     public function getIndex();
+
+    /**
+     * Load all the objects into memory,
+     *
+     * @return FlexCollectionInterface
+     * @phpstan-return static<T>
+     */
+    public function getCollection();
+
+    /**
+     * Get metadata associated to the object
+     *
+     * @param string $key Key.
+     * @return array
+     */
+    public function getMetaData($key): array;
 }
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexCommonInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexCommonInterface.php
index 482aef2262..7c1975f212 100644
--- a/system/src/Grav/Framework/Flex/Interfaces/FlexCommonInterface.php
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexCommonInterface.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -38,6 +38,21 @@ public function getFlexType(): string;
      */
     public function getFlexDirectory(): FlexDirectory;
 
+    /**
+     * Test whether the feature is implemented in the object / collection.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasFlexFeature(string $name): bool;
+
+    /**
+     * Get full list of features the object / collection implements.
+     *
+     * @return array
+     */
+    public function getFlexFeatures(): array;
+
     /**
      * Get last updated timestamp for the object / collection.
      *
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexDirectoryFormInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexDirectoryFormInterface.php
new file mode 100644
index 0000000000..203c76603b
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexDirectoryFormInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Interfaces;
+
+/**
+ * Defines Forms for Flex Objects.
+ *
+ * @used-by \Grav\Framework\Flex\FlexForm
+ * @since 1.7
+ */
+interface FlexDirectoryFormInterface extends FlexFormInterface
+{
+    /**
+     * Get object associated to the form.
+     *
+     * @return FlexObjectInterface  Returns Flex Object associated to the form.
+     * @api
+     */
+    public function getDirectory();
+}
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexDirectoryInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexDirectoryInterface.php
new file mode 100644
index 0000000000..a77df958fa
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexDirectoryInterface.php
@@ -0,0 +1,228 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Interfaces;
+
+use Exception;
+use Grav\Common\Data\Blueprint;
+use Grav\Framework\Cache\CacheInterface;
+
+/**
+ * Interface FlexDirectoryInterface
+ * @package Grav\Framework\Flex\Interfaces
+ */
+interface FlexDirectoryInterface extends FlexAuthorizeInterface
+{
+    /**
+     * @return bool
+     */
+    public function isListed(): bool;
+
+    /**
+     * @return bool
+     */
+    public function isEnabled(): bool;
+
+    /**
+     * @return string
+     */
+    public function getFlexType(): string;
+
+    /**
+     * @return string
+     */
+    public function getTitle(): string;
+
+    /**
+     * @return string
+     */
+    public function getDescription(): string;
+
+    /**
+     * @param string|null $name
+     * @param mixed $default
+     * @return mixed
+     */
+    public function getConfig(string $name = null, $default = null);
+
+    /**
+     * @param string|null $name
+     * @param array $options
+     * @return FlexFormInterface
+     * @internal
+     */
+    public function getDirectoryForm(string $name = null, array $options = []);
+
+    /**
+     * @return Blueprint
+     * @internal
+     */
+    public function getDirectoryBlueprint();
+
+    /**
+     * @param string $name
+     * @param array $data
+     * @return void
+     * @throws Exception
+     * @internal
+     */
+    public function saveDirectoryConfig(string $name, array $data);
+
+    /**
+     * @param string|null $name
+     * @return string
+     */
+    public function getDirectoryConfigUri(string $name = null): string;
+
+    /**
+     * Returns a new uninitialized instance of blueprint.
+     *
+     * Always use $object->getBlueprint() or $object->getForm()->getBlueprint() instead.
+     *
+     * @param string $type
+     * @param string $context
+     * @return Blueprint
+     */
+    public function getBlueprint(string $type = '', string $context = '');
+
+    /**
+     * @param string $view
+     * @return string
+     */
+    public function getBlueprintFile(string $view = ''): string;
+
+    /**
+     * Get collection. In the site this will be filtered by the default filters (published etc).
+     *
+     * Use $directory->getIndex() if you want unfiltered collection.
+     *
+     * @param array|null $keys  Array of keys.
+     * @param string|null $keyField  Field to be used as the key.
+     * @return FlexCollectionInterface
+     * @phpstan-return FlexCollectionInterface<FlexObjectInterface>
+     */
+    public function getCollection(array $keys = null, string $keyField = null): FlexCollectionInterface;
+
+    /**
+     * Get the full collection of all stored objects.
+     *
+     * Use $directory->getCollection() if you want a filtered collection.
+     *
+     * @param array|null $keys  Array of keys.
+     * @param string|null $keyField  Field to be used as the key.
+     * @return FlexIndexInterface
+     * @phpstan-return FlexIndexInterface<FlexObjectInterface>
+     */
+    public function getIndex(array $keys = null, string $keyField = null): FlexIndexInterface;
+
+    /**
+     * Returns an object if it exists. If no arguments are passed (or both of them are null), method creates a new empty object.
+     *
+     * Note: It is not safe to use the object without checking if the user can access it.
+     *
+     * @param string|null $key
+     * @param string|null $keyField  Field to be used as the key.
+     * @return FlexObjectInterface|null
+     */
+    public function getObject($key = null, string $keyField = null): ?FlexObjectInterface;
+
+    /**
+     * @param string|null $namespace
+     * @return CacheInterface
+     */
+    public function getCache(string $namespace = null);
+
+    /**
+     * @return $this
+     */
+    public function clearCache();
+
+    /**
+     * @param string|null $key
+     * @return string|null
+     */
+    public function getStorageFolder(string $key = null): ?string;
+
+    /**
+     * @param string|null $key
+     * @return string|null
+     */
+    public function getMediaFolder(string $key = null): ?string;
+
+    /**
+     * @return FlexStorageInterface
+     */
+    public function getStorage(): FlexStorageInterface;
+
+    /**
+     * @param array $data
+     * @param string $key
+     * @param bool $validate
+     * @return FlexObjectInterface
+     */
+    public function createObject(array $data, string $key = '', bool $validate = false): FlexObjectInterface;
+
+    /**
+     * @param array $entries
+     * @param string|null $keyField
+     * @return FlexCollectionInterface
+     * @phpstan-return FlexCollectionInterface<FlexObjectInterface>
+     */
+    public function createCollection(array $entries, string $keyField = null): FlexCollectionInterface;
+
+    /**
+     * @param array $entries
+     * @param string|null $keyField
+     * @return FlexIndexInterface
+     * @phpstan-return FlexIndexInterface<FlexObjectInterface>
+     */
+    public function createIndex(array $entries, string $keyField = null): FlexIndexInterface;
+
+    /**
+     * @return string
+     */
+    public function getObjectClass(): string;
+
+    /**
+     * @return string
+     */
+    public function getCollectionClass(): string;
+
+    /**
+     * @return string
+     */
+    public function getIndexClass(): string;
+
+    /**
+     * @param array $entries
+     * @param string|null $keyField
+     * @return FlexCollectionInterface
+     * @phpstan-return FlexCollectionInterface<FlexObjectInterface>
+     */
+    public function loadCollection(array $entries, string $keyField = null): FlexCollectionInterface;
+
+    /**
+     * @param array $entries
+     * @return FlexObjectInterface[]
+     * @internal
+     */
+    public function loadObjects(array $entries): array;
+
+    /**
+     * @return void
+     */
+    public function reloadIndex(): void;
+
+    /**
+     * @param string $scope
+     * @param string $action
+     * @return string
+     */
+    public function getAuthorizeRule(string $scope, string $action): string;
+}
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexFormInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexFormInterface.php
index 480a2f21dc..ba9996afc8 100644
--- a/system/src/Grav/Framework/Flex/Interfaces/FlexFormInterface.php
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexFormInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,6 +11,7 @@
 
 use Grav\Framework\Form\Interfaces\FormInterface;
 use Grav\Framework\Route\Route;
+use Serializable;
 
 /**
  * Defines Forms for Flex Objects.
@@ -18,16 +19,8 @@
  * @used-by \Grav\Framework\Flex\FlexForm
  * @since 1.6
  */
-interface FlexFormInterface extends \Serializable, FormInterface
+interface FlexFormInterface extends Serializable, FormInterface
 {
-    /**
-     * Get object associated to the form.
-     *
-     * @return FlexObjectInterface  Returns Flex Object associated to the form.
-     * @api
-     */
-    public function getObject();
-
     /**
      * Get media task route.
      *
@@ -45,10 +38,14 @@ public function getFileUploadAjaxRoute();
     /**
      * Get route for deleting files by AJAX.
      *
-     * @param string $field     Field where the file is associated into.
-     * @param string $filename  Filename for the file.
-     *
+     * @param string|null $field     Field where the file is associated into.
+     * @param string|null $filename  Filename for the file.
      * @return Route|null       Returns Route object or null if file uploads are not enabled.
      */
     public function getFileDeleteAjaxRoute($field, $filename);
+
+//    /**
+//     * @return FlexObjectInterface
+//     */
+//    public function getObject();
 }
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexIndexInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexIndexInterface.php
index f6e813652d..d8f8ba3c99 100644
--- a/system/src/Grav/Framework/Flex/Interfaces/FlexIndexInterface.php
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexIndexInterface.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -21,6 +21,8 @@
  *
  * @used-by \Grav\Framework\Flex\FlexIndex
  * @since 1.6
+ * @template T
+ * @extends FlexCollectionInterface<T>
  */
 interface FlexIndexInterface extends FlexCollectionInterface
 {
@@ -30,7 +32,6 @@ interface FlexIndexInterface extends FlexCollectionInterface
      * @used-by FlexDirectory::getIndex()   Official method to get Index from a Flex Directory.
      *
      * @param FlexDirectory $directory Flex directory.
-     *
      * @return static Returns a new Flex Index.
      */
     public static function createFromStorage(FlexDirectory $directory);
@@ -41,7 +42,6 @@ public static function createFromStorage(FlexDirectory $directory);
      * @used-by FlexDirectory::getIndex()   Official method to get Index from a Flex Directory.
      *
      * @param FlexStorageInterface $storage Flex Storage associated to the directory.
-     *
      * @return array Returns a list of existing objects [storage_key => [storage_key => xxx, storage_timestamp => 123456, ...]]
      */
     public static function loadEntriesFromStorage(FlexStorageInterface $storage): array;
@@ -50,14 +50,14 @@ public static function loadEntriesFromStorage(FlexStorageInterface $storage): ar
      * Return new collection with a different key.
      *
      * @param string|null $keyField Switch key field of the collection.
-     *
-     * @return FlexIndexInterface  Returns a new Flex Collection with new key field.
+     * @return static  Returns a new Flex Collection with new key field.
+     * @phpstan-return static<T>
      * @api
      */
     public function withKeyField(string $keyField = null);
 
     /**
-     * @param string $indexKey
+     * @param string|null $indexKey
      * @return array
      */
     public function getIndexMap(string $indexKey = null);
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexInterface.php
new file mode 100644
index 0000000000..f1376a5891
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexInterface.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Interfaces;
+
+use Countable;
+use Grav\Framework\Flex\FlexDirectory;
+use RuntimeException;
+
+/**
+ * Interface FlexInterface
+ * @package Grav\Framework\Flex\Interfaces
+ */
+interface FlexInterface extends Countable
+{
+    /**
+     * @param string $type
+     * @param string $blueprint
+     * @param array  $config
+     * @return $this
+     */
+    public function addDirectoryType(string $type, string $blueprint, array $config = []);
+
+    /**
+     * @param FlexDirectory $directory
+     * @return $this
+     */
+    public function addDirectory(FlexDirectory $directory);
+
+    /**
+     * @param string $type
+     * @return bool
+     */
+    public function hasDirectory(string $type): bool;
+
+    /**
+     * @param array|string[]|null $types
+     * @param bool $keepMissing
+     * @return array<FlexDirectory|null>
+     */
+    public function getDirectories(array $types = null, bool $keepMissing = false): array;
+
+    /**
+     * @param string $type
+     * @return FlexDirectory|null
+     */
+    public function getDirectory(string $type): ?FlexDirectory;
+
+    /**
+     * @param string $type
+     * @param array|null $keys
+     * @param string|null $keyField
+     * @return FlexCollectionInterface|null
+     * @phpstan-return FlexCollectionInterface<FlexObjectInterface>|null
+     */
+    public function getCollection(string $type, array $keys = null, string $keyField = null): ?FlexCollectionInterface;
+
+    /**
+     * @param array $keys
+     * @param array $options            In addition to the options in getObjects(), following options can be passed:
+     *                                  collection_class:   Class to be used to create the collection. Defaults to ObjectCollection.
+     * @return FlexCollectionInterface
+     * @throws RuntimeException
+     * @phpstan-return FlexCollectionInterface<FlexObjectInterface>
+     */
+    public function getMixedCollection(array $keys, array $options = []): FlexCollectionInterface;
+
+    /**
+     * @param array $keys
+     * @param array $options    Following optional options can be passed:
+     *                          types:          List of allowed types.
+     *                          type:           Allowed type if types isn't defined, otherwise acts as default_type.
+     *                          default_type:   Set default type for objects given without type (only used if key_field isn't set).
+     *                          keep_missing:   Set to true if you want to return missing objects as null.
+     *                          key_field:      Key field which is used to match the objects.
+     * @return array
+     */
+    public function getObjects(array $keys, array $options = []): array;
+
+    /**
+     * @param string $key
+     * @param string|null $type
+     * @param string|null $keyField
+     * @return FlexObjectInterface|null
+     */
+    public function getObject(string $key, string $type = null, string $keyField = null): ?FlexObjectInterface;
+
+    /**
+     * @return int
+     */
+    public function count(): int;
+}
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexObjectFormInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexObjectFormInterface.php
new file mode 100644
index 0000000000..190a9634ab
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexObjectFormInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Interfaces;
+
+/**
+ * Defines Forms for Flex Objects.
+ *
+ * @used-by \Grav\Framework\Flex\FlexForm
+ * @since 1.7
+ */
+interface FlexObjectFormInterface extends FlexFormInterface
+{
+    /**
+     * Get object associated to the form.
+     *
+     * @return FlexObjectInterface  Returns Flex Object associated to the form.
+     * @api
+     */
+    public function getObject();
+}
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexObjectInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexObjectInterface.php
index a10ee8447b..d02bc8b30e 100644
--- a/system/src/Grav/Framework/Flex/Interfaces/FlexObjectInterface.php
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexObjectInterface.php
@@ -5,25 +5,29 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Flex\Interfaces;
 
+use ArrayAccess;
 use Grav\Common\Data\Blueprint;
 use Grav\Framework\Flex\Flex;
 use Grav\Framework\Object\Interfaces\NestedObjectInterface;
 use Grav\Framework\Flex\FlexDirectory;
+use InvalidArgumentException;
 use Psr\Http\Message\UploadedFileInterface;
+use RuntimeException;
 
 /**
  * Defines Flex Objects.
  *
+ * @extends ArrayAccess<string,mixed>
  * @used-by \Grav\Framework\Flex\FlexObject
  * @since 1.6
  */
-interface FlexObjectInterface extends FlexCommonInterface, NestedObjectInterface, \ArrayAccess
+interface FlexObjectInterface extends FlexCommonInterface, NestedObjectInterface, ArrayAccess
 {
     /**
      * Construct a new Flex Object instance.
@@ -34,8 +38,7 @@ interface FlexObjectInterface extends FlexCommonInterface, NestedObjectInterface
      * @param string $key Identifier key for the new object.
      * @param FlexDirectory $directory Flex Directory the object belongs into.
      * @param bool $validate True if the object should be validated against blueprint.
-     *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function __construct(array $elements, $key, FlexDirectory $directory, bool $validate = false);
 
@@ -49,12 +52,18 @@ public function __construct(array $elements, $key, FlexDirectory $directory, boo
      * @param string                $search     Search string.
      * @param string|string[]|null  $properties Properties to search for, defaults to configured properties.
      * @param array|null            $options    Search options, defaults to configured options.
-     *
      * @return float                Returns a weight between 0 and 1.
      * @api
      */
     public function search(string $search, $properties = null, array $options = null): float;
 
+    /**
+     * Returns true if object has a key.
+     *
+     * @return bool
+     */
+    public function hasKey();
+
     /**
      * Get a unique key for the object.
      *
@@ -110,9 +119,8 @@ public function prepareStorage(): array;
      *
      * @param array $data   Data containing updated properties with their values. To unset a value, use `null`.
      * @param array|UploadedFileInterface[] $files List of uploaded files to be saved within the object.
-     *
-     * @return FlexObjectInterface
-     * @throws \RuntimeException
+     * @return static
+     * @throws RuntimeException
      * @api
      */
     public function update(array $data, array $files = []);
@@ -124,9 +132,8 @@ public function update(array $data, array $files = []);
      * @see FlexObjectInterface::update() If you want to update properties of the object.
      *
      * @param string|null $key Optional new key. If key isn't given, random key will be associated to the object.
-     *
-     * @return FlexObjectInterface
-     * @throws \RuntimeException if object already exists.
+     * @return static
+     * @throws RuntimeException if object already exists.
      * @api
      */
     public function create(string $key = null);
@@ -136,7 +143,7 @@ public function create(string $key = null);
      *
      * @see FlexObjectInterface::update() If you want to update properties of the object.
      *
-     * @return FlexObjectInterface
+     * @return static
      * @api
      */
     public function save();
@@ -144,7 +151,7 @@ public function save();
     /**
      * Delete object from the storage.
      *
-     * @return FlexObjectInterface
+     * @return static
      * @api
      */
     public function delete();
@@ -156,7 +163,6 @@ public function delete();
      * @used-by FlexForm::getBlueprint()
      *
      * @param string $name Name of the Blueprint form. Used to create customized forms for different use cases.
-     *
      * @return Blueprint Returns a Blueprint.
      */
     public function getBlueprint(string $name = '');
@@ -165,12 +171,11 @@ public function getBlueprint(string $name = '');
      * Returns a form instance for the object.
      *
      * @param string $name Name of the form. Can be used to create customized forms for different use cases.
-     * @param array|null $form  Can be used to further customize the form.
-     *
+     * @param array|null $options  Options can be used to further customize the form.
      * @return FlexFormInterface Returns a Form.
      * @api
      */
-    public function getForm(string $name = '', array $form = null);
+    public function getForm(string $name = '', array $options = null);
 
     /**
      * Returns default value suitable to be used in a form for the given property.
@@ -178,8 +183,7 @@ public function getForm(string $name = '', array $form = null);
      * @see FlexObjectInterface::getForm()
      *
      * @param  string $name         Property name.
-     * @param  string $separator    Optional nested property separator.
-     *
+     * @param  string|null $separator   Optional nested property separator.
      * @return mixed|null           Returns default value of the field, null if there is no default value.
      */
     public function getDefaultValue(string $name, string $separator = null);
@@ -200,8 +204,7 @@ public function getDefaultValues(): array;
      *
      * @param  string $name         Property name.
      * @param  mixed  $default      Default value.
-     * @param  string $separator    Optional nested property separator.
-     *
+     * @param  string|null $separator   Optional nested property separator.
      * @return mixed                Returns value of the field.
      */
     public function getFormValue(string $name, $default = null, string $separator = null);
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexStorageInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexStorageInterface.php
index 020611206a..4209924727 100644
--- a/system/src/Grav/Framework/Flex/Interfaces/FlexStorageInterface.php
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexStorageInterface.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -29,6 +29,13 @@ public function __construct(array $options);
      */
     public function getKeyField(): string;
 
+    /**
+     * @param string[] $keys
+     * @param bool $reload
+     * @return array
+     */
+    public function getMetaData(array $keys, bool $reload = false): array;
+
     /**
      * Returns associated array of all existing storage keys with a timestamp.
      *
@@ -40,7 +47,6 @@ public function getExistingKeys(): array;
      * Check if the key exists in the storage.
      *
      * @param string $key Storage key of an object.
-     *
      * @return bool Returns `true` if the key exists in the storage, `false` otherwise.
      */
     public function hasKey(string $key): bool;
@@ -49,7 +55,6 @@ public function hasKey(string $key): bool;
      * Check if the key exists in the storage.
      *
      * @param string[] $keys Storage key of an object.
-     *
      * @return bool[] Returns keys with `true` if the key exists in the storage, `false` otherwise.
      */
     public function hasKeys(array $keys): array;
@@ -60,7 +65,6 @@ public function hasKeys(array $keys): array;
      * New keys will be assigned when the objects are created.
      *
      * @param  array  $rows  List of rows as `[row, ...]`.
-     *
      * @return array  Returns created rows as `[key => row, ...] pairs.
      */
     public function createRows(array $rows): array;
@@ -71,8 +75,7 @@ public function createRows(array $rows): array;
      * If you pass object or array as value, that value will be used to save I/O.
      *
      * @param  array  $rows  Array of `[key => row, ...]` pairs.
-     * @param  array  $fetched  Optional reference to store only fetched items.
-     *
+     * @param  array|null $fetched  Optional reference to store only fetched items.
      * @return array  Returns rows. Note that non-existing rows will have `null` as their value.
      */
     public function readRows(array $rows, array &$fetched = null): array;
@@ -81,7 +84,6 @@ public function readRows(array $rows, array &$fetched = null): array;
      * Update existing rows in the storage.
      *
      * @param  array  $rows  Array of `[key => row, ...]` pairs.
-     *
      * @return array  Returns updated rows. Note that non-existing rows will not be saved and have `null` as their value.
      */
     public function updateRows(array $rows): array;
@@ -90,7 +92,6 @@ public function updateRows(array $rows): array;
      * Delete rows from the storage.
      *
      * @param  array  $rows  Array of `[key => row, ...]` pairs.
-     *
      * @return array  Returns deleted rows. Note that non-existing rows have `null` as their value.
      */
     public function deleteRows(array $rows): array;
@@ -101,7 +102,6 @@ public function deleteRows(array $rows): array;
      * All rows should have a specified key for replace to work properly.
      *
      * @param  array $rows  Array of `[key => row, ...]` pairs.
-     *
      * @return array  Returns both created and updated rows.
      */
     public function replaceRows(array $rows): array;
@@ -109,7 +109,13 @@ public function replaceRows(array $rows): array;
     /**
      * @param string $src
      * @param string $dst
-     *
+     * @return bool
+     */
+    public function copyRow(string $src, string $dst): bool;
+
+    /**
+     * @param string $src
+     * @param string $dst
      * @return bool
      */
     public function renameRow(string $src, string $dst): bool;
@@ -118,17 +124,15 @@ public function renameRow(string $src, string $dst): bool;
      * Get filesystem path for the collection or object storage.
      *
      * @param  string|null $key Optional storage key.
-     *
-     * @return string Path in the filesystem. Can be URI.
+     * @return string|null Path in the filesystem. Can be URI or null if storage is not filesystem based.
      */
-    public function getStoragePath(string $key = null): string;
+    public function getStoragePath(string $key = null): ?string;
 
     /**
      * Get filesystem path for the collection or object media.
      *
      * @param  string|null $key Optional storage key.
-     *
-     * @return string Path in the filesystem. Can be URI.
+     * @return string|null Path in the filesystem. Can be URI or null if media isn't supported.
      */
-    public function getMediaPath(string $key = null): string;
+    public function getMediaPath(string $key = null): ?string;
 }
diff --git a/system/src/Grav/Framework/Flex/Interfaces/FlexTranslateInterface.php b/system/src/Grav/Framework/Flex/Interfaces/FlexTranslateInterface.php
new file mode 100644
index 0000000000..8df11fa23a
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Interfaces/FlexTranslateInterface.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Interfaces;
+
+/**
+ * Implements PageTranslateInterface
+ */
+interface FlexTranslateInterface
+{
+    /**
+     * Returns true if object has a translation in given language (or any of its fallback languages).
+     *
+     * @param string|null $languageCode
+     * @param bool|null $fallback
+     * @return bool
+     */
+    public function hasTranslation(string $languageCode = null, bool $fallback = null): bool;
+
+    /**
+     * Get translation.
+     *
+     * @param string|null $languageCode
+     * @param bool|null $fallback
+     * @return static|null
+     */
+    public function getTranslation(string $languageCode = null, bool $fallback = null);
+
+    /**
+     * Returns all translated languages.
+     *
+     * @param bool $includeDefault If set to true, return separate entries for '' and 'en' (default) language.
+     * @return array
+     */
+    public function getLanguages(bool $includeDefault = false): array;
+
+    /**
+     * Get used language.
+     *
+     * @return string
+     */
+    public function getLanguage(): string;
+}
diff --git a/system/src/Grav/Framework/Flex/Pages/FlexPageCollection.php b/system/src/Grav/Framework/Flex/Pages/FlexPageCollection.php
new file mode 100644
index 0000000000..5901557d7a
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Pages/FlexPageCollection.php
@@ -0,0 +1,211 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Pages;
+
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Framework\Flex\FlexCollection;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use function array_search;
+use function assert;
+use function is_int;
+
+/**
+ * Class FlexPageCollection
+ * @package Grav\Plugin\FlexObjects\Types\FlexPages
+ * @template T of FlexObjectInterface
+ * @extends FlexCollection<T>
+ */
+class FlexPageCollection extends FlexCollection
+{
+    /**
+     * @return array
+     */
+    public static function getCachedMethods(): array
+    {
+        return [
+            // Collection filtering
+            'withPublished' => true,
+            'withVisible' => true,
+            'withRoutable' => true,
+
+            'isFirst' => true,
+            'isLast' => true,
+
+            // Find objects
+            'prevSibling' => false,
+            'nextSibling' => false,
+            'adjacentSibling' => false,
+            'currentPosition' => true,
+
+            'getNextOrder' => false,
+        ] + parent::getCachedMethods();
+    }
+
+    /**
+     * @param bool $bool
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function withPublished(bool $bool = true)
+    {
+        /** @var string[] $list */
+        $list = array_keys(array_filter($this->call('isPublished', [$bool])));
+
+        /** @phpstan-var static<T> */
+        return $this->select($list);
+    }
+
+    /**
+     * @param bool $bool
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function withVisible(bool $bool = true)
+    {
+        /** @var string[] $list */
+        $list = array_keys(array_filter($this->call('isVisible', [$bool])));
+
+        /** @phpstan-var static<T> */
+        return $this->select($list);
+    }
+
+    /**
+     * @param bool $bool
+     * @return static
+     * @phpstan-return static<T>
+     */
+    public function withRoutable(bool $bool = true)
+    {
+        /** @var string[] $list */
+        $list = array_keys(array_filter($this->call('isRoutable', [$bool])));
+
+        /** @phpstan-var static<T> */
+        return $this->select($list);
+    }
+
+    /**
+     * Check to see if this item is the first in the collection.
+     *
+     * @param  string $path
+     * @return bool True if item is first.
+     */
+    public function isFirst($path): bool
+    {
+        $keys = $this->getKeys();
+        $first = reset($keys);
+
+        return $path === $first;
+    }
+
+    /**
+     * Check to see if this item is the last in the collection.
+     *
+     * @param  string $path
+     * @return bool True if item is last.
+     */
+    public function isLast($path): bool
+    {
+        $keys = $this->getKeys();
+        $last = end($keys);
+
+        return $path === $last;
+    }
+
+    /**
+     * Gets the previous sibling based on current position.
+     *
+     * @param  string $path
+     * @return PageInterface|false  The previous item.
+     * @phpstan-return T|false
+     */
+    public function prevSibling($path)
+    {
+        return $this->adjacentSibling($path, -1);
+    }
+
+    /**
+     * Gets the next sibling based on current position.
+     *
+     * @param  string $path
+     * @return PageInterface|false The next item.
+     * @phpstan-return T|false
+     */
+    public function nextSibling($path)
+    {
+        return $this->adjacentSibling($path, 1);
+    }
+
+    /**
+     * Returns the adjacent sibling based on a direction.
+     *
+     * @param  string  $path
+     * @param  int $direction either -1 or +1
+     * @return PageInterface|false    The sibling item.
+     * @phpstan-return T|false
+     */
+    public function adjacentSibling($path, $direction = 1)
+    {
+        $keys = $this->getKeys();
+        $direction = (int)$direction;
+        $pos = array_search($path, $keys, true);
+
+        if (is_int($pos)) {
+            $pos += $direction;
+            if (isset($keys[$pos])) {
+                return $this[$keys[$pos]];
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the item in the current position.
+     *
+     * @param  string $path the path the item
+     * @return int|null The index of the current page, null if not found.
+     */
+    public function currentPosition($path): ?int
+    {
+        $pos = array_search($path, $this->getKeys(), true);
+
+        return is_int($pos) ? $pos : null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNextOrder()
+    {
+        $directory = $this->getFlexDirectory();
+
+        $collection = $directory->getIndex();
+        $keys = $collection->getStorageKeys();
+
+        // Assign next free order.
+        $last = null;
+        $order = 0;
+        foreach ($keys as $folder => $key) {
+            preg_match(FlexPageIndex::ORDER_PREFIX_REGEX, $folder, $test);
+            $test = $test[0] ?? null;
+            if ($test && $test > $order) {
+                $order = $test;
+                $last = $key;
+            }
+        }
+
+        /** @var FlexPageObject|null $last */
+        $last = $collection[$last];
+
+        return sprintf('%d.', $last ? $last->getFormValue('order') + 1 : 1);
+    }
+}
diff --git a/system/src/Grav/Framework/Flex/Pages/FlexPageIndex.php b/system/src/Grav/Framework/Flex/Pages/FlexPageIndex.php
new file mode 100644
index 0000000000..5bb5517971
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Pages/FlexPageIndex.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Pages;
+
+use Grav\Common\Grav;
+use Grav\Framework\Flex\FlexIndex;
+
+/**
+ * Class FlexPageObject
+ * @package Grav\Plugin\FlexObjects\Types\FlexPages
+ *
+ * @method FlexPageIndex withRoutable(bool $bool = true)
+ * @method FlexPageIndex withPublished(bool $bool = true)
+ * @method FlexPageIndex withVisible(bool $bool = true)
+ *
+ * @template T of FlexPageObject
+ * @template C of FlexPageCollection
+ * @extends FlexIndex<T,C>
+ */
+class FlexPageIndex extends FlexIndex
+{
+    public const ORDER_PREFIX_REGEX = '/^\d+\./u';
+
+    /**
+     * @param string $route
+     * @return string
+     * @internal
+     */
+    public static function normalizeRoute(string $route)
+    {
+        static $case_insensitive;
+
+        if (null === $case_insensitive) {
+            $case_insensitive = Grav::instance()['config']->get('system.force_lowercase_urls', false);
+        }
+
+        return $case_insensitive ? mb_strtolower($route) : $route;
+    }
+}
diff --git a/system/src/Grav/Framework/Flex/Pages/FlexPageObject.php b/system/src/Grav/Framework/Flex/Pages/FlexPageObject.php
new file mode 100644
index 0000000000..e700424b99
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Pages/FlexPageObject.php
@@ -0,0 +1,496 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Pages;
+
+use DateTime;
+use Exception;
+use Grav\Common\Debugger;
+use Grav\Common\Grav;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\Page\Traits\PageFormTrait;
+use Grav\Common\User\Interfaces\UserCollectionInterface;
+use Grav\Framework\Flex\FlexObject;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use Grav\Framework\Flex\Interfaces\FlexTranslateInterface;
+use Grav\Framework\Flex\Pages\Traits\PageAuthorsTrait;
+use Grav\Framework\Flex\Pages\Traits\PageContentTrait;
+use Grav\Framework\Flex\Pages\Traits\PageLegacyTrait;
+use Grav\Framework\Flex\Pages\Traits\PageRoutableTrait;
+use Grav\Framework\Flex\Pages\Traits\PageTranslateTrait;
+use Grav\Framework\Flex\Traits\FlexMediaTrait;
+use RuntimeException;
+use stdClass;
+use function array_key_exists;
+use function is_array;
+
+/**
+ * Class FlexPageObject
+ * @package Grav\Plugin\FlexObjects\Types\FlexPages
+ */
+class FlexPageObject extends FlexObject implements PageInterface, FlexTranslateInterface
+{
+    use PageAuthorsTrait;
+    use PageContentTrait;
+    use PageFormTrait;
+    use PageLegacyTrait;
+    use PageRoutableTrait;
+    use PageTranslateTrait;
+    use FlexMediaTrait;
+
+    public const PAGE_ORDER_REGEX = '/^(\d+)\.(.*)$/u';
+    public const PAGE_ORDER_PREFIX_REGEX = '/^[0-9]+\./u';
+
+    /** @var array|null */
+    protected $_reorder;
+    /** @var FlexPageObject|null */
+    protected $_originalObject;
+
+    /**
+     * Clone page.
+     */
+    #[\ReturnTypeWillChange]
+    public function __clone()
+    {
+        parent::__clone();
+
+        if (isset($this->header)) {
+            $this->header = clone($this->header);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public static function getCachedMethods(): array
+    {
+        return [
+            // Page Content Interface
+            'header' => false,
+            'summary' => true,
+            'content' => true,
+            'value' => false,
+            'media' => false,
+            'title' => true,
+            'menu' => true,
+            'visible' => true,
+            'published' => true,
+            'publishDate' => true,
+            'unpublishDate' => true,
+            'process' => true,
+            'slug' => true,
+            'order' => true,
+            'id' => true,
+            'modified' => true,
+            'lastModified' => true,
+            'folder' => true,
+            'date' => true,
+            'dateformat' => true,
+            'taxonomy' => true,
+            'shouldProcess' => true,
+            'isPage' => true,
+            'isDir' => true,
+            'folderExists' => true,
+
+            // Page
+            'isPublished' => true,
+            'isOrdered' => true,
+            'isVisible' => true,
+            'isRoutable' => true,
+            'getCreated_Timestamp' => true,
+            'getPublish_Timestamp' => true,
+            'getUnpublish_Timestamp' => true,
+            'getUpdated_Timestamp' => true,
+        ] + parent::getCachedMethods();
+    }
+
+    /**
+     * @param bool $test
+     * @return bool
+     */
+    public function isPublished(bool $test = true): bool
+    {
+        $time = time();
+        $start = $this->getPublish_Timestamp();
+        $stop = $this->getUnpublish_Timestamp();
+
+        return $this->published() && $start <= $time && (!$stop || $time <= $stop) === $test;
+    }
+
+    /**
+     * @param bool $test
+     * @return bool
+     */
+    public function isOrdered(bool $test = true): bool
+    {
+        return ($this->order() !== false) === $test;
+    }
+
+    /**
+     * @param bool $test
+     * @return bool
+     */
+    public function isVisible(bool $test = true): bool
+    {
+        return $this->visible() === $test;
+    }
+
+    /**
+     * @param bool $test
+     * @return bool
+     */
+    public function isRoutable(bool $test = true): bool
+    {
+        return $this->routable() === $test;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCreated_Timestamp(): int
+    {
+        return $this->getFieldTimestamp('created_date') ?? 0;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPublish_Timestamp(): int
+    {
+        return $this->getFieldTimestamp('publish_date') ?? $this->getCreated_Timestamp();
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getUnpublish_Timestamp(): ?int
+    {
+        return $this->getFieldTimestamp('unpublish_date');
+    }
+
+    /**
+     * @return int
+     */
+    public function getUpdated_Timestamp(): int
+    {
+        return $this->getFieldTimestamp('updated_date') ?? $this->getPublish_Timestamp();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFormValue(string $name, $default = null, string $separator = null)
+    {
+        $test = new stdClass();
+
+        $value = $this->pageContentValue($name, $test);
+        if ($value !== $test) {
+            return $value;
+        }
+
+        switch ($name) {
+            case 'name':
+                return $this->getProperty('template');
+            case 'route':
+                return $this->hasKey() ? '/' . $this->getKey() : null;
+            case 'header.permissions.groups':
+                $encoded = json_encode($this->getPermissions());
+                if ($encoded === false) {
+                    throw new RuntimeException('json_encode(): failed to encode group permissions');
+                }
+
+                return json_decode($encoded, true);
+        }
+
+        return parent::getFormValue($name, $default, $separator);
+    }
+
+    /**
+     * Get master storage key.
+     *
+     * @return string
+     * @see FlexObjectInterface::getStorageKey()
+     */
+    public function getMasterKey(): string
+    {
+        $key = (string)($this->storage_key ?? $this->getMetaData()['storage_key'] ?? null);
+        if (($pos = strpos($key, '|')) !== false) {
+            $key = substr($key, 0, $pos);
+        }
+
+        return $key;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexObjectInterface::getCacheKey()
+     */
+    public function getCacheKey(): string
+    {
+        return $this->hasKey() ? $this->getTypePrefix() . $this->getFlexType() . '.' . $this->getKey() . '.' . $this->getLanguage() : '';
+    }
+
+    /**
+     * @param string|null $key
+     * @return FlexObjectInterface
+     */
+    public function createCopy(string $key = null)
+    {
+        $this->copy();
+
+        return parent::createCopy($key);
+    }
+
+    /**
+     * @param array|bool $reorder
+     * @return FlexObject|FlexObjectInterface
+     */
+    public function save($reorder = true)
+    {
+        return parent::save();
+    }
+
+    /**
+     * Gets the Page Unmodified (original) version of the page.
+     *
+     * Assumes that object has been cloned before modifying it.
+     *
+     * @return FlexPageObject|null The original version of the page.
+     */
+    public function getOriginal()
+    {
+        return $this->_originalObject;
+    }
+
+    /**
+     * Store the Page Unmodified (original) version of the page.
+     *
+     * Can be called multiple times, only the first call matters.
+     *
+     * @return void
+     */
+    public function storeOriginal(): void
+    {
+        if (null === $this->_originalObject) {
+            $this->_originalObject = clone $this;
+        }
+    }
+
+    /**
+     * Get display order for the associated media.
+     *
+     * @return array
+     */
+    public function getMediaOrder(): array
+    {
+        $order = $this->getNestedProperty('header.media_order');
+
+        if (is_array($order)) {
+            return $order;
+        }
+
+        if (!$order) {
+            return [];
+        }
+
+        return array_map('trim', explode(',', $order));
+    }
+
+    // Overrides for header properties.
+
+    /**
+     * Common logic to load header properties.
+     *
+     * @param string $property
+     * @param mixed $var
+     * @param callable $filter
+     * @return mixed|null
+     */
+    protected function loadHeaderProperty(string $property, $var, callable $filter)
+    {
+        // We have to use parent methods in order to avoid loops.
+        $value = null === $var ? parent::getProperty($property) : null;
+        if (null === $value) {
+            $value = $filter($var ?? $this->getProperty('header')->get($property));
+
+            parent::setProperty($property, $value);
+            if ($this->doHasProperty($property)) {
+                $value = parent::getProperty($property);
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Common logic to load header properties.
+     *
+     * @param string $property
+     * @param mixed $var
+     * @param callable $filter
+     * @return mixed|null
+     */
+    protected function loadProperty(string $property, $var, callable $filter)
+    {
+        // We have to use parent methods in order to avoid loops.
+        $value = null === $var ? parent::getProperty($property) : null;
+        if (null === $value) {
+            $value = $filter($var);
+
+            parent::setProperty($property, $value);
+            if ($this->doHasProperty($property)) {
+                $value = parent::getProperty($property);
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * @param string $property
+     * @param mixed $default
+     * @return mixed
+     */
+    public function getProperty($property, $default = null)
+    {
+        $method = static::$headerProperties[$property] ?? static::$calculatedProperties[$property] ?? null;
+        if ($method && method_exists($this, $method)) {
+            return $this->{$method}();
+        }
+
+        return parent::getProperty($property, $default);
+    }
+
+    /**
+     * @param string $property
+     * @param mixed $value
+     * @return $this
+     */
+    public function setProperty($property, $value)
+    {
+        $method = static::$headerProperties[$property] ?? static::$calculatedProperties[$property] ?? null;
+        if ($method && method_exists($this, $method)) {
+            $this->{$method}($value);
+
+            return $this;
+        }
+
+        parent::setProperty($property, $value);
+
+        return $this;
+    }
+
+    /**
+     * @param string $property
+     * @param mixed $value
+     * @param string|null $separator
+     * @return $this
+     */
+    public function setNestedProperty($property, $value, $separator = null)
+    {
+        $separator = $separator ?: '.';
+        if (strpos($property, 'header' . $separator) === 0) {
+            $this->getProperty('header')->set(str_replace('header' . $separator, '', $property), $value, $separator);
+
+            return $this;
+        }
+
+        parent::setNestedProperty($property, $value, $separator);
+
+        return $this;
+    }
+
+    /**
+     * @param string $property
+     * @param string|null $separator
+     * @return $this
+     */
+    public function unsetNestedProperty($property, $separator = null)
+    {
+        $separator = $separator ?: '.';
+        if (strpos($property, 'header' . $separator) === 0) {
+            $this->getProperty('header')->undef(str_replace('header' . $separator, '', $property), $separator);
+
+            return $this;
+        }
+
+        parent::unsetNestedProperty($property, $separator);
+
+        return $this;
+    }
+
+    /**
+     * @param array $elements
+     * @param bool $extended
+     * @return void
+     */
+    protected function filterElements(array &$elements, bool $extended = false): void
+    {
+        // Markdown storage conversion to page structure.
+        if (array_key_exists('content', $elements)) {
+            $elements['markdown'] = $elements['content'];
+            unset($elements['content']);
+        }
+
+        if (!$extended) {
+            $folder = !empty($elements['folder']) ? trim($elements['folder']) : '';
+
+            if ($folder) {
+                $order = !empty($elements['order']) ? (int)$elements['order'] : null;
+                // TODO: broken
+                $elements['storage_key'] = $order ? sprintf('%02d.%s', $order, $folder) : $folder;
+            }
+        }
+
+        parent::filterElements($elements);
+    }
+
+    /**
+     * @param string $field
+     * @return int|null
+     */
+    protected function getFieldTimestamp(string $field): ?int
+    {
+        $date = $this->getFieldDateTime($field);
+
+        return $date ? $date->getTimestamp() : null;
+    }
+
+    /**
+     * @param string $field
+     * @return DateTime|null
+     */
+    protected function getFieldDateTime(string $field): ?DateTime
+    {
+        try {
+            $value = $this->getProperty($field);
+            if (is_numeric($value)) {
+                $value = '@' . $value;
+            }
+            $date = $value ? new DateTime($value) : null;
+        } catch (Exception $e) {
+            /** @var Debugger $debugger */
+            $debugger = Grav::instance()['debugger'];
+            $debugger->addException($e);
+
+            $date = null;
+        }
+
+        return $date;
+    }
+
+    /**
+     * @return UserCollectionInterface|null
+     * @internal
+     */
+    protected function loadAccounts()
+    {
+        return Grav::instance()['accounts'] ?? null;
+    }
+}
diff --git a/system/src/Grav/Framework/Flex/Pages/Traits/PageAuthorsTrait.php b/system/src/Grav/Framework/Flex/Pages/Traits/PageAuthorsTrait.php
new file mode 100644
index 0000000000..d0934e12c0
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Pages/Traits/PageAuthorsTrait.php
@@ -0,0 +1,249 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Pages\Traits;
+
+use Grav\Common\User\Interfaces\UserInterface;
+use Grav\Framework\Acl\Access;
+use InvalidArgumentException;
+use function in_array;
+use function is_array;
+use function is_bool;
+use function is_string;
+
+/**
+ * Trait PageAuthorsTrait
+ * @package Grav\Framework\Flex\Pages\Traits
+ */
+trait PageAuthorsTrait
+{
+    /** @var array<int,UserInterface> */
+    private $_authors;
+    /** @var array|null */
+    private $_permissionsCache;
+
+    /**
+     * Returns true if object has the named author.
+     *
+     * @param string $username
+     * @return bool
+     */
+    public function hasAuthor(string $username): bool
+    {
+        $authors = (array)$this->getNestedProperty('header.permissions.authors');
+        if (empty($authors)) {
+            return false;
+        }
+
+        foreach ($authors as $author) {
+            if ($username === $author) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get list of all author objects.
+     *
+     * @return array<int,UserInterface>
+     */
+    public function getAuthors(): array
+    {
+        if (null === $this->_authors) {
+            $this->_authors = $this->loadAuthors($this->getNestedProperty('header.permissions.authors', []));
+        }
+
+        return $this->_authors;
+    }
+
+    /**
+     * @param bool $inherit
+     * @return array
+     */
+    public function getPermissions(bool $inherit = false)
+    {
+        if (null === $this->_permissionsCache) {
+            $permissions = [];
+            if ($inherit && $this->getNestedProperty('header.permissions.inherit', true)) {
+                $parent = $this->parent();
+                if ($parent && method_exists($parent, 'getPermissions')) {
+                    $permissions = $parent->getPermissions($inherit);
+                }
+            }
+
+            $this->_permissionsCache = $this->loadPermissions($permissions);
+        }
+
+        return $this->_permissionsCache;
+    }
+
+    /**
+     * @param iterable $authors
+     * @return array<int,UserInterface>
+     */
+    protected function loadAuthors(iterable $authors): array
+    {
+        $accounts = $this->loadAccounts();
+        if (null === $accounts || empty($authors)) {
+            return [];
+        }
+
+        $list = [];
+        foreach ($authors as $username) {
+            if (!is_string($username)) {
+                throw new InvalidArgumentException('Iterable should return username (string).', 500);
+            }
+            $list[] = $accounts->load($username);
+        }
+
+        return $list;
+    }
+
+    /**
+     * @param string $action
+     * @param string|null $scope
+     * @param UserInterface|null $user
+     * @param bool $isAuthor
+     * @return bool|null
+     */
+    public function isParentAuthorized(string $action, string $scope = null, UserInterface $user = null, bool $isAuthor = false): ?bool
+    {
+        $scope = $scope ?? $this->getAuthorizeScope();
+
+        $isMe = null === $user;
+        if ($isMe) {
+            $user = $this->getActiveUser();
+        }
+
+        if (null === $user) {
+            return false;
+        }
+
+        return $this->isAuthorizedByGroup($user, $action, $scope, $isMe, $isAuthor);
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param string $action
+     * @param string $scope
+     * @param bool $isMe
+     * @return bool|null
+     */
+    protected function isAuthorizedOverride(UserInterface $user, string $action, string $scope, bool $isMe): ?bool
+    {
+        if ($action === 'delete' && $this->root()) {
+            // Do not allow deleting root.
+            return false;
+        }
+
+        $isAuthor = !$isMe || $user->authorized ? $this->hasAuthor($user->username) : false;
+
+        return $this->isAuthorizedByGroup($user, $action, $scope, $isMe, $isAuthor) ?? parent::isAuthorizedOverride($user, $action, $scope, $isMe);
+    }
+
+    /**
+     * Group authorization works as follows:
+     *
+     * 1. if any of the groups deny access, return false
+     * 2. else if any of the groups allow access, return true
+     * 3. else return null
+     *
+     * @param UserInterface $user
+     * @param string $action
+     * @param string $scope
+     * @param bool $isMe
+     * @param bool $isAuthor
+     * @return bool|null
+     */
+    protected function isAuthorizedByGroup(UserInterface $user, string $action, string $scope, bool $isMe, bool $isAuthor): ?bool
+    {
+        $authorized = null;
+
+        // In admin we want to check against group permissions.
+        $pageGroups = $this->getPermissions();
+        $userGroups = (array)$user->groups;
+
+        /** @var Access $access */
+        foreach ($pageGroups as $group => $access) {
+            if ($group === 'defaults') {
+                // Special defaults permissions group does not apply to guest.
+                if ($isMe && !$user->authorized) {
+                    continue;
+                }
+            } elseif ($group === 'authors') {
+                if (!$isAuthor) {
+                    continue;
+                }
+            } elseif (!in_array($group, $userGroups, true)) {
+                continue;
+            }
+
+            $auth = $access->authorize($action);
+            if (is_bool($auth)) {
+                if ($auth === false) {
+                    return false;
+                }
+
+                $authorized = true;
+            }
+        }
+
+        if (null === $authorized && $this->getNestedProperty('header.permissions.inherit', true)) {
+            // Authorize against parent page.
+            $parent = $this->parent();
+            if ($parent && method_exists($parent, 'isParentAuthorized')) {
+                $authorized = $parent->isParentAuthorized($action, $scope, !$isMe ? $user : null, $isAuthor);
+            }
+        }
+
+        return $authorized;
+    }
+
+    /**
+     * @param array $parent
+     * @return array
+     */
+    protected function loadPermissions(array $parent = []): array
+    {
+        static $rules = [
+            'c' => 'create',
+            'r' => 'read',
+            'u' => 'update',
+            'd' => 'delete',
+            'p' => 'publish',
+            'l' => 'list'
+        ];
+
+        $permissions = $this->getNestedProperty('header.permissions.groups');
+        $name = $this->root() ? '<root>' : '/' . $this->getKey();
+
+        $list = [];
+        if (is_array($permissions)) {
+            foreach ($permissions as $group => $access) {
+                $list[$group] = new Access($access, $rules, $name);
+            }
+        }
+        foreach ($parent as $group => $access) {
+            if (isset($list[$group])) {
+                $object = $list[$group];
+            } else {
+                $object = new Access([], $rules, $name);
+                $list[$group] = $object;
+            }
+
+            $object->inherit($access);
+        }
+
+        return $list;
+    }
+}
diff --git a/system/src/Grav/Framework/Flex/Pages/Traits/PageContentTrait.php b/system/src/Grav/Framework/Flex/Pages/Traits/PageContentTrait.php
new file mode 100644
index 0000000000..43dfee1163
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Pages/Traits/PageContentTrait.php
@@ -0,0 +1,842 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Pages\Traits;
+
+use Exception;
+use Grav\Common\Config\Config;
+use Grav\Common\Grav;
+use Grav\Common\Markdown\Parsedown;
+use Grav\Common\Markdown\ParsedownExtra;
+use Grav\Common\Page\Header;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\Page\Markdown\Excerpts;
+use Grav\Common\Page\Media;
+use Grav\Common\Twig\Twig;
+use Grav\Common\Utils;
+use Grav\Framework\File\Formatter\YamlFormatter;
+use RocketTheme\Toolbox\Event\Event;
+use stdClass;
+use function in_array;
+use function is_array;
+use function is_string;
+
+/**
+ * Implements PageContentInterface.
+ */
+trait PageContentTrait
+{
+    /** @var array */
+    protected static $headerProperties = [
+        'slug'              => 'slug',
+        'routes'            => false,
+        'title'             => 'title',
+        'language'          => 'language',
+        'template'          => 'template',
+        'menu'              => 'menu',
+        'routable'          => 'routable',
+        'visible'           => 'visible',
+        'redirect'          => 'redirect',
+        'external_url'      => false,
+        'order_dir'         => 'orderDir',
+        'order_by'          => 'orderBy',
+        'order_manual'      => 'orderManual',
+        'dateformat'        => 'dateformat',
+        'date'              => 'date',
+        'markdown_extra'    => false,
+        'taxonomy'          => 'taxonomy',
+        'max_count'         => 'maxCount',
+        'process'           => 'process',
+        'published'         => 'published',
+        'publish_date'      => 'publishDate',
+        'unpublish_date'    => 'unpublishDate',
+        'expires'           => 'expires',
+        'cache_control'     => 'cacheControl',
+        'etag'              => 'eTag',
+        'last_modified'     => 'lastModified',
+        'ssl'               => 'ssl',
+        'template_format'   => 'templateFormat',
+        'debugger'          => false,
+    ];
+
+    /** @var array */
+    protected static $calculatedProperties = [
+        'name' => 'name',
+        'parent' => 'parent',
+        'parent_key' => 'parentStorageKey',
+        'folder' => 'folder',
+        'order' => 'order',
+        'template' => 'template',
+    ];
+
+    /** @var object|null */
+    protected $header;
+
+    /** @var string|null */
+    protected $_summary;
+
+    /** @var string|null */
+    protected $_content;
+
+    /**
+     * Method to normalize the route.
+     *
+     * @param string $route
+     * @return string
+     * @internal
+     */
+    public static function normalizeRoute($route): string
+    {
+        $case_insensitive = Grav::instance()['config']->get('system.force_lowercase_urls');
+
+        return $case_insensitive ? mb_strtolower($route) : $route;
+    }
+
+    /**
+     * @inheritdoc
+     * @return Header
+     */
+    public function header($var = null)
+    {
+        if (null !== $var) {
+            $this->setProperty('header', $var);
+        }
+
+        return $this->getProperty('header');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function summary($size = null, $textOnly = false): string
+    {
+        return $this->processSummary($size, $textOnly);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSummary($summary): void
+    {
+        $this->_summary = $summary;
+    }
+
+    /**
+     * @inheritdoc
+     * @throws Exception
+     */
+    public function content($var = null): string
+    {
+        if (null !== $var) {
+            $this->_content = $var;
+        }
+
+        return $this->_content ?? $this->processContent($this->getRawContent());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getRawContent(): string
+    {
+        return $this->_content ?? $this->getArrayProperty('markdown') ?? '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setRawContent($content): void
+    {
+        $this->_content = $content ?? '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rawMarkdown($var = null): string
+    {
+        if ($var !== null) {
+            $this->setProperty('markdown', $var);
+        }
+
+        return $this->getProperty('markdown') ?? '';
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * Implement by calling:
+     *
+     * $test = new \stdClass();
+     * $value = $this->pageContentValue($name, $test);
+     * if ($value !== $test) {
+     *     return $value;
+     * }
+     * return parent::value($name, $default);
+     */
+    abstract public function value($name, $default = null, $separator = null);
+
+    /**
+     * @inheritdoc
+     */
+    public function media($var = null): Media
+    {
+        if ($var instanceof Media) {
+            $this->setProperty('media', $var);
+        }
+
+        return $this->getProperty('media');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function title($var = null): string
+    {
+        return $this->loadHeaderProperty(
+            'title',
+            $var,
+            function ($value) {
+                return trim($value ?? ($this->root() ? '<root>' : ucfirst($this->slug())));
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function menu($var = null): string
+    {
+        return $this->loadHeaderProperty(
+            'menu',
+            $var,
+            function ($value) {
+                return trim($value ?: $this->title());
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function visible($var = null): bool
+    {
+        $value = $this->loadHeaderProperty(
+            'visible',
+            $var,
+            function ($value) {
+                return ($value ?? $this->order() !== false) && !$this->isModule();
+            }
+        );
+
+        return $value && $this->published();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function published($var = null): bool
+    {
+        return $this->loadHeaderProperty(
+            'published',
+            $var,
+            static function ($value) {
+                return (bool)($value ?? true);
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function publishDate($var = null): ?int
+    {
+        return $this->loadHeaderProperty(
+            'publish_date',
+            $var,
+            function ($value) {
+                return $value ? Utils::date2timestamp($value, $this->getProperty('dateformat')) : null;
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function unpublishDate($var = null): ?int
+    {
+        return $this->loadHeaderProperty(
+            'unpublish_date',
+            $var,
+            function ($value) {
+                return $value ? Utils::date2timestamp($value, $this->getProperty('dateformat')) : null;
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process($var = null): array
+    {
+        return $this->loadHeaderProperty(
+            'process',
+            $var,
+            function ($value) {
+                $value = array_replace(Grav::instance()['config']->get('system.pages.process', []), is_array($value) ? $value : []);
+                foreach ($value as $process => $status) {
+                    $value[$process] = (bool)$status;
+                }
+
+                return $value;
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function slug($var = null)
+    {
+        return $this->loadHeaderProperty(
+            'slug',
+            $var,
+            function ($value) {
+                if (is_string($value)) {
+                    return $value;
+                }
+
+                $folder = $this->folder();
+                if (null === $folder) {
+                    return null;
+                }
+
+                $folder = preg_replace(static::PAGE_ORDER_PREFIX_REGEX, '', $folder);
+                if (null === $folder) {
+                    return null;
+                }
+
+                return static::normalizeRoute($folder);
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function order($var = null)
+    {
+        $property = $this->loadProperty(
+            'order',
+            $var,
+            function ($value) {
+                if (null === $value) {
+                    $folder = $this->folder();
+                    if (null !== $folder) {
+                        preg_match(static::PAGE_ORDER_REGEX, $folder, $order);
+                    }
+
+                    $value = $order[1] ?? false;
+                }
+
+                if ($value === '') {
+                    $value = false;
+                }
+                if ($value !== false) {
+                    $value = (int)$value;
+                }
+
+                return $value;
+            }
+        );
+
+        return $property !== false ? sprintf('%02d.', $property) : false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function id($var = null): string
+    {
+        $property = 'id';
+        $value = null === $var ? $this->getProperty($property) : null;
+        if (null === $value) {
+            $value = $this->language() . ($var ?? ($this->modified() . md5('flex-' . $this->getFlexType() . '-' . $this->getKey())));
+
+            $this->setProperty($property, $value);
+            if ($this->doHasProperty($property)) {
+                $value = $this->getProperty($property);
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function modified($var = null): int
+    {
+        $property = 'modified';
+        $value = null === $var ? $this->getProperty($property) : null;
+        if (null === $value) {
+            $value = (int)($var ?: $this->getTimestamp());
+
+            $this->setProperty($property, $value);
+            if ($this->doHasProperty($property)) {
+                $value = $this->getProperty($property);
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function lastModified($var = null): bool
+    {
+        return $this->loadHeaderProperty(
+            'last_modified',
+            $var,
+            static function ($value) {
+                return (bool)($value ?? Grav::instance()['config']->get('system.pages.last_modified'));
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function date($var = null): int
+    {
+        return $this->loadHeaderProperty(
+            'date',
+            $var,
+            function ($value) {
+                $value = $value ? Utils::date2timestamp($value, $this->getProperty('dateformat')) : false;
+
+                return $value ?: $this->modified();
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function dateformat($var = null): ?string
+    {
+        return $this->loadHeaderProperty(
+            'dateformat',
+            $var,
+            static function ($value) {
+                return $value;
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function taxonomy($var = null): array
+    {
+        return $this->loadHeaderProperty(
+            'taxonomy',
+            $var,
+            static function ($value) {
+                if (is_array($value)) {
+                    // make sure first level are arrays
+                    array_walk($value, static function (&$val) {
+                        $val = (array) $val;
+                    });
+                    // make sure all values are strings
+                    array_walk_recursive($value, static function (&$val) {
+                        $val = (string) $val;
+                    });
+                }
+
+                return $value ?? [];
+            }
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function shouldProcess($process): bool
+    {
+        $test = $this->process();
+
+        return !empty($test[$process]);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isPage(): bool
+    {
+        return !in_array($this->template(), ['', 'folder'], true);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isDir(): bool
+    {
+        return !$this->isPage();
+    }
+
+    /**
+     * @return bool
+     */
+    public function isModule(): bool
+    {
+        return $this->modularTwig();
+    }
+
+    /**
+     * @param Header|stdClass|array|null $value
+     * @return Header
+     */
+    protected function offsetLoad_header($value)
+    {
+        if ($value instanceof Header) {
+            return $value;
+        }
+
+        if (null === $value) {
+            $value = [];
+        } elseif ($value instanceof stdClass) {
+            $value = (array)$value;
+        }
+
+        return new Header($value);
+    }
+
+    /**
+     * @param Header|stdClass|array|null $value
+     * @return Header
+     */
+    protected function offsetPrepare_header($value)
+    {
+        return $this->offsetLoad_header($value);
+    }
+
+    /**
+     * @param Header|null $value
+     * @return array
+     */
+    protected function offsetSerialize_header(?Header $value)
+    {
+        return $value ? $value->toArray() : [];
+    }
+
+    /**
+     * @param string $name
+     * @param mixed|null $default
+     * @return mixed
+     */
+    protected function pageContentValue($name, $default = null)
+    {
+        switch ($name) {
+            case 'frontmatter':
+                $frontmatter = $this->getArrayProperty('frontmatter');
+                if ($frontmatter === null) {
+                    $header = $this->prepareStorage()['header'] ?? null;
+                    if ($header) {
+                        $formatter = new YamlFormatter();
+                        $frontmatter = $formatter->encode($header);
+                    } else {
+                        $frontmatter = '';
+                    }
+                }
+                return $frontmatter;
+            case 'content':
+                return $this->getProperty('markdown');
+            case 'order':
+                return (string)$this->order();
+            case 'menu':
+                return $this->menu();
+            case 'ordering':
+                return $this->order() !== false ? '1' : '0';
+            case 'folder':
+                $folder = $this->folder();
+
+                return null !== $folder ? preg_replace(static::PAGE_ORDER_PREFIX_REGEX, '', $folder) : '';
+            case 'slug':
+                return $this->slug();
+            case 'published':
+                return $this->published();
+            case 'visible':
+                return $this->visible();
+            case 'media':
+                return $this->media()->all();
+            case 'media.file':
+                return $this->media()->files();
+            case 'media.video':
+                return $this->media()->videos();
+            case 'media.image':
+                return $this->media()->images();
+            case 'media.audio':
+                return $this->media()->audios();
+        }
+
+        return $default;
+    }
+
+    /**
+     * @param int|null $size
+     * @param bool $textOnly
+     * @return string
+     */
+    protected function processSummary($size = null, $textOnly = false): string
+    {
+        $config = (array)Grav::instance()['config']->get('site.summary');
+        $config_page = (array)$this->getNestedProperty('header.summary');
+        if ($config_page) {
+            $config = array_merge($config, $config_page);
+        }
+
+        // Summary is not enabled, return the whole content.
+        if (empty($config['enabled'])) {
+            return $this->content();
+        }
+
+        $content = $this->_summary ?? $this->content();
+        if ($textOnly) {
+            $content =  strip_tags($content);
+        }
+        $content_size = mb_strwidth($content, 'utf-8');
+        $summary_size = $this->_summary !== null ? $content_size : $this->getProperty('summary_size');
+
+        // Return calculated summary based on summary divider's position.
+        $format = $config['format'] ?? '';
+
+        // Return entire page content on wrong/unknown format.
+        if ($format !== 'long' && $format !== 'short') {
+            return $content;
+        }
+
+        if ($format === 'short' && null !== $summary_size) {
+            // Slice the string on breakpoint.
+            if ($content_size > $summary_size) {
+                return mb_substr($content, 0, $summary_size);
+            }
+
+            return $content;
+        }
+
+        // If needed, get summary size from the config.
+        $size = $size ?? $config['size'] ?? null;
+
+        // Return calculated summary based on defaults.
+        $size = is_numeric($size) ? (int)$size : -1;
+        if ($size < 0) {
+            $size = 300;
+        }
+
+        // If the size is zero or smaller than the summary limit, return the entire page content.
+        if ($size === 0 || $content_size <= $size) {
+            return $content;
+        }
+
+        // Only return string but not html, wrap whatever html tag you want when using.
+        if ($textOnly) {
+            return mb_strimwidth($content, 0, $size, '...', 'UTF-8');
+        }
+
+        $summary = Utils::truncateHTML($content, $size);
+
+        return html_entity_decode($summary, ENT_COMPAT | ENT_HTML5, 'UTF-8');
+    }
+
+    /**
+     * Gets and Sets the content based on content portion of the .md file
+     *
+     * @param  string $content
+     * @return string
+     * @throws Exception
+     */
+    protected function processContent($content): string
+    {
+        $content = is_string($content) ? $content : '';
+        $grav = Grav::instance();
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
+        $process_markdown = $this->shouldProcess('markdown');
+        $process_twig = $this->shouldProcess('twig') || $this->isModule();
+        $cache_enable = $this->getNestedProperty('header.cache_enable') ?? $config->get('system.cache.enabled', true);
+
+        $twig_first = $this->getNestedProperty('header.twig_first') ?? $config->get('system.pages.twig_first', false);
+        $never_cache_twig = $this->getNestedProperty('header.never_cache_twig') ?? $config->get('system.pages.never_cache_twig', false);
+
+        if ($cache_enable) {
+            $cache = $this->getCache('render');
+            $key = md5($this->getCacheKey() . '-content');
+            $cached = $cache->get($key);
+            if ($cached && $cached['checksum'] === $this->getCacheChecksum()) {
+                $this->_content = $cached['content'] ?? '';
+                $this->_content_meta = $cached['content_meta'] ?? null;
+
+                if ($process_twig && $never_cache_twig) {
+                    $this->_content = $this->processTwig($this->_content);
+                }
+            }
+        }
+
+        if (null === $this->_content) {
+            $markdown_options = [];
+            if ($process_markdown) {
+                // Build markdown options.
+                $markdown_options = (array)$config->get('system.pages.markdown');
+                $markdown_page_options = (array)$this->getNestedProperty('header.markdown');
+                if ($markdown_page_options) {
+                    $markdown_options = array_merge($markdown_options, $markdown_page_options);
+                }
+
+                // pages.markdown_extra is deprecated, but still check it...
+                if (!isset($markdown_options['extra'])) {
+                    $extra = $this->getNestedProperty('header.markdown_extra') ?? $config->get('system.pages.markdown_extra');
+                    if (null !== $extra) {
+                        user_error('Configuration option \'system.pages.markdown_extra\' is deprecated since Grav 1.5, use \'system.pages.markdown.extra\' instead', E_USER_DEPRECATED);
+
+                        $markdown_options['extra'] = $extra;
+                    }
+                }
+            }
+            $options = [
+                'markdown' => $markdown_options,
+                'images' => $config->get('system.images', [])
+            ];
+
+            $this->_content = $content;
+            $grav->fireEvent('onPageContentRaw', new Event(['page' => $this]));
+
+            if ($twig_first && !$never_cache_twig) {
+                if ($process_twig) {
+                    $this->_content = $this->processTwig($this->_content);
+                }
+
+                if ($process_markdown) {
+                    $this->_content = $this->processMarkdown($this->_content, $options);
+                }
+
+                // Content Processed but not cached yet
+                $grav->fireEvent('onPageContentProcessed', new Event(['page' => $this]));
+            } else {
+                if ($process_markdown) {
+                    $options['keep_twig'] = $process_twig;
+                    $this->_content = $this->processMarkdown($this->_content, $options);
+                }
+
+                // Content Processed but not cached yet
+                $grav->fireEvent('onPageContentProcessed', new Event(['page' => $this]));
+
+                if ($cache_enable && $never_cache_twig) {
+                    $this->cachePageContent();
+                }
+
+                if ($process_twig) {
+                    \assert(is_string($this->_content));
+                    $this->_content = $this->processTwig($this->_content);
+                }
+            }
+
+            if ($cache_enable && !$never_cache_twig) {
+                $this->cachePageContent();
+            }
+        }
+
+        \assert(is_string($this->_content));
+
+        // Handle summary divider
+        $delimiter = $config->get('site.summary.delimiter', '===');
+        $divider_pos = mb_strpos($this->_content, "<p>{$delimiter}</p>");
+        if ($divider_pos !== false) {
+            $this->setProperty('summary_size', $divider_pos);
+            $this->_content = str_replace("<p>{$delimiter}</p>", '', $this->_content);
+        }
+
+        // Fire event when Page::content() is called
+        $grav->fireEvent('onPageContent', new Event(['page' => $this]));
+
+        return $this->_content;
+    }
+
+    /**
+     * Process the Twig page content.
+     *
+     * @param  string $content
+     * @return string
+     */
+    protected function processTwig($content): string
+    {
+        /** @var Twig $twig */
+        $twig = Grav::instance()['twig'];
+
+        /** @var PageInterface $this */
+        return $twig->processPage($this, $content);
+    }
+
+    /**
+     * Process the Markdown content.
+     *
+     * Uses Parsedown or Parsedown Extra depending on configuration.
+     *
+     * @param string $content
+     * @param array  $options
+     * @return string
+     * @throws Exception
+     */
+    protected function processMarkdown($content, array $options = []): string
+    {
+        /** @var PageInterface $self */
+        $self = $this;
+
+        $excerpts = new Excerpts($self, $options);
+
+        // Initialize the preferred variant of markdown parser.
+        if (isset($options['extra'])) {
+            $parsedown = new ParsedownExtra($excerpts);
+        } else {
+            $parsedown = new Parsedown($excerpts);
+        }
+
+        $keepTwig = (bool)($options['keep_twig'] ?? false);
+        if ($keepTwig) {
+            $token = [
+                '/' . Utils::generateRandomString(3),
+                Utils::generateRandomString(3) . '/'
+            ];
+            // Base64 encode any twig.
+            $content = preg_replace_callback(
+                ['/({#.*?#})/mu', '/({{.*?}})/mu', '/({%.*?%})/mu'],
+                static function ($matches) use ($token) { return $token[0] . base64_encode($matches[1]) . $token[1]; },
+                $content
+            );
+        }
+
+        $content = $parsedown->text($content);
+
+        if ($keepTwig) {
+            // Base64 decode the encoded twig.
+            $content = preg_replace_callback(
+                ['`' . $token[0] . '([A-Za-z0-9+/]+={0,2})' . $token[1] . '`mu'],
+                static function ($matches) { return base64_decode($matches[1]); },
+                $content
+            );
+        }
+
+        return $content;
+    }
+
+    abstract protected function loadHeaderProperty(string $property, $var, callable $filter);
+}
diff --git a/system/src/Grav/Framework/Flex/Pages/Traits/PageLegacyTrait.php b/system/src/Grav/Framework/Flex/Pages/Traits/PageLegacyTrait.php
new file mode 100644
index 0000000000..d75380373d
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Pages/Traits/PageLegacyTrait.php
@@ -0,0 +1,1119 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Pages\Traits;
+
+use Exception;
+use Grav\Common\Grav;
+use Grav\Common\Page\Collection;
+use Grav\Common\Page\Interfaces\PageCollectionInterface;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\Page\Pages;
+use Grav\Common\Utils;
+use Grav\Common\Yaml;
+use Grav\Framework\File\Formatter\MarkdownFormatter;
+use Grav\Framework\File\Formatter\YamlFormatter;
+use Grav\Framework\Filesystem\Filesystem;
+use Grav\Framework\Flex\Interfaces\FlexCollectionInterface;
+use Grav\Framework\Flex\Interfaces\FlexIndexInterface;
+use Grav\Framework\Flex\Pages\FlexPageCollection;
+use Grav\Framework\Flex\Pages\FlexPageIndex;
+use Grav\Framework\Flex\Pages\FlexPageObject;
+use InvalidArgumentException;
+use RocketTheme\Toolbox\File\MarkdownFile;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use SplFileInfo;
+use function in_array;
+use function is_array;
+use function is_string;
+use function strlen;
+
+/**
+ * Implements PageLegacyInterface
+ */
+trait PageLegacyTrait
+{
+    /** @var array|null */
+    private $_content_meta;
+    /** @var array|null */
+    private $_metadata;
+
+    /**
+     * Initializes the page instance variables based on a file
+     *
+     * @param  SplFileInfo $file The file information for the .md file that the page represents
+     * @param  string|null $extension
+     * @return $this
+     */
+    public function init(SplFileInfo $file, $extension = null)
+    {
+        // TODO:
+        throw new RuntimeException(__METHOD__ . '(): Not Implemented');
+    }
+
+    /**
+     * Gets and Sets the raw data
+     *
+     * @param  string|null $var Raw content string
+     * @return string      Raw content string
+     */
+    public function raw($var = null): string
+    {
+        if (null !== $var) {
+            // TODO:
+            throw new RuntimeException(__METHOD__ . '(string): Not Implemented');
+        }
+
+        $storage = $this->getFlexDirectory()->getStorage();
+        if (method_exists($storage, 'readRaw')) {
+            return $storage->readRaw($this->getStorageKey());
+        }
+
+        $array = $this->prepareStorage();
+        $formatter = new MarkdownFormatter();
+
+        return $formatter->encode($array);
+    }
+
+    /**
+     * Gets and Sets the page frontmatter
+     *
+     * @param string|null $var
+     * @return string
+     */
+    public function frontmatter($var = null): string
+    {
+        if (null !== $var) {
+            $formatter = new YamlFormatter();
+            $this->setProperty('frontmatter', $var);
+            $this->setProperty('header', $formatter->decode($var));
+
+            return $var;
+        }
+
+        $storage = $this->getFlexDirectory()->getStorage();
+        if (method_exists($storage, 'readFrontmatter')) {
+            return $storage->readFrontmatter($this->getStorageKey());
+        }
+
+        $array = $this->prepareStorage();
+        $formatter = new YamlFormatter();
+
+        return $formatter->encode($array['header'] ?? []);
+    }
+
+    /**
+     * Modify a header value directly
+     *
+     * @param string $key
+     * @param string|array $value
+     * @return void
+     */
+    public function modifyHeader($key, $value): void
+    {
+        $this->setNestedProperty("header.{$key}", $value);
+    }
+
+    /**
+     * @return int
+     */
+    public function httpResponseCode(): int
+    {
+        $code = (int)$this->getNestedProperty('header.http_response_code');
+
+        return $code ?: 200;
+    }
+
+    /**
+     * @return array
+     */
+    public function httpHeaders(): array
+    {
+        $headers = [];
+
+        $format = $this->templateFormat();
+        $cache_control = $this->cacheControl();
+        $expires = $this->expires();
+
+        // Set Content-Type header.
+        $headers['Content-Type'] = Utils::getMimeByExtension($format, 'text/html');
+
+        // Calculate Expires Headers if set to > 0.
+        if ($expires > 0) {
+            $expires_date = gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT';
+            if (!$cache_control) {
+                $headers['Cache-Control'] = 'max-age=' . $expires;
+            }
+            $headers['Expires'] = $expires_date;
+        }
+
+        // Set Cache-Control header.
+        if ($cache_control) {
+            $headers['Cache-Control'] = strtolower($cache_control);
+        }
+
+        // Set Last-Modified header.
+        if ($this->lastModified()) {
+            $last_modified_date = gmdate('D, d M Y H:i:s', $this->modified()) . ' GMT';
+            $headers['Last-Modified'] = $last_modified_date;
+        }
+
+        // Calculate ETag based on the serialized page and modified time.
+        if ($this->eTag()) {
+            $headers['ETag'] = '1';
+        }
+
+        // Set Vary: Accept-Encoding header.
+        $grav = Grav::instance();
+        if ($grav['config']->get('system.pages.vary_accept_encoding', false)) {
+            $headers['Vary'] = 'Accept-Encoding';
+        }
+
+        return $headers;
+    }
+
+    /**
+     * Get the contentMeta array and initialize content first if it's not already
+     *
+     * @return array
+     */
+    public function contentMeta(): array
+    {
+        // Content meta is generated during the content is being rendered, so make sure we have done it.
+        $this->content();
+
+        return $this->_content_meta ?? [];
+    }
+
+    /**
+     * Add an entry to the page's contentMeta array
+     *
+     * @param string $name
+     * @param string $value
+     * @return void
+     */
+    public function addContentMeta($name, $value): void
+    {
+        $this->_content_meta[$name] = $value;
+    }
+
+    /**
+     * Return the whole contentMeta array as it currently stands
+     *
+     * @param string|null $name
+     * @return string|array|null
+     */
+    public function getContentMeta($name = null)
+    {
+        if ($name) {
+            return $this->_content_meta[$name] ?? null;
+        }
+
+        return $this->_content_meta ?? [];
+    }
+
+    /**
+     * Sets the whole content meta array in one shot
+     *
+     * @param array $content_meta
+     * @return array
+     */
+    public function setContentMeta($content_meta): array
+    {
+        return $this->_content_meta = $content_meta;
+    }
+
+    /**
+     * Fires the onPageContentProcessed event, and caches the page content using a unique ID for the page
+     */
+    public function cachePageContent(): void
+    {
+        $value = [
+            'checksum' => $this->getCacheChecksum(),
+            'content' => $this->_content,
+            'content_meta' => $this->_content_meta
+        ];
+
+        $cache = $this->getCache('render');
+        $key = md5($this->getCacheKey() . '-content');
+
+        $cache->set($key, $value);
+    }
+
+    /**
+     * Get file object to the page.
+     *
+     * @return MarkdownFile|null
+     */
+    public function file(): ?MarkdownFile
+    {
+        // TODO:
+        throw new RuntimeException(__METHOD__ . '(): Not Implemented');
+    }
+
+    /**
+     * Prepare move page to new location. Moves also everything that's under the current page.
+     *
+     * You need to call $this->save() in order to perform the move.
+     *
+     * @param PageInterface $parent New parent page.
+     * @return $this
+     */
+    public function move(PageInterface $parent)
+    {
+        if ($this->route() === $parent->route()) {
+            throw new RuntimeException('Failed: Cannot set page parent to self');
+        }
+        $rawRoute = $this->rawRoute();
+        if ($rawRoute && Utils::startsWith($parent->rawRoute(), $rawRoute)) {
+            throw new RuntimeException('Failed: Cannot set page parent to a child of current page');
+        }
+
+        $this->storeOriginal();
+
+        // TODO:
+        throw new RuntimeException(__METHOD__ . '(): Not Implemented');
+    }
+
+    /**
+     * Prepare a copy from the page. Copies also everything that's under the current page.
+     *
+     * Returns a new Page object for the copy.
+     * You need to call $this->save() in order to perform the move.
+     *
+     * @param PageInterface|null $parent New parent page.
+     * @return $this
+     */
+    public function copy(PageInterface $parent = null)
+    {
+        $this->storeOriginal();
+
+        $filesystem = Filesystem::getInstance(false);
+
+        $parentStorageKey = ltrim($filesystem->dirname("/{$this->getMasterKey()}"), '/');
+
+        /** @var FlexPageIndex<FlexPageObject,FlexPageCollection<FlexPageObject>> $index */
+        $index = $this->getFlexDirectory()->getIndex();
+
+        if ($parent) {
+            if ($parent instanceof FlexPageObject) {
+                $k = $parent->getMasterKey();
+                if ($k !== $parentStorageKey) {
+                    $parentStorageKey = $k;
+                }
+            } else {
+                throw new RuntimeException('Cannot copy page, parent is of unknown type');
+            }
+        } else {
+            $parent = $parentStorageKey
+                ? $this->getFlexDirectory()->getObject($parentStorageKey, 'storage_key')
+                : (method_exists($index, 'getRoot') ? $index->getRoot() : null);
+        }
+
+        // Find non-existing key.
+        $parentKey = $parent ? $parent->getKey() : '';
+        if ($this instanceof FlexPageObject) {
+            $key = trim($parentKey . '/' . $this->folder(), '/');
+            $key = preg_replace(static::PAGE_ORDER_PREFIX_REGEX, '', $key);
+            \assert(is_string($key));
+        } else {
+            $key = trim($parentKey . '/' . Utils::basename($this->getKey()), '/');
+        }
+
+        if ($index->containsKey($key)) {
+            $key = preg_replace('/\d+$/', '', $key);
+            $i = 1;
+            do {
+                $i++;
+                $test = "{$key}{$i}";
+            } while ($index->containsKey($test));
+            $key = $test;
+        }
+        $folder = Utils::basename($key);
+
+        // Get the folder name.
+        $order = $this->getProperty('order');
+        if ($order) {
+            $order++;
+        }
+
+        $parts = [];
+        if ($parentStorageKey !== '') {
+            $parts[] = $parentStorageKey;
+        }
+        $parts[] = $order ? sprintf('%02d.%s', $order, $folder) : $folder;
+
+        // Finally update the object.
+        $this->setKey($key);
+        $this->setStorageKey(implode('/', $parts));
+
+        $this->markAsCopy();
+
+        return $this;
+    }
+
+    /**
+     * Get the blueprint name for this page.  Use the blueprint form field if set
+     *
+     * @return string
+     */
+    public function blueprintName(): string
+    {
+        $blueprint_name = filter_input(INPUT_POST, 'blueprint', FILTER_SANITIZE_STRING) ?: $this->template();
+
+        return $blueprint_name;
+    }
+
+    /**
+     * Validate page header.
+     *
+     * @return void
+     * @throws Exception
+     */
+    public function validate(): void
+    {
+        $blueprint = $this->getBlueprint();
+        $blueprint->validate($this->toArray());
+    }
+
+    /**
+     * Filter page header from illegal contents.
+     *
+     * @return void
+     */
+    public function filter(): void
+    {
+        $blueprints = $this->getBlueprint();
+        $values = $blueprints->filter($this->toArray());
+        if ($values && isset($values['header'])) {
+            $this->header($values['header']);
+        }
+    }
+
+    /**
+     * Get unknown header variables.
+     *
+     * @return array
+     */
+    public function extra(): array
+    {
+        $data = $this->prepareStorage();
+
+        return $this->getBlueprint()->extra((array)($data['header'] ?? []), 'header.');
+    }
+
+    /**
+     * Convert page to an array.
+     *
+     * @return array
+     */
+    public function toArray(): array
+    {
+        return [
+            'header' => (array)$this->header(),
+            'content' => (string)$this->getFormValue('content')
+        ];
+    }
+
+    /**
+     * Convert page to YAML encoded string.
+     *
+     * @return string
+     */
+    public function toYaml(): string
+    {
+        return Yaml::dump($this->toArray(), 20);
+    }
+
+    /**
+     * Convert page to JSON encoded string.
+     *
+     * @return string
+     */
+    public function toJson(): string
+    {
+        $json = json_encode($this->toArray());
+        if (!is_string($json)) {
+            throw new RuntimeException('Internal error');
+        }
+
+        return $json;
+    }
+
+    /**
+     * Gets and sets the name field.  If no name field is set, it will return 'default.md'.
+     *
+     * @param  string|null $var The name of this page.
+     * @return string      The name of this page.
+     */
+    public function name($var = null): string
+    {
+        return $this->loadProperty(
+            'name',
+            $var,
+            function ($value) {
+                $value = $value ?? $this->getMetaData()['template'] ?? 'default';
+                if (!preg_match('/\.md$/', $value)) {
+                    $language = $this->language();
+                    if ($language) {
+                        // TODO: better language support
+                        $value .= ".{$language}";
+                    }
+                    $value .= '.md';
+                }
+                $value = preg_replace('|^modular/|', '', $value);
+
+                $this->unsetProperty('template');
+
+                return $value;
+            }
+        );
+    }
+
+    /**
+     * Returns child page type.
+     *
+     * @return string
+     */
+    public function childType(): string
+    {
+        return (string)$this->getNestedProperty('header.child_type');
+    }
+
+    /**
+     * Gets and sets the template field. This is used to find the correct Twig template file to render.
+     * If no field is set, it will return the name without the .md extension
+     *
+     * @param  string|null $var the template name
+     * @return string      the template name
+     */
+    public function template($var = null): string
+    {
+        return $this->loadHeaderProperty(
+            'template',
+            $var,
+            function ($value) {
+                return trim($value ?? (($this->isModule() ? 'modular/' : '') . str_replace($this->extension(), '', $this->name())));
+            }
+        );
+    }
+
+    /**
+     * Allows a page to override the output render format, usually the extension provided in the URL.
+     * (e.g. `html`, `json`, `xml`, etc).
+     *
+     * @param string|null $var
+     * @return string
+     */
+    public function templateFormat($var = null): string
+    {
+        return $this->loadHeaderProperty(
+            'template_format',
+            $var,
+            function ($value) {
+                return ltrim($value ?? $this->getNestedProperty('header.append_url_extension') ?: Utils::getPageFormat(), '.');
+            }
+        );
+    }
+
+    /**
+     * Gets and sets the extension field.
+     *
+     * @param string|null $var
+     * @return string
+     */
+    public function extension($var = null): string
+    {
+        if (null !== $var) {
+            $this->setProperty('format', $var);
+        }
+
+        $language = $this->language();
+        if ($language) {
+            $language = '.' . $language;
+        }
+        $format = '.' . ($this->getProperty('format') ?? Utils::pathinfo($this->name(), PATHINFO_EXTENSION));
+
+        return $language . $format;
+    }
+
+    /**
+     * Gets and sets the expires field. If not set will return the default
+     *
+     * @param  int|null $var The new expires value.
+     * @return int      The expires value
+     */
+    public function expires($var = null): int
+    {
+        return $this->loadHeaderProperty(
+            'expires',
+            $var,
+            static function ($value) {
+                return (int)($value ?? Grav::instance()['config']->get('system.pages.expires'));
+            }
+        );
+    }
+
+    /**
+     * Gets and sets the cache-control property.  If not set it will return the default value (null)
+     * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control for more details on valid options
+     *
+     * @param string|null $var
+     * @return string|null
+     */
+    public function cacheControl($var = null): ?string
+    {
+        return $this->loadHeaderProperty(
+            'cache_control',
+            $var,
+            static function ($value) {
+                return ((string)($value ?? Grav::instance()['config']->get('system.pages.cache_control'))) ?: null;
+            }
+        );
+    }
+
+    /**
+     * @param bool|null $var
+     * @return bool|null
+     */
+    public function ssl($var = null): ?bool
+    {
+        return $this->loadHeaderProperty(
+            'ssl',
+            $var,
+            static function ($value) {
+                return $value ? (bool)$value : null;
+            }
+        );
+    }
+
+    /**
+     * Returns the state of the debugger override setting for this page
+     *
+     * @return bool
+     */
+    public function debugger(): bool
+    {
+        return (bool)$this->getNestedProperty('header.debugger', true);
+    }
+
+    /**
+     * Function to merge page metadata tags and build an array of Metadata objects
+     * that can then be rendered in the page.
+     *
+     * @param  array|null $var an Array of metadata values to set
+     * @return array      an Array of metadata values for the page
+     */
+    public function metadata($var = null): array
+    {
+        if ($var !== null) {
+            $this->_metadata = (array)$var;
+        }
+
+        // if not metadata yet, process it.
+        if (null === $this->_metadata) {
+            $this->_metadata = [];
+
+            $config = Grav::instance()['config'];
+
+            // Set the Generator tag
+            $defaultMetadata = ['generator' => 'GravCMS'];
+            $siteMetadata = $config->get('site.metadata', []);
+            $headerMetadata = $this->getNestedProperty('header.metadata', []);
+
+            // Get initial metadata for the page
+            $metadata = array_merge($defaultMetadata, $siteMetadata, $headerMetadata);
+
+            $header_tag_http_equivs = ['content-type', 'default-style', 'refresh', 'x-ua-compatible', 'content-security-policy'];
+            $escape = !$config->get('system.strict_mode.twig_compat', false) || $config->get('system.twig.autoescape', true);
+
+            // Build an array of meta objects..
+            foreach ($metadata as $key => $value) {
+                // Lowercase the key
+                $key = strtolower($key);
+
+                // If this is a property type metadata: "og", "twitter", "facebook" etc
+                // Backward compatibility for nested arrays in metas
+                if (is_array($value)) {
+                    foreach ($value as $property => $prop_value) {
+                        $prop_key = $key . ':' . $property;
+                        $this->_metadata[$prop_key] = [
+                            'name' => $prop_key,
+                            'property' => $prop_key,
+                            'content' => $escape ? htmlspecialchars($prop_value, ENT_QUOTES | ENT_HTML5, 'UTF-8') : $prop_value
+                        ];
+                    }
+                } elseif ($value) {
+                    // If it this is a standard meta data type
+                    if (in_array($key, $header_tag_http_equivs, true)) {
+                        $this->_metadata[$key] = [
+                            'http_equiv' => $key,
+                            'content' => $escape ? htmlspecialchars($value, ENT_COMPAT, 'UTF-8') : $value
+                        ];
+                    } elseif ($key === 'charset') {
+                        $this->_metadata[$key] = ['charset' => $escape ? htmlspecialchars($value, ENT_QUOTES | ENT_HTML5, 'UTF-8') : $value];
+                    } else {
+                        // if it's a social metadata with separator, render as property
+                        $separator = strpos($key, ':');
+                        $hasSeparator = $separator && $separator < strlen($key) - 1;
+                        $entry = [
+                            'content' => $escape ? htmlspecialchars($value, ENT_QUOTES | ENT_HTML5, 'UTF-8') : $value
+                        ];
+
+                        if ($hasSeparator && !Utils::startsWith($key, 'twitter')) {
+                            $entry['property'] = $key;
+                        } else {
+                            $entry['name'] = $key;
+                        }
+
+                        $this->_metadata[$key] = $entry;
+                    }
+                }
+            }
+        }
+
+        return $this->_metadata;
+    }
+
+    /**
+     * Reset the metadata and pull from header again
+     */
+    public function resetMetadata(): void
+    {
+        $this->_metadata = null;
+    }
+
+    /**
+     * Gets and sets the option to show the etag header for the page.
+     *
+     * @param  bool|null $var show etag header
+     * @return bool      show etag header
+     */
+    public function eTag($var = null): bool
+    {
+        return $this->loadHeaderProperty(
+            'etag',
+            $var,
+            static function ($value) {
+                return (bool)($value ?? Grav::instance()['config']->get('system.pages.etag'));
+            }
+        );
+    }
+
+    /**
+     * Gets and sets the path to the .md file for this Page object.
+     *
+     * @param  string|null $var the file path
+     * @return string|null      the file path
+     */
+    public function filePath($var = null): ?string
+    {
+        if (null !== $var) {
+            // TODO:
+            throw new RuntimeException(__METHOD__ . '(string): Not Implemented');
+        }
+
+        $folder = $this->getStorageFolder();
+        if (!$folder) {
+            return null;
+        }
+
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+        $folder = $locator->isStream($folder) ? $locator->getResource($folder) : GRAV_ROOT . "/{$folder}";
+
+        return $folder . '/' . ($this->isPage() ? $this->name() : 'default.md');
+    }
+
+    /**
+     * Gets the relative path to the .md file
+     *
+     * @return string|null The relative file path
+     */
+    public function filePathClean(): ?string
+    {
+        $folder = $this->getStorageFolder();
+        if (!$folder) {
+            return null;
+        }
+
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+        $folder = $locator->isStream($folder) ? $locator->getResource($folder, false) : $folder;
+
+        return $folder .  '/' . ($this->isPage() ? $this->name() : 'default.md');
+    }
+
+    /**
+     * Gets and sets the order by which any sub-pages should be sorted.
+     *
+     * @param  string|null $var the order, either "asc" or "desc"
+     * @return string      the order, either "asc" or "desc"
+     */
+    public function orderDir($var = null): string
+    {
+        return $this->loadHeaderProperty(
+            'order_dir',
+            $var,
+            static function ($value) {
+                return strtolower(trim($value) ?: Grav::instance()['config']->get('system.pages.order.dir')) === 'desc' ? 'desc' : 'asc';
+            }
+        );
+    }
+
+    /**
+     * Gets and sets the order by which the sub-pages should be sorted.
+     *
+     * default - is the order based on the file system, ie 01.Home before 02.Advark
+     * title - is the order based on the title set in the pages
+     * date - is the order based on the date set in the pages
+     * folder - is the order based on the name of the folder with any numerics omitted
+     *
+     * @param  string|null $var supported options include "default", "title", "date", and "folder"
+     * @return string      supported options include "default", "title", "date", and "folder"
+     */
+    public function orderBy($var = null): string
+    {
+        return $this->loadHeaderProperty(
+            'order_by',
+            $var,
+            static function ($value) {
+                return trim($value) ?: Grav::instance()['config']->get('system.pages.order.by');
+            }
+        );
+    }
+
+    /**
+     * Gets the manual order set in the header.
+     *
+     * @param  string|null $var supported options include "default", "title", "date", and "folder"
+     * @return array
+     */
+    public function orderManual($var = null): array
+    {
+        return $this->loadHeaderProperty(
+            'order_manual',
+            $var,
+            static function ($value) {
+                return (array)$value;
+            }
+        );
+    }
+
+    /**
+     * Gets and sets the maxCount field which describes how many sub-pages should be displayed if the
+     * sub_pages header property is set for this page object.
+     *
+     * @param  int|null $var the maximum number of sub-pages
+     * @return int      the maximum number of sub-pages
+     */
+    public function maxCount($var = null): int
+    {
+        return $this->loadHeaderProperty(
+            'max_count',
+            $var,
+            static function ($value) {
+                return (int)($value ?? Grav::instance()['config']->get('system.pages.list.count'));
+            }
+        );
+    }
+
+    /**
+     * Gets and sets the modular var that helps identify this page is a modular child
+     *
+     * @param  bool|null $var true if modular_twig
+     * @return bool      true if modular_twig
+     * @deprecated 1.7 Use ->isModule() or ->modularTwig() method instead.
+     */
+    public function modular($var = null): bool
+    {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, use ->isModule() or ->modularTwig() method instead', E_USER_DEPRECATED);
+
+        return $this->modularTwig($var);
+    }
+
+    /**
+     * Gets and sets the modular_twig var that helps identify this page as a modular child page that will need
+     * twig processing handled differently from a regular page.
+     *
+     * @param  bool|null $var true if modular_twig
+     * @return bool      true if modular_twig
+     */
+    public function modularTwig($var = null): bool
+    {
+        if ($var !== null) {
+            $this->setProperty('modular_twig', (bool)$var);
+            if ($var) {
+                $this->visible(false);
+            }
+        }
+
+        return (bool)($this->getProperty('modular_twig') ?? strpos($this->slug(), '_') === 0);
+    }
+
+    /**
+     * Returns children of this page.
+     *
+     * @return PageCollectionInterface|FlexIndexInterface
+     */
+    public function children()
+    {
+        $meta = $this->getMetaData();
+        $keys = array_keys($meta['children'] ?? []);
+        $prefix = $this->getMasterKey();
+        if ($prefix) {
+            foreach ($keys as &$key) {
+                $key = $prefix . '/' . $key;
+            }
+            unset($key);
+        }
+
+        return $this->getFlexDirectory()->getIndex($keys, 'storage_key');
+    }
+
+    /**
+     * Check to see if this item is the first in an array of sub-pages.
+     *
+     * @return bool True if item is first.
+     */
+    public function isFirst(): bool
+    {
+        $parent = $this->parent();
+        $children = $parent ? $parent->children() : null;
+        if ($children instanceof FlexCollectionInterface) {
+            $children = $children->withKeyField();
+        }
+
+        return $children instanceof PageCollectionInterface ? $children->isFirst($this->getKey()) : true;
+    }
+
+    /**
+     * Check to see if this item is the last in an array of sub-pages.
+     *
+     * @return bool True if item is last
+     */
+    public function isLast(): bool
+    {
+        $parent = $this->parent();
+        $children = $parent ? $parent->children() : null;
+        if ($children instanceof FlexCollectionInterface) {
+            $children = $children->withKeyField();
+        }
+
+        return $children instanceof PageCollectionInterface ? $children->isLast($this->getKey()) : true;
+    }
+
+    /**
+     * Gets the previous sibling based on current position.
+     *
+     * @return PageInterface|false the previous Page item
+     */
+    public function prevSibling()
+    {
+        return $this->adjacentSibling(-1);
+    }
+
+    /**
+     * Gets the next sibling based on current position.
+     *
+     * @return PageInterface|false the next Page item
+     */
+    public function nextSibling()
+    {
+        return $this->adjacentSibling(1);
+    }
+
+    /**
+     * Returns the adjacent sibling based on a direction.
+     *
+     * @param  int $direction either -1 or +1
+     * @return PageInterface|false the sibling page
+     */
+    public function adjacentSibling($direction = 1)
+    {
+        $parent = $this->parent();
+        $children = $parent ? $parent->children() : null;
+        if ($children instanceof FlexCollectionInterface) {
+            $children = $children->withKeyField();
+        }
+
+        if ($children instanceof PageCollectionInterface) {
+            $child = $children->adjacentSibling($this->getKey(), $direction);
+            if ($child instanceof PageInterface) {
+                return $child;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Helper method to return an ancestor page.
+     *
+     * @param string|null $lookup Name of the parent folder
+     * @return PageInterface|null page you were looking for if it exists
+     */
+    public function ancestor($lookup = null)
+    {
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+
+        return $pages->ancestor($this->getProperty('parent_route'), $lookup);
+    }
+
+    /**
+     * Helper method to return an ancestor page to inherit from. The current
+     * page object is returned.
+     *
+     * @param string $field Name of the parent folder
+     * @return PageInterface|null
+     */
+    public function inherited($field)
+    {
+        [$inherited, $currentParams] = $this->getInheritedParams($field);
+
+        $this->modifyHeader($field, $currentParams);
+
+        return $inherited;
+    }
+
+    /**
+     * Helper method to return an ancestor field only to inherit from. The
+     * first occurrence of an ancestor field will be returned if at all.
+     *
+     * @param string $field Name of the parent folder
+     * @return array
+     */
+    public function inheritedField($field): array
+    {
+        [, $currentParams] = $this->getInheritedParams($field);
+
+        return $currentParams;
+    }
+
+    /**
+     * Method that contains shared logic for inherited() and inheritedField()
+     *
+     * @param string $field Name of the parent folder
+     * @return array
+     */
+    protected function getInheritedParams($field): array
+    {
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+
+        $inherited = $pages->inherited($this->getProperty('parent_route'), $field);
+        $inheritedParams = $inherited ? (array)$inherited->value('header.' . $field) : [];
+        $currentParams = (array)$this->getFormValue('header.' . $field);
+        if ($inheritedParams && is_array($inheritedParams)) {
+            $currentParams = array_replace_recursive($inheritedParams, $currentParams);
+        }
+
+        return [$inherited, $currentParams];
+    }
+
+    /**
+     * Helper method to return a page.
+     *
+     * @param string $url the url of the page
+     * @param bool $all
+     * @return PageInterface|null page you were looking for if it exists
+     */
+    public function find($url, $all = false)
+    {
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+
+        return $pages->find($url, $all);
+    }
+
+    /**
+     * Get a collection of pages in the current context.
+     *
+     * @param string|array $params
+     * @param bool $pagination
+     * @return PageCollectionInterface|Collection
+     * @throws InvalidArgumentException
+     */
+    public function collection($params = 'content', $pagination = true)
+    {
+        if (is_string($params)) {
+            // Look into a page header field.
+            $params = (array)$this->getFormValue('header.' . $params);
+        } elseif (!is_array($params)) {
+            throw new InvalidArgumentException('Argument should be either header variable name or array of parameters');
+        }
+
+        if (!$pagination) {
+            $params['pagination'] = false;
+        }
+        $context = [
+            'pagination' => $pagination,
+            'self' => $this
+        ];
+
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+
+        return $pages->getCollection($params, $context);
+    }
+
+    /**
+     * @param string|array $value
+     * @param bool $only_published
+     * @return PageCollectionInterface|Collection
+     */
+    public function evaluate($value, $only_published = true)
+    {
+        $params = [
+            'items' => $value,
+            'published' => $only_published
+        ];
+        $context = [
+            'event' => false,
+            'pagination' => false,
+            'url_taxonomy_filters' => false,
+            'self' => $this
+        ];
+
+        /** @var Pages $pages */
+        $pages = Grav::instance()['pages'];
+
+        return $pages->getCollection($params, $context);
+    }
+
+    /**
+     * Returns whether or not the current folder exists
+     *
+     * @return bool
+     */
+    public function folderExists(): bool
+    {
+        return $this->exists() || is_dir($this->getStorageFolder() ?? '');
+    }
+
+    /**
+     * Gets the action.
+     *
+     * @return string|null The Action string.
+     */
+    public function getAction(): ?string
+    {
+        $meta = $this->getMetaData();
+        if (!empty($meta['copy'])) {
+            return 'copy';
+        }
+        if (isset($meta['storage_key']) && $this->getStorageKey() !== $meta['storage_key']) {
+            return 'move';
+        }
+
+        return null;
+    }
+}
diff --git a/system/src/Grav/Framework/Flex/Pages/Traits/PageRoutableTrait.php b/system/src/Grav/Framework/Flex/Pages/Traits/PageRoutableTrait.php
new file mode 100644
index 0000000000..c4c8cd7fba
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Pages/Traits/PageRoutableTrait.php
@@ -0,0 +1,550 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Pages\Traits;
+
+use Grav\Common\Config\Config;
+use Grav\Common\Grav;
+use Grav\Common\Page\Interfaces\PageCollectionInterface;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Common\Page\Pages;
+use Grav\Common\Uri;
+use Grav\Common\Utils;
+use Grav\Framework\Filesystem\Filesystem;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use function is_string;
+
+/**
+ * Implements PageRoutableInterface
+ */
+trait PageRoutableTrait
+{
+    /** @var bool */
+    protected $root = false;
+
+    /** @var string|null */
+    private $_route;
+    /** @var string|null */
+    private $_path;
+    /** @var PageInterface|null */
+    private $_parentCache;
+
+    /**
+     * Returns the page extension, got from the page `url_extension` config and falls back to the
+     * system config `system.pages.append_url_extension`.
+     *
+     * @return string      The extension of this page. For example `.html`
+     */
+    public function urlExtension(): string
+    {
+        return $this->loadHeaderProperty(
+            'url_extension',
+            null,
+            function ($value) {
+                if ($this->home()) {
+                    return '';
+                }
+
+                return $value ?? Grav::instance()['config']->get('system.pages.append_url_extension', '');
+            }
+        );
+    }
+
+    /**
+     * Gets and Sets whether or not this Page is routable, ie you can reach it via a URL.
+     * The page must be *routable* and *published*
+     *
+     * @param  bool|null $var true if the page is routable
+     * @return bool      true if the page is routable
+     */
+    public function routable($var = null): bool
+    {
+        $value = $this->loadHeaderProperty(
+            'routable',
+            $var,
+            static function ($value) {
+                return $value ?? true;
+            }
+        );
+
+        return $value && $this->published() && !$this->isModule() && !$this->root() && $this->getLanguages(true);
+    }
+
+    /**
+     * Gets the URL for a page - alias of url().
+     *
+     * @param bool $include_host
+     * @return string the permalink
+     */
+    public function link($include_host = false): string
+    {
+        return $this->url($include_host);
+    }
+
+    /**
+     * Gets the URL with host information, aka Permalink.
+     * @return string The permalink.
+     */
+    public function permalink(): string
+    {
+        return $this->url(true, false, true, true);
+    }
+
+    /**
+     * Returns the canonical URL for a page
+     *
+     * @param bool $include_lang
+     * @return string
+     */
+    public function canonical($include_lang = true): string
+    {
+        return $this->url(true, true, $include_lang);
+    }
+
+    /**
+     * Gets the url for the Page.
+     *
+     * @param bool $include_host Defaults false, but true would include http://yourhost.com
+     * @param bool $canonical true to return the canonical URL
+     * @param bool $include_base
+     * @param bool $raw_route
+     * @return string The url.
+     */
+    public function url($include_host = false, $canonical = false, $include_base = true, $raw_route = false): string
+    {
+        // Override any URL when external_url is set
+        $external = $this->getNestedProperty('header.external_url');
+        if ($external) {
+            return $external;
+        }
+
+        $grav = Grav::instance();
+
+        /** @var Pages $pages */
+        $pages = $grav['pages'];
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
+        // get base route (multi-site base and language)
+        $route = $include_base ? $pages->baseRoute() : '';
+
+        // add full route if configured to do so
+        if (!$include_host && $config->get('system.absolute_urls', false)) {
+            $include_host = true;
+        }
+
+        if ($canonical) {
+            $route .= $this->routeCanonical();
+        } elseif ($raw_route) {
+            $route .= $this->rawRoute();
+        } else {
+            $route .= $this->route();
+        }
+
+        /** @var Uri $uri */
+        $uri = $grav['uri'];
+        $url = $uri->rootUrl($include_host) . '/' . trim($route, '/') . $this->urlExtension();
+
+        return Uri::filterPath($url);
+    }
+
+    /**
+     * Gets the route for the page based on the route headers if available, else from
+     * the parents route and the current Page's slug.
+     *
+     * @param  string $var Set new default route.
+     * @return string|null  The route for the Page.
+     */
+    public function route($var = null): ?string
+    {
+        if (null !== $var) {
+            // TODO: not the best approach, but works...
+            $this->setNestedProperty('header.routes.default', $var);
+        }
+
+        // Return default route if given.
+        $default = $this->getNestedProperty('header.routes.default');
+        if (is_string($default)) {
+            return $default;
+        }
+
+        return $this->routeInternal();
+    }
+
+    /**
+     * @return string|null
+     */
+    protected function routeInternal(): ?string
+    {
+        $route = $this->_route;
+        if (null !== $route) {
+            return $route;
+        }
+
+        if ($this->root()) {
+            return null;
+        }
+
+        // Root and orphan nodes have no route.
+        $parent = $this->parent();
+        if (!$parent) {
+            return null;
+        }
+
+        if ($parent->home()) {
+            /** @var Config $config */
+            $config = Grav::instance()['config'];
+            $hide = (bool)$config->get('system.home.hide_in_urls', false);
+            $route = '/' . ($hide ? '' : $parent->slug());
+        } else {
+            $route = $parent->route();
+        }
+
+        if ($route !== '' && $route !== '/') {
+            $route .= '/';
+        }
+
+        if (!$this->home()) {
+            $route .= $this->slug();
+        }
+
+        $this->_route = $route;
+
+        return $route;
+    }
+
+    /**
+     * Helper method to clear the route out so it regenerates next time you use it
+     */
+    public function unsetRouteSlug(): void
+    {
+        // TODO:
+        throw new RuntimeException(__METHOD__ . '(): Not Implemented');
+    }
+
+    /**
+     * Gets and Sets the page raw route
+     *
+     * @param string|null $var
+     * @return string|null
+     */
+    public function rawRoute($var = null): ?string
+    {
+        if (null !== $var) {
+            // TODO:
+            throw new RuntimeException(__METHOD__ . '(string): Not Implemented');
+        }
+
+        if ($this->root()) {
+            return null;
+        }
+
+        return '/' . $this->getKey();
+    }
+
+    /**
+     * Gets the route aliases for the page based on page headers.
+     *
+     * @param  array|null $var list of route aliases
+     * @return array  The route aliases for the Page.
+     */
+    public function routeAliases($var = null): array
+    {
+        if (null !== $var) {
+            $this->setNestedProperty('header.routes.aliases', (array)$var);
+        }
+
+        $aliases = (array)$this->getNestedProperty('header.routes.aliases');
+        $default = $this->getNestedProperty('header.routes.default');
+        if ($default) {
+            $aliases[] = $default;
+        }
+
+        return $aliases;
+    }
+
+    /**
+     * Gets the canonical route for this page if its set. If provided it will use
+     * that value, else if it's `true` it will use the default route.
+     *
+     * @param string|null $var
+     * @return string|null
+     */
+    public function routeCanonical($var = null): ?string
+    {
+        if (null !== $var) {
+            $this->setNestedProperty('header.routes.canonical', (array)$var);
+        }
+
+        $canonical = $this->getNestedProperty('header.routes.canonical');
+
+        return is_string($canonical) ? $canonical : $this->route();
+    }
+
+    /**
+     * Gets the redirect set in the header.
+     *
+     * @param  string|null $var redirect url
+     * @return string|null
+     */
+    public function redirect($var = null): ?string
+    {
+        return $this->loadHeaderProperty(
+            'redirect',
+            $var,
+            static function ($value) {
+                return trim($value) ?: null;
+            }
+        );
+    }
+
+    /**
+     * Returns the clean path to the page file
+     *
+     * Needed in admin for Page Media.
+     */
+    public function relativePagePath(): ?string
+    {
+        $folder = $this->getMediaFolder();
+        if (!$folder) {
+            return null;
+        }
+
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+        $path = $locator->isStream($folder) ? $locator->findResource($folder, false) : $folder;
+
+        return is_string($path) ? $path : null;
+    }
+
+    /**
+     * Gets and sets the path to the folder where the .md for this Page object resides.
+     * This is equivalent to the filePath but without the filename.
+     *
+     * @param  string|null $var the path
+     * @return string|null      the path
+     */
+    public function path($var = null): ?string
+    {
+        if (null !== $var) {
+            // TODO:
+            throw new RuntimeException(__METHOD__ . '(string): Not Implemented');
+        }
+
+        $path = $this->_path;
+        if ($path) {
+            return $path;
+        }
+
+        if ($this->root()) {
+            $folder = $this->getFlexDirectory()->getStorageFolder();
+        } else {
+            $folder = $this->getStorageFolder();
+        }
+
+        if ($folder) {
+            /** @var UniformResourceLocator $locator */
+            $locator = Grav::instance()['locator'];
+            $folder = $locator->isStream($folder) ? $locator->getResource($folder) : GRAV_ROOT . "/{$folder}";
+        }
+
+        return $this->_path = is_string($folder) ? $folder : null;
+    }
+
+    /**
+     * Get/set the folder.
+     *
+     * @param string|null $var Optional path, including numeric prefix.
+     * @return string|null
+     */
+    public function folder($var = null): ?string
+    {
+        return $this->loadProperty(
+            'folder',
+            $var,
+            function ($value) {
+                if (null === $value) {
+                    $value = $this->getMasterKey() ?: $this->getKey();
+                }
+
+                return Utils::basename($value) ?: null;
+            }
+        );
+    }
+
+    /**
+     * Get/set the folder.
+     *
+     * @param string|null $var Optional path, including numeric prefix.
+     * @return string|null
+     */
+    public function parentStorageKey($var = null): ?string
+    {
+        return $this->loadProperty(
+            'parent_key',
+            $var,
+            function ($value) {
+                if (null === $value) {
+                    $filesystem = Filesystem::getInstance(false);
+                    $value = $this->getMasterKey() ?: $this->getKey();
+                    $value = ltrim($filesystem->dirname("/{$value}"), '/') ?: '';
+                }
+
+                return $value;
+            }
+        );
+    }
+
+    /**
+     * Gets and Sets the parent object for this page
+     *
+     * @param  PageInterface|null $var the parent page object
+     * @return PageInterface|null the parent page object if it exists.
+     */
+    public function parent(PageInterface $var = null)
+    {
+        if (null !== $var) {
+            // TODO:
+            throw new RuntimeException(__METHOD__ . '(PageInterface): Not Implemented');
+        }
+
+        if ($this->_parentCache || $this->root()) {
+            return $this->_parentCache;
+        }
+
+        // Use filesystem as \dirname() does not work in Windows because of '/foo' becomes '\'.
+        $filesystem = Filesystem::getInstance(false);
+        $directory = $this->getFlexDirectory();
+        $parentKey = ltrim($filesystem->dirname("/{$this->getKey()}"), '/');
+        if ('' !== $parentKey) {
+            $parent = $directory->getObject($parentKey);
+            $language = $this->getLanguage();
+            if ($language && $parent && method_exists($parent, 'getTranslation')) {
+                $parent = $parent->getTranslation($language) ?? $parent;
+            }
+
+            $this->_parentCache = $parent;
+        } else {
+            $index = $directory->getIndex();
+
+            $this->_parentCache = \is_callable([$index, 'getRoot']) ? $index->getRoot() : null;
+        }
+
+        return $this->_parentCache;
+    }
+
+    /**
+     * Gets the top parent object for this page. Can return page itself.
+     *
+     * @return PageInterface The top parent page object.
+     */
+    public function topParent()
+    {
+        $topParent = $this;
+        while ($topParent) {
+            $parent = $topParent->parent();
+            if (!$parent || !$parent->parent()) {
+                break;
+            }
+            $topParent = $parent;
+        }
+
+        return $topParent;
+    }
+
+    /**
+     * Returns the item in the current position.
+     *
+     * @return int|null   the index of the current page.
+     */
+    public function currentPosition(): ?int
+    {
+        $parent = $this->parent();
+        $collection = $parent ? $parent->collection('content', false) : null;
+        if ($collection instanceof PageCollectionInterface && $path = $this->path()) {
+            return $collection->currentPosition($path);
+        }
+
+        return 1;
+    }
+
+    /**
+     * Returns whether or not this page is the currently active page requested via the URL.
+     *
+     * @return bool True if it is active
+     */
+    public function active(): bool
+    {
+        $grav = Grav::instance();
+        $uri_path = rtrim(urldecode($grav['uri']->path()), '/') ?: '/';
+        $routes = $grav['pages']->routes();
+
+        return isset($routes[$uri_path]) && $routes[$uri_path] === $this->path();
+    }
+
+    /**
+     * Returns whether or not this URI's URL contains the URL of the active page.
+     * Or in other words, is this page's URL in the current URL
+     *
+     * @return bool True if active child exists
+     */
+    public function activeChild(): bool
+    {
+        $grav = Grav::instance();
+        /** @var Uri $uri */
+        $uri = $grav['uri'];
+        /** @var Pages $pages */
+        $pages = $grav['pages'];
+        $uri_path = rtrim(urldecode($uri->path()), '/');
+        $routes = $pages->routes();
+
+        if (isset($routes[$uri_path])) {
+            $page = $pages->find($uri->route());
+            /** @var PageInterface|null $child_page */
+            $child_page = $page ? $page->parent() : null;
+            while ($child_page && !$child_page->root()) {
+                if ($this->path() === $child_page->path()) {
+                    return true;
+                }
+                $child_page = $child_page->parent();
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns whether or not this page is the currently configured home page.
+     *
+     * @return bool True if it is the homepage
+     */
+    public function home(): bool
+    {
+        $home = Grav::instance()['config']->get('system.home.alias');
+
+        return '/' . $this->getKey() === $home;
+    }
+
+    /**
+     * Returns whether or not this page is the root node of the pages tree.
+     *
+     * @param bool|null $var
+     * @return bool True if it is the root
+     */
+    public function root($var = null): bool
+    {
+        if (null !== $var) {
+            $this->root = (bool)$var;
+        }
+
+        return $this->root === true || $this->getKey() === '/';
+    }
+}
diff --git a/system/src/Grav/Framework/Flex/Pages/Traits/PageTranslateTrait.php b/system/src/Grav/Framework/Flex/Pages/Traits/PageTranslateTrait.php
new file mode 100644
index 0000000000..4bec685b45
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Pages/Traits/PageTranslateTrait.php
@@ -0,0 +1,291 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Pages\Traits;
+
+use Grav\Common\Grav;
+use Grav\Common\Language\Language;
+use Grav\Common\Page\Interfaces\PageInterface;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use function is_bool;
+
+/**
+ * Implements PageTranslateInterface
+ */
+trait PageTranslateTrait
+{
+    /** @var array|null */
+    private $_languages;
+
+    /** @var PageInterface[] */
+    private $_translations = [];
+
+    /**
+     * @return bool
+     */
+    public function translated(): bool
+    {
+        return (bool)$this->translatedLanguages(true);
+    }
+
+    /**
+     * @param string|null $languageCode
+     * @param bool|null $fallback
+     * @return bool
+     */
+    public function hasTranslation(string $languageCode = null, bool $fallback = null): bool
+    {
+        $code = $this->findTranslation($languageCode, $fallback);
+
+        return null !== $code;
+    }
+
+    /**
+     * @param string|null $languageCode
+     * @param bool|null $fallback
+     * @return FlexObjectInterface|PageInterface|null
+     */
+    public function getTranslation(string $languageCode = null, bool $fallback = null)
+    {
+        if ($this->root()) {
+            return $this;
+        }
+
+        $code = $this->findTranslation($languageCode, $fallback);
+        if (null === $code) {
+            $object = null;
+        } elseif ('' === $code) {
+            $object = $this->getLanguage() ? $this->getFlexDirectory()->getObject($this->getMasterKey(), 'storage_key') : $this;
+        } else {
+            $meta = $this->getMetaData();
+            $meta['template'] = $this->getLanguageTemplates()[$code] ?? $meta['template'];
+            $key = $this->getStorageKey() . '|' . $meta['template'] . '.' . $code;
+            $meta['storage_key'] = $key;
+            $meta['lang'] = $code;
+            $object = $this->getFlexDirectory()->loadObjects([$key => $meta])[$key] ?? null;
+        }
+
+        return $object;
+    }
+
+    /**
+     * @param bool $includeDefault If set to true, return separate entries for '' and 'en' (default) language.
+     * @return array
+     */
+    public function getAllLanguages(bool $includeDefault = false): array
+    {
+        $grav = Grav::instance();
+
+        /** @var Language $language */
+        $language = $grav['language'];
+        $languages = $language->getLanguages();
+        if (!$languages) {
+            return [];
+        }
+
+        $translated = $this->getLanguageTemplates();
+
+        if ($includeDefault) {
+            $languages[] = '';
+        } elseif (isset($translated[''])) {
+            $default = $language->getDefault();
+            if (is_bool($default)) {
+                $default = '';
+            }
+            $translated[$default] = $translated[''];
+            unset($translated['']);
+        }
+
+        $languages = array_fill_keys($languages, false);
+        $translated = array_fill_keys(array_keys($translated), true);
+
+        return array_replace($languages, $translated);
+    }
+
+    /**
+     * Returns all translated languages.
+     *
+     * @param bool $includeDefault If set to true, return separate entries for '' and 'en' (default) language.
+     * @return array
+     */
+    public function getLanguages(bool $includeDefault = false): array
+    {
+        $languages = $this->getLanguageTemplates();
+
+        if (!$includeDefault && isset($languages[''])) {
+            $grav = Grav::instance();
+
+            /** @var Language $language */
+            $language = $grav['language'];
+            $default = $language->getDefault();
+            if (is_bool($default)) {
+                $default = '';
+            }
+            $languages[$default] = $languages[''];
+            unset($languages['']);
+        }
+
+        return array_keys($languages);
+    }
+
+    /**
+     * @return string
+     */
+    public function getLanguage(): string
+    {
+        return $this->language() ?? '';
+    }
+
+    /**
+     * @param string|null $languageCode
+     * @param bool|null $fallback
+     * @return string|null
+     */
+    public function findTranslation(string $languageCode = null, bool $fallback = null): ?string
+    {
+        $translated = $this->getLanguageTemplates();
+
+        // If there's no translations (including default), we have an empty folder.
+        if (!$translated) {
+            return '';
+        }
+
+        // FIXME: only published is not implemented...
+        $languages = $this->getFallbackLanguages($languageCode, $fallback);
+
+        $language = null;
+        foreach ($languages as $code) {
+            if (isset($translated[$code])) {
+                $language = $code;
+                break;
+            }
+        }
+
+        return $language;
+    }
+
+    /**
+     * Return an array with the routes of other translated languages
+     *
+     * @param bool $onlyPublished only return published translations
+     * @return array the page translated languages
+     */
+    public function translatedLanguages($onlyPublished = false): array
+    {
+        // FIXME: only published is not implemented...
+        $translated = $this->getLanguageTemplates();
+        if (!$translated) {
+            return $translated;
+        }
+
+        $grav = Grav::instance();
+
+        /** @var Language $language */
+        $language = $grav['language'];
+        $languages = $language->getLanguages();
+        $languages[] = '';
+
+        $translated = array_intersect_key($translated, array_flip($languages));
+        $list = array_fill_keys($languages, null);
+        foreach ($translated as $languageCode => $languageFile) {
+            $path = ($languageCode ? '/' : '') . $languageCode;
+            $list[$languageCode] = "{$path}/{$this->getKey()}";
+        }
+
+        return array_filter($list);
+    }
+
+    /**
+     * Return an array listing untranslated languages available
+     *
+     * @param bool $includeUnpublished also list unpublished translations
+     * @return array the page untranslated languages
+     */
+    public function untranslatedLanguages($includeUnpublished = false): array
+    {
+        $grav = Grav::instance();
+
+        /** @var Language $language */
+        $language = $grav['language'];
+
+        $languages = $language->getLanguages();
+        $translated = array_keys($this->translatedLanguages(!$includeUnpublished));
+
+        return array_values(array_diff($languages, $translated));
+    }
+
+    /**
+     * Get page language
+     *
+     * @param string|null $var
+     * @return string|null
+     */
+    public function language($var = null): ?string
+    {
+        return $this->loadHeaderProperty(
+            'lang',
+            $var,
+            function ($value) {
+                $value = $value ?? $this->getMetaData()['lang'] ?? '';
+
+                return trim($value) ?: null;
+            }
+        );
+    }
+
+    /**
+     * @return array
+     */
+    protected function getLanguageTemplates(): array
+    {
+        if (null === $this->_languages) {
+            $template = $this->getProperty('template');
+            $meta = $this->getMetaData();
+            $translations = $meta['markdown'] ?? [];
+            $list = [];
+            foreach ($translations as $code => $search) {
+                if (isset($search[$template])) {
+                    // Use main template if possible.
+                    $list[$code] = $template;
+                } elseif (!empty($search)) {
+                    // Fall back to first matching template.
+                    $list[$code] = key($search);
+                }
+            }
+
+            $this->_languages = $list;
+        }
+
+        return $this->_languages;
+    }
+
+    /**
+     * @param string|null $languageCode
+     * @param bool|null $fallback
+     * @return array
+     */
+    protected function getFallbackLanguages(string $languageCode = null, bool $fallback = null): array
+    {
+        $fallback = $fallback ?? true;
+        if (!$fallback && null !== $languageCode) {
+            return [$languageCode];
+        }
+
+        $grav = Grav::instance();
+
+        /** @var Language $language */
+        $language = $grav['language'];
+        $languageCode = $languageCode ?? ($language->getLanguage() ?: '');
+        if ($languageCode === '' && $fallback) {
+            return $language->getFallbackLanguages(null, true);
+        }
+
+        return $fallback ? $language->getFallbackLanguages($languageCode, true) : [$languageCode];
+    }
+}
diff --git a/system/src/Grav/Framework/Flex/Storage/AbstractFilesystemStorage.php b/system/src/Grav/Framework/Flex/Storage/AbstractFilesystemStorage.php
index cc460ccd05..ee04c519d2 100644
--- a/system/src/Grav/Framework/Flex/Storage/AbstractFilesystemStorage.php
+++ b/system/src/Grav/Framework/Flex/Storage/AbstractFilesystemStorage.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -20,9 +20,9 @@
 use Grav\Framework\File\Formatter\YamlFormatter;
 use Grav\Framework\File\Interfaces\FileFormatterInterface;
 use Grav\Framework\Flex\Interfaces\FlexStorageInterface;
-use RocketTheme\Toolbox\File\File;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 use RuntimeException;
+use function is_array;
 
 /**
  * Class AbstractFilesystemStorage
@@ -34,11 +34,22 @@ abstract class AbstractFilesystemStorage implements FlexStorageInterface
     protected $dataFormatter;
     /** @var string */
     protected $keyField = 'storage_key';
+    /** @var int */
+    protected $keyLen = 32;
+    /** @var bool */
+    protected $caseSensitive = true;
 
+    /**
+     * @return bool
+     */
+    public function isIndexed(): bool
+    {
+        return false;
+    }
 
     /**
      * {@inheritdoc}
-     * @see FlexStorageInterface::hasKey()
+     * @see FlexStorageInterface::hasKeys()
      */
     public function hasKeys(array $keys): array
     {
@@ -51,28 +62,81 @@ public function hasKeys(array $keys): array
     }
 
     /**
-     * @return string
+     * {@inheritDoc}
+     * @see FlexStorageInterface::getKeyField()
      */
     public function getKeyField(): string
     {
         return $this->keyField;
     }
 
+    /**
+     * @param array $keys
+     * @param bool $includeParams
+     * @return string
+     */
+    public function buildStorageKey(array $keys, bool $includeParams = true): string
+    {
+        $key = $keys['key'] ?? '';
+        $params = $includeParams ? $this->buildStorageKeyParams($keys) : '';
+
+        return $params ? "{$key}|{$params}" : $key;
+    }
+
+    /**
+     * @param array $keys
+     * @return string
+     */
+    public function buildStorageKeyParams(array $keys): string
+    {
+        return '';
+    }
+
+    /**
+     * @param array $row
+     * @return array
+     */
+    public function extractKeysFromRow(array $row): array
+    {
+        return [
+            'key' => $this->normalizeKey($row[$this->keyField] ?? '')
+        ];
+    }
+
+    /**
+     * @param string $key
+     * @return array
+     */
+    public function extractKeysFromStorageKey(string $key): array
+    {
+        return [
+            'key' => $key
+        ];
+    }
+
+    /**
+     * @param string|array $formatter
+     * @return void
+     */
     protected function initDataFormatter($formatter): void
     {
         // Initialize formatter.
-        if (!\is_array($formatter)) {
+        if (!is_array($formatter)) {
             $formatter = ['class' => $formatter];
         }
         $formatterClassName = $formatter['class'] ?? JsonFormatter::class;
         $formatterOptions = $formatter['options'] ?? [];
 
+        if (!is_a($formatterClassName, FileFormatterInterface::class, true)) {
+            throw new \InvalidArgumentException('Bad Data Formatter');
+        }
+
         $this->dataFormatter = new $formatterClassName($formatterOptions);
     }
 
     /**
      * @param string $filename
-     * @return null|string
+     * @return string|null
      */
     protected function detectDataFormatter(string $filename): ?string
     {
@@ -92,12 +156,13 @@ protected function detectDataFormatter(string $filename): ?string
 
     /**
      * @param string $filename
-     * @return File
+     * @return CompiledJsonFile|CompiledYamlFile|CompiledMarkdownFile
      */
     protected function getFile(string $filename)
     {
         $filename = $this->resolvePath($filename);
 
+        // TODO: start using the new file classes.
         switch ($this->dataFormatter->getDefaultFileExtension()) {
             case '.json':
                 $file = CompiledJsonFile::instance($filename);
@@ -125,10 +190,10 @@ protected function resolvePath(string $path): string
         $locator = Grav::instance()['locator'];
 
         if (!$locator->isStream($path)) {
-            return $path;
+            return GRAV_ROOT . "/{$path}";
         }
 
-        return (string)($locator->findResource($path) ?: $locator->findResource($path, true, true));
+        return $locator->getResource($path);
     }
 
     /**
@@ -138,7 +203,20 @@ protected function resolvePath(string $path): string
      */
     protected function generateKey(): string
     {
-        return substr(hash('sha256', random_bytes(32)), 0, 32);
+        return substr(hash('sha256', random_bytes($this->keyLen)), 0, $this->keyLen);
+    }
+
+    /**
+     * @param string $key
+     * @return string
+     */
+    public function normalizeKey(string $key): string
+    {
+        if ($this->caseSensitive === true) {
+            return $key;
+        }
+
+        return mb_strtolower($key);
     }
 
     /**
@@ -149,6 +227,6 @@ protected function generateKey(): string
      */
     protected function validateKey(string $key): bool
     {
-        return (bool) preg_match('/^[^\\/\\?\\*:;{}\\\\\\n]+$/u', $key);
+        return $key && (bool) preg_match('/^[^\\/?*:;{}\\\\\\n]+$/u', $key);
     }
 }
diff --git a/system/src/Grav/Framework/Flex/Storage/FileStorage.php b/system/src/Grav/Framework/Flex/Storage/FileStorage.php
index e263e6c9ff..1864439cb1 100644
--- a/system/src/Grav/Framework/Flex/Storage/FileStorage.php
+++ b/system/src/Grav/Framework/Flex/Storage/FileStorage.php
@@ -5,13 +5,17 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Flex\Storage;
 
+use FilesystemIterator;
+use Grav\Common\Utils;
 use Grav\Framework\Flex\Interfaces\FlexStorageInterface;
+use RuntimeException;
+use SplFileInfo;
 
 /**
  * Class FileStorage
@@ -25,7 +29,7 @@ class FileStorage extends FolderStorage
      */
     public function __construct(array $options)
     {
-        $this->dataPattern = '{FOLDER}/{KEY}';
+        $this->dataPattern = '{FOLDER}/{KEY}{EXT}';
 
         if (!isset($options['formatter']) && isset($options['pattern'])) {
             $options['formatter'] = $this->detectDataFormatter($options['pattern']);
@@ -38,9 +42,83 @@ public function __construct(array $options)
      * {@inheritdoc}
      * @see FlexStorageInterface::getMediaPath()
      */
-    public function getMediaPath(string $key = null): string
+    public function getMediaPath(string $key = null): ?string
     {
-        return $key ? \dirname($this->getStoragePath($key)) . '/' . $key : $this->getStoragePath();
+        $path = $this->getStoragePath();
+        if (!$path) {
+            return null;
+        }
+
+        return $key ? "{$path}/{$key}" : $path;
+    }
+
+    /**
+     * @param string $src
+     * @param string $dst
+     * @return bool
+     */
+    public function copyRow(string $src, string $dst): bool
+    {
+        if ($this->hasKey($dst)) {
+            throw new RuntimeException("Cannot copy object: key '{$dst}' is already taken");
+        }
+
+        if (!$this->hasKey($src)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexStorageInterface::renameRow()
+     */
+    public function renameRow(string $src, string $dst): bool
+    {
+        if (!$this->hasKey($src)) {
+            return false;
+        }
+
+        // Remove old file.
+        $path = $this->getPathFromKey($src);
+        $file = $this->getFile($path);
+        $file->delete();
+        $file->free();
+        unset($file);
+
+        return true;
+    }
+
+    /**
+     * @param string $src
+     * @param string $dst
+     * @return bool
+     */
+    protected function copyFolder(string $src, string $dst): bool
+    {
+        // Nothing to copy.
+        return true;
+    }
+
+    /**
+     * @param string $src
+     * @param string $dst
+     * @return bool
+     */
+    protected function moveFolder(string $src, string $dst): bool
+    {
+        // Nothing to move.
+        return true;
+    }
+
+    /**
+     * @param string $key
+     * @return bool
+     */
+    protected function canDeleteFolder(string $key): bool
+    {
+        return false;
     }
 
     /**
@@ -48,7 +126,7 @@ public function getMediaPath(string $key = null): string
      */
     protected function getKeyFromPath(string $path): string
     {
-        return basename($path, $this->dataFormatter->getDefaultFileExtension());
+        return Utils::basename($path, $this->dataFormatter->getDefaultFileExtension());
     }
 
     /**
@@ -56,26 +134,26 @@ protected function getKeyFromPath(string $path): string
      */
     protected function buildIndex(): array
     {
-        if (!file_exists($this->getStoragePath())) {
+        $this->clearCache();
+
+        $path = $this->getStoragePath();
+        if (!$path || !file_exists($path)) {
             return [];
         }
 
-        $flags = \FilesystemIterator::KEY_AS_PATHNAME | \FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS;
-        $iterator = new \FilesystemIterator($this->getStoragePath(), $flags);
+        $flags = FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS | FilesystemIterator::UNIX_PATHS;
+        $iterator = new FilesystemIterator($path, $flags);
         $list = [];
-        /** @var \SplFileInfo $info */
+        /** @var SplFileInfo $info */
         foreach ($iterator as $filename => $info) {
             if (!$info->isFile() || !($key = $this->getKeyFromPath($filename)) || strpos($info->getFilename(), '.') === 0) {
                 continue;
             }
 
-            $list[$key] = [
-                'storage_key' => $key,
-                'storage_timestamp' => $info->getMTime()
-            ];
+            $list[$key] = $this->getObjectMeta($key);
         }
 
-        ksort($list, SORT_NATURAL);
+        ksort($list, SORT_NATURAL | SORT_FLAG_CASE);
 
         return $list;
     }
diff --git a/system/src/Grav/Framework/Flex/Storage/FolderStorage.php b/system/src/Grav/Framework/Flex/Storage/FolderStorage.php
index 76397c235f..600e989477 100644
--- a/system/src/Grav/Framework/Flex/Storage/FolderStorage.php
+++ b/system/src/Grav/Framework/Flex/Storage/FolderStorage.php
@@ -5,18 +5,30 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Flex\Storage;
 
+use FilesystemIterator;
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
+use Grav\Common\Utils;
+use Grav\Framework\Filesystem\Filesystem;
 use Grav\Framework\Flex\Interfaces\FlexStorageInterface;
 use RocketTheme\Toolbox\File\File;
 use InvalidArgumentException;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use SplFileInfo;
+use function array_key_exists;
+use function basename;
+use function count;
+use function is_scalar;
+use function is_string;
+use function mb_strpos;
+use function mb_substr;
 
 /**
  * Class FolderStorage
@@ -24,14 +36,22 @@
  */
 class FolderStorage extends AbstractFilesystemStorage
 {
-    /** @var string */
+    /** @var string Folder where all the data is stored. */
     protected $dataFolder;
-    /** @var string */
-    protected $dataPattern = '{FOLDER}/{KEY}/item';
+    /** @var string Pattern to access an object. */
+    protected $dataPattern = '{FOLDER}/{KEY}/{FILE}{EXT}';
+    /** @var string[] */
+    protected $variables = ['FOLDER' => '%1$s', 'KEY' => '%2$s', 'KEY:2' => '%3$s', 'FILE' => '%4$s', 'EXT' => '%5$s'];
+    /** @var string Filename for the object. */
+    protected $dataFile;
+    /** @var string File extension for the object. */
+    protected $dataExt;
     /** @var bool */
     protected $prefixed;
     /** @var bool */
     protected $indexed;
+    /** @var array */
+    protected $meta = [];
 
     /**
      * {@inheritdoc}
@@ -44,16 +64,37 @@ public function __construct(array $options)
 
         $this->initDataFormatter($options['formatter'] ?? []);
         $this->initOptions($options);
+    }
 
-        // Make sure that the data folder exists.
-        $folder = $this->resolvePath($this->dataFolder);
-        if (!file_exists($folder)) {
-            try {
-                Folder::create($folder);
-            } catch (\RuntimeException $e) {
-                throw new \RuntimeException(sprintf('Flex: %s', $e->getMessage()));
-            }
+    /**
+     * @return bool
+     */
+    public function isIndexed(): bool
+    {
+        return $this->indexed;
+    }
+
+    /**
+     * @return void
+     */
+    public function clearCache(): void
+    {
+        $this->meta = [];
+    }
+
+    /**
+     * @param string[] $keys
+     * @param bool $reload
+     * @return array
+     */
+    public function getMetaData(array $keys, bool $reload = false): array
+    {
+        $list = [];
+        foreach ($keys as $key) {
+            $list[$key] = $this->getObjectMeta((string)$key, $reload);
         }
+
+        return $list;
     }
 
     /**
@@ -71,7 +112,9 @@ public function getExistingKeys(): array
      */
     public function hasKey(string $key): bool
     {
-        return $key && strpos($key, '@@') === false && file_exists($this->getPathFromKey($key));
+        $meta = $this->getObjectMeta($key);
+
+        return array_key_exists('exists', $meta) ? $meta['exists'] : !empty($meta['storage_timestamp']);
     }
 
     /**
@@ -82,11 +125,7 @@ public function createRows(array $rows): array
     {
         $list = [];
         foreach ($rows as $key => $row) {
-            // Create new file and save it.
-            $key = $this->getNewKey();
-            $path = $this->getPathFromKey($key);
-            $file = $this->getFile($path);
-            $list[$key] = $this->saveFile($file, $row);
+            $list[$key] = $this->saveRow('@@', $row);
         }
 
         return $list;
@@ -100,16 +139,11 @@ public function readRows(array $rows, array &$fetched = null): array
     {
         $list = [];
         foreach ($rows as $key => $row) {
-            if (null === $row || (!\is_object($row) && !\is_array($row))) {
+            if (null === $row || is_scalar($row)) {
                 // Only load rows which haven't been loaded before.
                 $key = (string)$key;
-                if (!$this->hasKey($key)) {
-                    $list[$key] = null;
-                } else {
-                    $path = $this->getPathFromKey($key);
-                    $file = $this->getFile($path);
-                    $list[$key] = $this->loadFile($file);
-                }
+                $list[$key] = $this->loadRow($key);
+
                 if (null !== $fetched) {
                     $fetched[$key] = $list[$key];
                 }
@@ -131,13 +165,7 @@ public function updateRows(array $rows): array
         $list = [];
         foreach ($rows as $key => $row) {
             $key = (string)$key;
-            if (!$this->hasKey($key)) {
-                $list[$key] = null;
-            } else {
-                $path = $this->getPathFromKey($key);
-                $file = $this->getFile($path);
-                $list[$key] = $this->saveFile($file, $row);
-            }
+            $list[$key] = $this->hasKey($key) ? $this->saveRow($key, $row) : null;
         }
 
         return $list;
@@ -150,6 +178,7 @@ public function updateRows(array $rows): array
     public function deleteRows(array $rows): array
     {
         $list = [];
+        $baseMediaPath = $this->getMediaPath();
         foreach ($rows as $key => $row) {
             $key = (string)$key;
             if (!$this->hasKey($key)) {
@@ -159,11 +188,17 @@ public function deleteRows(array $rows): array
                 $file = $this->getFile($path);
                 $list[$key] = $this->deleteFile($file);
 
-                $storage = $this->getStoragePath($key);
-                $media = $this->getMediaPath($key);
+                if ($this->canDeleteFolder($key)) {
+                    $storagePath = $this->getStoragePath($key);
+                    $mediaPath = $this->getMediaPath($key);
 
-                $this->deleteFolder($storage, true);
-                $media && $this->deleteFolder($media, true);
+                    if ($storagePath) {
+                        $this->deleteFolder($storagePath, true);
+                    }
+                    if ($mediaPath && $mediaPath !== $storagePath && $mediaPath !== $baseMediaPath) {
+                        $this->deleteFolder($mediaPath, true);
+                    }
+                }
             }
         }
 
@@ -179,44 +214,84 @@ public function replaceRows(array $rows): array
         $list = [];
         foreach ($rows as $key => $row) {
             $key = (string)$key;
-            if (strpos($key, '@@')) {
-                $key = $this->getNewKey();
-            }
-            $path = $this->getPathFromKey($key);
-            $file = $this->getFile($path);
-            $list[$key] = $this->saveFile($file, $row);
+            $list[$key] = $this->saveRow($key, $row);
         }
 
         return $list;
     }
 
     /**
-     * {@inheritdoc}
-     * @see FlexStorageInterface::renameRow()
+     * @param string $src
+     * @param string $dst
+     * @return bool
+     * @throws RuntimeException
      */
-    public function renameRow(string $src, string $dst): bool
+    public function copyRow(string $src, string $dst): bool
     {
         if ($this->hasKey($dst)) {
-            throw new \RuntimeException("Cannot rename object: key '{$dst}' is already taken");
+            throw new RuntimeException("Cannot copy object: key '{$dst}' is already taken");
+        }
+
+        if (!$this->hasKey($src)) {
+            return false;
         }
 
+        $srcPath = $this->getStoragePath($src);
+        $dstPath = $this->getStoragePath($dst);
+        if (!$srcPath || !$dstPath) {
+            return false;
+        }
+
+        return $this->copyFolder($srcPath, $dstPath);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @see FlexStorageInterface::renameRow()
+     * @throws RuntimeException
+     */
+    public function renameRow(string $src, string $dst): bool
+    {
         if (!$this->hasKey($src)) {
             return false;
         }
 
-        return $this->moveFolder($this->getMediaPath($src), $this->getMediaPath($dst));
+        $srcPath = $this->getStoragePath($src);
+        $dstPath = $this->getStoragePath($dst);
+        if (!$srcPath || !$dstPath) {
+            throw new RuntimeException("Destination path '{$dst}' is empty");
+        }
+
+        if ($srcPath === $dstPath) {
+            return true;
+        }
+
+        if ($this->hasKey($dst)) {
+            throw new RuntimeException("Cannot rename object '{$src}': key '{$dst}' is already taken $srcPath $dstPath");
+        }
+
+        return $this->moveFolder($srcPath, $dstPath);
     }
 
     /**
      * {@inheritdoc}
      * @see FlexStorageInterface::getStoragePath()
      */
-    public function getStoragePath(string $key = null): string
+    public function getStoragePath(string $key = null): ?string
     {
-        if (null === $key) {
+        if (null === $key || $key === '') {
             $path = $this->dataFolder;
         } else {
-            $path = sprintf($this->dataPattern, $this->dataFolder, $key, substr($key, 0, 2));
+            $parts = $this->parseKey($key, false);
+            $options = [
+                $this->dataFolder,      // {FOLDER}
+                $parts['key'],          // {KEY}
+                $parts['key:2'],        // {KEY:2}
+                '***',                  // {FILE}
+                '***'                   // {EXT}
+            ];
+
+            $path = rtrim(explode('***', sprintf($this->dataPattern, ...$options))[0], '/');
         }
 
         return $path;
@@ -226,9 +301,9 @@ public function getStoragePath(string $key = null): string
      * {@inheritdoc}
      * @see FlexStorageInterface::getMediaPath()
      */
-    public function getMediaPath(string $key = null): string
+    public function getMediaPath(string $key = null): ?string
     {
-        return null !== $key ? \dirname($this->getStoragePath($key)) : $this->getStoragePath();
+        return $this->getStoragePath($key);
     }
 
     /**
@@ -239,51 +314,146 @@ public function getMediaPath(string $key = null): string
      */
     public function getPathFromKey(string $key): string
     {
-        return sprintf($this->dataPattern, $this->dataFolder, $key, substr($key, 0, 2));
+        $parts = $this->parseKey($key);
+        $options = [
+            $this->dataFolder,      // {FOLDER}
+            $parts['key'],          // {KEY}
+            $parts['key:2'],        // {KEY:2}
+            $parts['file'],         // {FILE}
+            $this->dataExt          // {EXT}
+        ];
+
+        return sprintf($this->dataPattern, ...$options);
     }
 
     /**
-     * @param File $file
-     * @return array|null
+     * @param string $key
+     * @param bool $variations
+     * @return array
      */
-    protected function loadFile(File $file): ?array
+    public function parseKey(string $key, bool $variations = true): array
     {
-        if (!$file->exists()) {
-            return null;
+        $keys = [
+            'key' => $key,
+            'key:2' => mb_substr($key, 0, 2),
+        ];
+        if ($variations) {
+            $keys['file'] = $this->dataFile;
         }
 
+        return $keys;
+    }
+
+    /**
+     * Get key from the filesystem path.
+     *
+     * @param  string $path
+     * @return string
+     */
+    protected function getKeyFromPath(string $path): string
+    {
+        return Utils::basename($path);
+    }
+
+    /**
+     * Prepares the row for saving and returns the storage key for the record.
+     *
+     * @param array $row
+     * @return void
+     */
+    protected function prepareRow(array &$row): void
+    {
+        if (array_key_exists($this->keyField, $row)) {
+            $key = $row[$this->keyField];
+            if ($key === $this->normalizeKey($key)) {
+                unset($row[$this->keyField]);
+            }
+        }
+    }
+
+    /**
+     * @param string $key
+     * @return array
+     */
+    protected function loadRow(string $key): ?array
+    {
+        $path = $this->getPathFromKey($key);
+        $file = $this->getFile($path);
         try {
-            $content = (array)$file->content();
-            if (isset($content[0])) {
-                throw new \RuntimeException('Broken object file.');
+            $data = (array)$file->content();
+            if (isset($data[0])) {
+                throw new RuntimeException('Broken object file');
+            }
+
+            // Add key field to the object.
+            $keyField = $this->keyField;
+            if ($keyField !== 'storage_key' && !isset($data[$keyField])) {
+                $data[$keyField] = $key;
             }
-        } catch (\RuntimeException $e) {
-            $content = ['__error' => $e->getMessage()];
+        } catch (RuntimeException $e) {
+            $data = ['__ERROR' => $e->getMessage()];
+        } finally {
+            $file->free();
+            unset($file);
         }
 
-        return $content;
+        $data['__META'] = $this->getObjectMeta($key);
+
+        return $data;
     }
 
     /**
-     * @param File $file
-     * @param array $data
+     * @param string $key
+     * @param array $row
      * @return array
      */
-    protected function saveFile(File $file, array $data): array
+    protected function saveRow(string $key, array $row): array
     {
         try {
-            $file->save($data);
+            if (isset($row[$this->keyField])) {
+                $key = $row[$this->keyField];
+            }
+            if (strpos($key, '@@') !== false) {
+                $key = $this->getNewKey();
+            }
+
+            $key = $this->normalizeKey($key);
+
+            // Check if the row already exists and if the key has been changed.
+            $oldKey = $row['__META']['storage_key'] ?? null;
+            if (is_string($oldKey) && $oldKey !== $key) {
+                $isCopy = $row['__META']['copy'] ?? false;
+                if ($isCopy) {
+                    $this->copyRow($oldKey, $key);
+                } else {
+                    $this->renameRow($oldKey, $key);
+                }
+            }
+
+            $this->prepareRow($row);
+            unset($row['__META'], $row['__ERROR']);
+
+            $path = $this->getPathFromKey($key);
+            $file = $this->getFile($path);
+
+            $file->save($row);
 
+        } catch (RuntimeException $e) {
+            throw new RuntimeException(sprintf('Flex saveFile(%s): %s', $path ?? $key, $e->getMessage()));
+        } finally {
             /** @var UniformResourceLocator $locator */
             $locator = Grav::instance()['locator'];
-            if ($locator->isStream($file->filename())) {
-                $locator->clearCache($file->filename());
+            $locator->clearCache();
+
+            if (isset($file)) {
+                $file->free();
+                unset($file);
             }
-        } catch (\RuntimeException $e) {
-            throw new \RuntimeException(sprintf('Flex saveFile(%s): %s', $file->filename(), $e->getMessage()));
         }
 
-        return $data;
+        $row['__META'] = $this->getObjectMeta($key, true);
+
+        return $row;
     }
 
     /**
@@ -292,22 +462,45 @@ protected function saveFile(File $file, array $data): array
      */
     protected function deleteFile(File $file)
     {
+        $filename = $file->filename();
         try {
             $data = $file->content();
-            $file->delete();
-
+            if ($file->exists()) {
+                $file->delete();
+            }
+        } catch (RuntimeException $e) {
+            throw new RuntimeException(sprintf('Flex deleteFile(%s): %s', $filename, $e->getMessage()));
+        } finally {
             /** @var UniformResourceLocator $locator */
             $locator = Grav::instance()['locator'];
-            if ($locator->isStream($file->filename())) {
-                $locator->clearCache($file->filename());
-            }
-        } catch (\RuntimeException $e) {
-            throw new \RuntimeException(sprintf('Flex deleteFile(%s): %s', $file->filename(), $e->getMessage()));
+            $locator->clearCache();
+
+            $file->free();
         }
 
         return $data;
     }
 
+    /**
+     * @param string $src
+     * @param string $dst
+     * @return bool
+     */
+    protected function copyFolder(string $src, string $dst): bool
+    {
+        try {
+            Folder::copy($this->resolvePath($src), $this->resolvePath($dst));
+        } catch (RuntimeException $e) {
+            throw new RuntimeException(sprintf('Flex copyFolder(%s, %s): %s', $src, $dst, $e->getMessage()));
+        } finally {
+            /** @var UniformResourceLocator $locator */
+            $locator = Grav::instance()['locator'];
+            $locator->clearCache();
+        }
+
+        return true;
+    }
+
     /**
      * @param string $src
      * @param string $dst
@@ -317,14 +510,12 @@ protected function moveFolder(string $src, string $dst): bool
     {
         try {
             Folder::move($this->resolvePath($src), $this->resolvePath($dst));
-
+        } catch (RuntimeException $e) {
+            throw new RuntimeException(sprintf('Flex moveFolder(%s, %s): %s', $src, $dst, $e->getMessage()));
+        } finally {
             /** @var UniformResourceLocator $locator */
             $locator = Grav::instance()['locator'];
-            if ($locator->isStream($src) || $locator->isStream($dst)) {
-                $locator->clearCache();
-            }
-        } catch (\RuntimeException $e) {
-            throw new \RuntimeException(sprintf('Flex moveFolder(%s, %s): %s', $src, $dst, $e->getMessage()));
+            $locator->clearCache();
         }
 
         return true;
@@ -338,29 +529,23 @@ protected function moveFolder(string $src, string $dst): bool
     protected function deleteFolder(string $path, bool $include_target = false): bool
     {
         try {
-            $success = Folder::delete($this->resolvePath($path), $include_target);
-
+            return Folder::delete($this->resolvePath($path), $include_target);
+        } catch (RuntimeException $e) {
+            throw new RuntimeException(sprintf('Flex deleteFolder(%s): %s', $path, $e->getMessage()));
+        } finally {
             /** @var UniformResourceLocator $locator */
             $locator = Grav::instance()['locator'];
-            if ($locator->isStream($path)) {
-                $locator->clearCache();
-            }
-
-            return $success;
-        } catch (\RuntimeException $e) {
-            throw new \RuntimeException(sprintf('Flex deleteFolder(%s): %s', $path, $e->getMessage()));
+            $locator->clearCache();
         }
     }
 
     /**
-     * Get key from the filesystem path.
-     *
-     * @param  string $path
-     * @return string
+     * @param string $key
+     * @return bool
      */
-    protected function getKeyFromPath(string $path): string
+    protected function canDeleteFolder(string $key): bool
     {
-        return basename($path);
+        return true;
     }
 
     /**
@@ -370,8 +555,10 @@ protected function getKeyFromPath(string $path): string
      */
     protected function buildIndex(): array
     {
+        $this->clearCache();
+
         $path = $this->getStoragePath();
-        if (!file_exists($path)) {
+        if (!$path || !file_exists($path)) {
             return [];
         }
 
@@ -381,46 +568,76 @@ protected function buildIndex(): array
             $list = $this->buildIndexFromFilesystem($path);
         }
 
-        ksort($list, SORT_NATURAL);
+        ksort($list, SORT_NATURAL | SORT_FLAG_CASE);
 
         return $list;
     }
 
+    /**
+     * @param string $key
+     * @param bool $reload
+     * @return array
+     */
+    protected function getObjectMeta(string $key, bool $reload = false): array
+    {
+        if (!$reload && isset($this->meta[$key])) {
+            return $this->meta[$key];
+        }
+
+        if ($key && strpos($key, '@@') === false) {
+            $filename = $this->getPathFromKey($key);
+            $modified = is_file($filename) ? filemtime($filename) : 0;
+        } else {
+            $modified = 0;
+        }
+
+        $meta = [
+            'storage_key' => $key,
+            'storage_timestamp' => $modified
+        ];
+
+        $this->meta[$key] = $meta;
+
+        return $meta;
+    }
+
+    /**
+     * @param string $path
+     * @return array
+     */
     protected function buildIndexFromFilesystem($path)
     {
-        $flags = \FilesystemIterator::KEY_AS_PATHNAME | \FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS;
+        $flags = FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS | FilesystemIterator::UNIX_PATHS;
 
-        $iterator = new \FilesystemIterator($path, $flags);
+        $iterator = new FilesystemIterator($path, $flags);
         $list = [];
-        /** @var \SplFileInfo $info */
+        /** @var SplFileInfo $info */
         foreach ($iterator as $filename => $info) {
-            if (!$info->isDir()) {
+            if (!$info->isDir() || strpos($info->getFilename(), '.') === 0) {
                 continue;
             }
 
             $key = $this->getKeyFromPath($filename);
-            $filename = $this->getPathFromKey($key);
-            $modified = is_file($filename) ? filemtime($filename) : null;
-            if (null === $modified) {
-                continue;
+            $meta = $this->getObjectMeta($key);
+            if ($meta['storage_timestamp']) {
+                $list[$key] = $meta;
             }
-
-            $list[$key] = [
-                'storage_key' => $key,
-                'storage_timestamp' => $modified
-            ];
         }
 
         return $list;
     }
 
+    /**
+     * @param string $path
+     * @return array
+     */
     protected function buildPrefixedIndexFromFilesystem($path)
     {
-        $flags = \FilesystemIterator::KEY_AS_PATHNAME | \FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::UNIX_PATHS;
+        $flags = FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS | FilesystemIterator::UNIX_PATHS;
 
-        $iterator = new \FilesystemIterator($path, $flags);
-        $list = [];
-        /** @var \SplFileInfo $info */
+        $iterator = new FilesystemIterator($path, $flags);
+        $list = [[]];
+        /** @var SplFileInfo $info */
         foreach ($iterator as $filename => $info) {
             if (!$info->isDir() || strpos($info->getFilename(), '.') === 0) {
                 continue;
@@ -429,11 +646,7 @@ protected function buildPrefixedIndexFromFilesystem($path)
             $list[] = $this->buildIndexFromFilesystem($filename);
         }
 
-        if (!$list) {
-            return [];
-        }
-
-        return \count($list) > 1 ? array_merge(...$list) : $list[0];
+        return array_merge(...$list);
     }
 
     /**
@@ -451,6 +664,7 @@ protected function getNewKey(): string
 
     /**
      * @param array $options
+     * @return void
      */
     protected function initOptions(array $options): void
     {
@@ -459,12 +673,36 @@ protected function initOptions(array $options): void
         /** @var string $pattern */
         $pattern = !empty($options['pattern']) ? $options['pattern'] : $this->dataPattern;
 
-        $this->dataFolder = $options['folder'];
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+        $folder = $options['folder'];
+        if ($locator->isStream($folder)) {
+            $folder = $locator->getResource($folder, false);
+        }
+
+        $this->dataFolder = $folder;
+        $this->dataFile = $options['file'] ?? 'item';
+        $this->dataExt = $extension;
+        if (mb_strpos($pattern, '{FILE}') === false && mb_strpos($pattern, '{EXT}') === false) {
+            if (isset($options['file'])) {
+                $pattern .= '/{FILE}{EXT}';
+            } else {
+                $filesystem = Filesystem::getInstance(true);
+                $this->dataFile = Utils::basename($pattern, $extension);
+                $pattern = $filesystem->dirname($pattern) . '/{FILE}{EXT}';
+            }
+        }
         $this->prefixed = (bool)($options['prefixed'] ?? strpos($pattern, '/{KEY:2}/'));
         $this->indexed = (bool)($options['indexed'] ?? false);
         $this->keyField = $options['key'] ?? 'storage_key';
+        $this->keyLen = (int)($options['key_len'] ?? 32);
+        $this->caseSensitive = (bool)($options['case_sensitive'] ?? true);
+
+        $pattern = Utils::simpleTemplate($pattern, $this->variables);
+        if (!$pattern) {
+            throw new RuntimeException('Bad storage folder pattern');
+        }
 
-        $pattern = preg_replace(['/{FOLDER}/', '/{KEY}/', '/{KEY:2}/'], ['%1$s', '%2$s', '%3$s'], $pattern);
-        $this->dataPattern = \dirname($pattern) . '/' . basename($pattern, $extension) . $extension;
+        $this->dataPattern = $pattern;
     }
 }
diff --git a/system/src/Grav/Framework/Flex/Storage/SimpleStorage.php b/system/src/Grav/Framework/Flex/Storage/SimpleStorage.php
index 088b9527e9..73e2b065d8 100644
--- a/system/src/Grav/Framework/Flex/Storage/SimpleStorage.php
+++ b/system/src/Grav/Framework/Flex/Storage/SimpleStorage.php
@@ -5,14 +5,21 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Flex\Storage;
 
+use Grav\Common\Data\Data;
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\Utils;
+use Grav\Framework\Filesystem\Filesystem;
 use InvalidArgumentException;
+use LogicException;
+use RuntimeException;
+use function is_scalar;
+use function is_string;
 
 /**
  * Class SimpleStorage
@@ -24,8 +31,12 @@ class SimpleStorage extends AbstractFilesystemStorage
     protected $dataFolder;
     /** @var string */
     protected $dataPattern;
-    /** @var array */
+    /** @var string|null */
+    protected $prefix;
+    /** @var array|null */
     protected $data;
+    /** @var int */
+    protected $modified = 0;
 
     /**
      * {@inheritdoc}
@@ -40,22 +51,55 @@ public function __construct(array $options)
         $formatter = $options['formatter'] ?? $this->detectDataFormatter($options['folder']);
         $this->initDataFormatter($formatter);
 
+        $filesystem = Filesystem::getInstance(true);
+
         $extension = $this->dataFormatter->getDefaultFileExtension();
-        $pattern = basename($options['folder']);
+        $pattern = Utils::basename($options['folder']);
 
-        $this->dataPattern = basename($pattern, $extension) . $extension;
-        $this->dataFolder = \dirname($options['folder']);
+        $this->dataPattern = Utils::basename($pattern, $extension) . $extension;
+        $this->dataFolder = $filesystem->dirname($options['folder']);
+        $this->keyField = $options['key'] ?? 'storage_key';
+        $this->keyLen = (int)($options['key_len'] ?? 32);
+        $this->prefix = $options['prefix'] ?? null;
 
         // Make sure that the data folder exists.
         if (!file_exists($this->dataFolder)) {
             try {
                 Folder::create($this->dataFolder);
-            } catch (\RuntimeException $e) {
-                throw new \RuntimeException(sprintf('Flex: %s', $e->getMessage()));
+            } catch (RuntimeException $e) {
+                throw new RuntimeException(sprintf('Flex: %s', $e->getMessage()));
             }
         }
     }
 
+    /**
+     * @return void
+     */
+    public function clearCache(): void
+    {
+        $this->data = null;
+        $this->modified = 0;
+    }
+
+    /**
+     * @param string[] $keys
+     * @param bool $reload
+     * @return array
+     */
+    public function getMetaData(array $keys, bool $reload = false): array
+    {
+        if (null === $this->data || $reload) {
+            $this->buildIndex();
+        }
+
+        $list = [];
+        foreach ($keys as $key) {
+            $list[$key] = $this->getObjectMeta((string)$key);
+        }
+
+        return $list;
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexStorageInterface::getExistingKeys()
@@ -90,8 +134,7 @@ public function createRows(array $rows): array
 
         $list = [];
         foreach ($rows as $key => $row) {
-            $key = $this->getNewKey();
-            $this->data[$key] = $list[$key] = $row;
+            $list[$key] = $this->saveRow('@@', $rows);
         }
 
         if ($list) {
@@ -113,10 +156,10 @@ public function readRows(array $rows, array &$fetched = null): array
 
         $list = [];
         foreach ($rows as $key => $row) {
-            if (null === $row || (!\is_object($row) && !\is_array($row))) {
+            if (null === $row || is_scalar($row)) {
                 // Only load rows which haven't been loaded before.
                 $key = (string)$key;
-                $list[$key] = $this->hasKey($key) ? $this->data[$key] : null;
+                $list[$key] = $this->hasKey($key) ? $this->loadRow($key) : null;
                 if (null !== $fetched) {
                     $fetched[$key] = $list[$key];
                 }
@@ -139,15 +182,19 @@ public function updateRows(array $rows): array
             $this->buildIndex();
         }
 
+        $save = false;
         $list = [];
         foreach ($rows as $key => $row) {
             $key = (string)$key;
             if ($this->hasKey($key)) {
-                $this->data[$key] = $list[$key] = $row;
+                $list[$key] = $this->saveRow($key, $row);
+                $save = true;
+            } else {
+                $list[$key] = null;
             }
         }
 
-        if ($list) {
+        if ($save) {
             $this->save();
         }
 
@@ -192,10 +239,7 @@ public function replaceRows(array $rows): array
 
         $list = [];
         foreach ($rows as $key => $row) {
-            if (strpos($key, '@@')) {
-                $key = $this->getNewKey();
-            }
-            $this->data[$key] = $list[$key] = $row;
+            $list[$key] = $this->saveRow((string)$key, $row);
         }
 
         if ($list) {
@@ -205,6 +249,26 @@ public function replaceRows(array $rows): array
         return $list;
     }
 
+    /**
+     * @param string $src
+     * @param string $dst
+     * @return bool
+     */
+    public function copyRow(string $src, string $dst): bool
+    {
+        if ($this->hasKey($dst)) {
+            throw new RuntimeException("Cannot copy object: key '{$dst}' is already taken");
+        }
+
+        if (!$this->hasKey($src)) {
+            return false;
+        }
+
+        $this->data[$dst] = $this->data[$src];
+
+        return true;
+    }
+
     /**
      * {@inheritdoc}
      * @see FlexStorageInterface::renameRow()
@@ -216,7 +280,7 @@ public function renameRow(string $src, string $dst): bool
         }
 
         if ($this->hasKey($dst)) {
-            throw new \RuntimeException("Cannot rename object: key '{$dst}' is already taken");
+            throw new RuntimeException("Cannot rename object: key '{$dst}' is already taken");
         }
 
         if (!$this->hasKey($src)) {
@@ -229,7 +293,7 @@ public function renameRow(string $src, string $dst): bool
 
         $data = array_combine($keys, $this->data);
         if (false === $data) {
-            throw new \LogicException('Bad data');
+            throw new LogicException('Bad data');
         }
 
         $this->data = $data;
@@ -241,7 +305,7 @@ public function renameRow(string $src, string $dst): bool
      * {@inheritdoc}
      * @see FlexStorageInterface::getStoragePath()
      */
-    public function getStoragePath(string $key = null): string
+    public function getStoragePath(string $key = null): ?string
     {
         return $this->dataFolder . '/' . $this->dataPattern;
     }
@@ -250,23 +314,114 @@ public function getStoragePath(string $key = null): string
      * {@inheritdoc}
      * @see FlexStorageInterface::getMediaPath()
      */
-    public function getMediaPath(string $key = null): string
+    public function getMediaPath(string $key = null): ?string
+    {
+        return null;
+    }
+
+    /**
+     * Prepares the row for saving and returns the storage key for the record.
+     *
+     * @param array $row
+     */
+    protected function prepareRow(array &$row): void
+    {
+        unset($row[$this->keyField]);
+    }
+
+    /**
+     * @param string $key
+     * @return array
+     */
+    protected function loadRow(string $key): ?array
+    {
+        $data = $this->data[$key] ?? [];
+        if ($this->keyField !== 'storage_key') {
+            $data[$this->keyField] = $key;
+        }
+        $data['__META'] = $this->getObjectMeta($key);
+
+        return $data;
+    }
+
+    /**
+     * @param string $key
+     * @param array $row
+     * @return array
+     */
+    protected function saveRow(string $key, array $row): array
+    {
+        try {
+            if (isset($row[$this->keyField])) {
+                $key = $row[$this->keyField];
+            }
+            if (strpos($key, '@@') !== false) {
+                $key = $this->getNewKey();
+            }
+
+            // Check if the row already exists and if the key has been changed.
+            $oldKey = $row['__META']['storage_key'] ?? null;
+            if (is_string($oldKey) && $oldKey !== $key) {
+                $isCopy = $row['__META']['copy'] ?? false;
+                if ($isCopy) {
+                    $this->copyRow($oldKey, $key);
+                } else {
+                    $this->renameRow($oldKey, $key);
+                }
+            }
+
+            $this->prepareRow($row);
+            unset($row['__META'], $row['__ERROR']);
+
+            $this->data[$key] = $row;
+        } catch (RuntimeException $e) {
+            throw new RuntimeException(sprintf('Flex saveRow(%s): %s', $key, $e->getMessage()));
+        }
+
+        $row['__META'] = $this->getObjectMeta($key, true);
+
+        return $row;
+    }
+
+    /**
+     * @param string $key
+     * @param bool $variations
+     * @return array
+     */
+    public function parseKey(string $key, bool $variations = true): array
     {
-        return sprintf('%s/%s/%s', $this->dataFolder, basename($this->dataPattern, $this->dataFormatter->getDefaultFileExtension()), $key);
+        return [
+            'key' => $key,
+        ];
     }
 
-    protected function save() : void
+    protected function save(): void
     {
         if (null === $this->data) {
             $this->buildIndex();
         }
 
         try {
-            $file = $this->getFile($this->getStoragePath());
-            $file->save($this->data);
-            $file->free();
-        } catch (\RuntimeException $e) {
-            throw new \RuntimeException(sprintf('Flex save(): %s', $e->getMessage()));
+            $path = $this->getStoragePath();
+            if (!$path) {
+                throw new RuntimeException('Storage path is not defined');
+            }
+            $file = $this->getFile($path);
+            if ($this->prefix) {
+                $data = new Data((array)$file->content());
+                $content = $data->set($this->prefix, $this->data)->toArray();
+            } else {
+                $content = $this->data;
+            }
+            $file->save($content);
+            $this->modified = (int)$file->modified(); // cast false to 0
+        } catch (RuntimeException $e) {
+            throw new RuntimeException(sprintf('Flex save(): %s', $e->getMessage()));
+        } finally {
+            if (isset($file)) {
+                $file->free();
+                unset($file);
+            }
         }
     }
 
@@ -278,7 +433,7 @@ protected function save() : void
      */
     protected function getKeyFromPath(string $path): string
     {
-        return basename($path);
+        return Utils::basename($path);
     }
 
     /**
@@ -288,22 +443,51 @@ protected function getKeyFromPath(string $path): string
      */
     protected function buildIndex(): array
     {
-        $file = $this->getFile($this->getStoragePath());
-        $modified = $file->modified();
+        $path = $this->getStoragePath();
+        if (!$path) {
+            $this->data = [];
+
+            return [];
+        }
 
-        $this->data = (array) $file->content();
+        $file = $this->getFile($path);
+        $this->modified = (int)$file->modified(); // cast false to 0
+
+        $content = (array) $file->content();
+        if ($this->prefix) {
+            $data = new Data($content);
+            $content = $data->get($this->prefix, []);
+        }
+
+        $file->free();
+        unset($file);
+
+        $this->data = $content;
 
         $list = [];
         foreach ($this->data as $key => $info) {
-            $list[$key] = [
-                'storage_key' => $key,
-                'storage_timestamp' => $modified
-            ];
+            $list[$key] = $this->getObjectMeta((string)$key);
         }
 
         return $list;
     }
 
+    /**
+     * @param string $key
+     * @param bool $reload
+     * @return array
+     */
+    protected function getObjectMeta(string $key, bool $reload = false): array
+    {
+        $modified = isset($this->data[$key]) ? $this->modified : 0;
+
+        return [
+            'storage_key' => $key,
+            'key' => $key,
+            'storage_timestamp' => $modified
+        ];
+    }
+
     /**
      * @return string
      */
diff --git a/system/src/Grav/Framework/Flex/Traits/FlexAuthorizeTrait.php b/system/src/Grav/Framework/Flex/Traits/FlexAuthorizeTrait.php
index e1b63d9660..ef4c433a2b 100644
--- a/system/src/Grav/Framework/Flex/Traits/FlexAuthorizeTrait.php
+++ b/system/src/Grav/Framework/Flex/Traits/FlexAuthorizeTrait.php
@@ -5,13 +5,12 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Flex\Traits;
 
-use Grav\Common\Grav;
 use Grav\Common\User\Interfaces\UserInterface;
 use Grav\Framework\Flex\FlexDirectory;
 use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
@@ -21,40 +20,107 @@
  */
 trait FlexAuthorizeTrait
 {
-    private $_authorize = '%s.flex-object.%s';
-
-    public function isAuthorized(string $action, string $scope = null, UserInterface $user = null) : bool
+    /**
+     * Check if user is authorized for the action.
+     *
+     * Note: There are two deny values: denied (false), not set (null). This allows chaining multiple rules together
+     * when the previous rules were not matched.
+     *
+     * To override the default behavior, please use isAuthorizedOverride().
+     *
+     * @param string $action
+     * @param string|null $scope
+     * @param UserInterface|null $user
+     * @return bool|null
+     * @final
+     */
+    public function isAuthorized(string $action, string $scope = null, UserInterface $user = null): ?bool
     {
+        $action = $this->getAuthorizeAction($action);
+        $scope = $scope ?? $this->getAuthorizeScope();
+
+        $isMe = null === $user;
+        if ($isMe) {
+            $user = $this->getActiveUser();
+        }
+
         if (null === $user) {
-            /** @var UserInterface $user */
-            $user = Grav::instance()['user'] ?? null;
+            return false;
         }
 
-        return $user && ($this->isAuthorizedAction($user, $action, $scope) || $this->isAuthorizedSuperAdmin($user));
+        // Finally authorize against given action.
+        return $this->isAuthorizedOverride($user, $action, $scope, $isMe);
     }
 
-    protected function isAuthorizedSuperAdmin(UserInterface $user): bool
+    /**
+     * Please override this method
+     *
+     * @param UserInterface $user
+     * @param string $action
+     * @param string $scope
+     * @param bool $isMe
+     * @return bool|null
+     */
+    protected function isAuthorizedOverride(UserInterface $user, string $action, string $scope, bool $isMe): ?bool
     {
-        return $user->authorize('admin.super');
+        return $this->isAuthorizedAction($user, $action, $scope, $isMe);
     }
 
-    protected function isAuthorizedAction(UserInterface $user, string $action, string $scope = null) : bool
+    /**
+     * Check if user is authorized for the action.
+     *
+     * @param UserInterface $user
+     * @param string $action
+     * @param string $scope
+     * @param bool $isMe
+     * @return bool|null
+     */
+    protected function isAuthorizedAction(UserInterface $user, string $action, string $scope, bool $isMe): ?bool
     {
-        $scope = $scope ?? isset(Grav::instance()['admin']) ? 'admin' : 'site';
-
-        if ($action === 'save' && $this instanceof FlexObjectInterface) {
-            $action = $this->exists() ? 'update' : 'create';
-        }
-
+        // Check if the action has been denied in the flex type configuration.
         $directory = $this instanceof FlexDirectory ? $this : $this->getFlexDirectory();
         $config = $directory->getConfig();
         $allowed = $config->get("{$scope}.actions.{$action}") ?? $config->get("actions.{$action}") ?? true;
+        if (false === $allowed) {
+            return false;
+        }
 
-        return $allowed && $user->authorize(sprintf($this->_authorize, $scope, $action));
+        // TODO: Not needed anymore with flex users, remove in 2.0.
+        $auth = $user instanceof FlexObjectInterface ? null : $user->authorize('admin.super');
+        if (true === $auth) {
+            return true;
+        }
+
+        // Finally authorize the action.
+        return $user->authorize($this->getAuthorizeRule($scope, $action), !$isMe ? 'test' : null);
     }
 
-    protected function setAuthorizeRule(string $authorize) : void
+    /**
+     * @param UserInterface $user
+     * @return bool|null
+     * @deprecated 1.7 Not needed for Flex Users.
+     */
+    protected function isAuthorizedSuperAdmin(UserInterface $user): ?bool
     {
-        $this->_authorize = $authorize;
+        // Action authorization includes super user authorization if using Flex Users.
+        if ($user instanceof FlexObjectInterface) {
+            return null;
+        }
+
+        return $user->authorize('admin.super');
+    }
+
+    /**
+     * @param string $scope
+     * @param string $action
+     * @return string
+     */
+    protected function getAuthorizeRule(string $scope, string $action): string
+    {
+        if ($this instanceof FlexDirectory) {
+            return $this->getAuthorizeRule($scope, $action);
+        }
+
+        return $this->getFlexDirectory()->getAuthorizeRule($scope, $action);
     }
 }
diff --git a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
index 8b2270604b..0f55595ccc 100644
--- a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
+++ b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
@@ -5,26 +5,36 @@
 /**
  * @package    Grav\Framework\Flex
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
-use Grav\Common\Cache;
 use Grav\Common\Config\Config;
-use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
 use Grav\Common\Media\Interfaces\MediaCollectionInterface;
+use Grav\Common\Media\Interfaces\MediaUploadInterface;
 use Grav\Common\Media\Traits\MediaTrait;
-use Grav\Common\Page\Medium\AbstractMedia;
+use Grav\Common\Page\Media;
 use Grav\Common\Page\Medium\Medium;
 use Grav\Common\Page\Medium\MediumFactory;
 use Grav\Common\Utils;
+use Grav\Framework\Cache\CacheInterface;
+use Grav\Framework\Filesystem\Filesystem;
 use Grav\Framework\Flex\FlexDirectory;
 use Grav\Framework\Form\FormFlashFile;
+use Grav\Framework\Media\Interfaces\MediaObjectInterface;
+use Grav\Framework\Media\MediaObject;
+use Grav\Framework\Media\UploadedMediaObject;
 use Psr\Http\Message\UploadedFileInterface;
-use RocketTheme\Toolbox\File\YamlFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 use RuntimeException;
+use function array_key_exists;
+use function in_array;
+use function is_array;
+use function is_callable;
+use function is_int;
+use function is_string;
+use function strpos;
 
 /**
  * Implements Grav Page content and header manipulation methods.
@@ -35,29 +45,23 @@ trait FlexMediaTrait
         MediaTrait::getMedia as protected getExistingMedia;
     }
 
-    protected $_uploads;
-
-    public function __debugInfo()
-    {
-        return parent::__debugInfo() + [
-            'uploads:private' => $this->getUpdatedMedia()
-        ];
-    }
+    /** @var array */
+    protected $_uploads = [];
 
     /**
-     * @return string
+     * @return string|null
      */
     public function getStorageFolder()
     {
-        return $this->exists() ? $this->getFlexDirectory()->getStorageFolder($this->getStorageKey()) : '';
+        return $this->exists() ? $this->getFlexDirectory()->getStorageFolder($this->getStorageKey()) : null;
     }
 
     /**
-     * @return string
+     * @return string|null
      */
     public function getMediaFolder()
     {
-        return $this->exists() ? $this->getFlexDirectory()->getMediaFolder($this->getStorageKey()) : '';
+        return $this->exists() ? $this->getFlexDirectory()->getMediaFolder($this->getStorageKey()) : null;
     }
 
     /**
@@ -65,245 +69,435 @@ public function getMediaFolder()
      */
     public function getMedia()
     {
-        if ($this->media === null) {
-            /** @var AbstractMedia $media */
+        $media = $this->media;
+        if (null === $media) {
             $media = $this->getExistingMedia();
 
             // Include uploaded media to the object media.
-            /** @var FormFlashFile $upload */
-            foreach ($this->getUpdatedMedia() as $filename => $upload) {
-                // Just make sure we do not include removed or moved media.
-                if ($upload && $upload->getError() === \UPLOAD_ERR_OK && !$upload->isMoved()) {
-                    $media->add($filename, MediumFactory::fromUploadedFile($upload));
-                }
-            }
+            $this->addUpdatedMedia($media);
+        }
 
-            $media->setTimestamps();
+        return $media;
+    }
+
+    /**
+     * @param string $field
+     * @return MediaCollectionInterface|null
+     */
+    public function getMediaField(string $field): ?MediaCollectionInterface
+    {
+        // Field specific media.
+        $settings = $this->getFieldSettings($field);
+        if (!empty($settings['media_field'])) {
+            $var = 'destination';
+        } elseif (!empty($settings['media_picker_field'])) {
+            $var = 'folder';
+        }
+
+        if (empty($var)) {
+            // Not a media field.
+            $media = null;
+        } elseif ($settings['self']) {
+            // Uses main media.
+            $media = $this->getMedia();
+        } else {
+            // Uses custom media.
+            $media = new Media($settings[$var]);
+            $this->addUpdatedMedia($media);
         }
 
-        return $this->media;
+        return $media;
     }
 
-    public function checkUploadedMediaFile(UploadedFileInterface $uploadedFile)
+    /**
+     * @param string $field
+     * @return array|null
+     */
+    public function getFieldSettings(string $field): ?array
     {
-        $grav = Grav::instance();
-        $language = $grav['language'];
-
-        switch ($uploadedFile->getError()) {
-            case UPLOAD_ERR_OK:
-                break;
-            case UPLOAD_ERR_NO_FILE:
-                if ($uploadedFile instanceof FormFlashFile) {
-                    break;
-                }
-                throw new RuntimeException($language->translate('PLUGIN_ADMIN.NO_FILES_SENT'), 400);
-            case UPLOAD_ERR_INI_SIZE:
-            case UPLOAD_ERR_FORM_SIZE:
-                throw new RuntimeException($language->translate('PLUGIN_ADMIN.EXCEEDED_FILESIZE_LIMIT'), 400);
-            case UPLOAD_ERR_NO_TMP_DIR:
-                throw new RuntimeException($language->translate('PLUGIN_ADMIN.UPLOAD_ERR_NO_TMP_DIR'), 400);
-            default:
-                throw new RuntimeException($language->translate('PLUGIN_ADMIN.UNKNOWN_ERRORS'), 400);
+        if ($field === '') {
+            return null;
+        }
+
+        // Load settings for the field.
+        $schema = $this->getBlueprint()->schema();
+        $settings = (array)$schema->getProperty($field);
+        if (!is_array($settings)) {
+            return null;
         }
 
-        $filename = $uploadedFile->getClientFilename();
+        $type = $settings['type'] ?? '';
+
+        // Media field.
+        if (!empty($settings['media_field']) || array_key_exists('destination', $settings) || in_array($type, ['avatar', 'file', 'pagemedia'], true)) {
+            $settings['media_field'] = true;
+            $var = 'destination';
+        }
 
-        if (!Utils::checkFilename($filename)) {
-            throw new RuntimeException(sprintf($language->translate('PLUGIN_ADMIN.FILEUPLOAD_UNABLE_TO_UPLOAD'), $filename, 'Bad filename'), 400);
+        // Media picker field.
+        if (!empty($settings['media_picker_field']) || in_array($type, ['filepicker', 'pagemediaselect'], true)) {
+            $settings['media_picker_field'] = true;
+            $var = 'folder';
         }
 
-        $grav_limit = Utils::getUploadLimit();
-        if ($grav_limit > 0 && $uploadedFile->getSize() > $grav_limit) {
-            throw new RuntimeException($language->translate('PLUGIN_ADMIN.EXCEEDED_GRAV_FILESIZE_LIMIT'), 400);
+        // Set media folder for media fields.
+        if (isset($var)) {
+            $folder = $settings[$var] ?? '';
+            if (in_array(rtrim($folder, '/'), ['', '@self', 'self@', '@self@'], true)) {
+                $settings[$var] = $this->getMediaFolder();
+                $settings['self'] = true;
+            } else {
+                $settings[$var] = Utils::getPathFromToken($folder, $this);
+                $settings['self'] = false;
+            }
         }
 
-        $this->checkMediaFilename($filename);
+        return $settings;
     }
 
-    public function checkMediaFilename(string $filename)
+    /**
+     * @param string $field
+     * @return array
+     * @internal
+     */
+    protected function getMediaFieldSettings(string $field): array
     {
-        // Check the file extension.
-        $extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+        $settings = $this->getFieldSettings($field) ?? [];
 
-        $grav = Grav::instance();
+        return $settings + ['accept' => '*', 'limit' => 1000, 'self' => true];
+    }
 
-        /** @var Config $config */
-        $config = $grav['config'];
+    /**
+     * @return array
+     */
+    protected function getMediaFields(): array
+    {
+        // Load settings for the field.
+        $schema = $this->getBlueprint()->schema();
 
-        // If not a supported type, return
-        if (!$extension || !$config->get("media.types.{$extension}")) {
-            $language = $grav['language'];
-            throw new RuntimeException($language->translate('PLUGIN_ADMIN.UNSUPPORTED_FILE_TYPE') . ': ' . $extension, 400);
+        $list = [];
+        foreach ($schema->getState()['items'] as $field => $settings) {
+            if (isset($settings['type']) && (in_array($settings['type'], ['avatar', 'file', 'pagemedia']) || !empty($settings['destination']))) {
+                $list[] = $field;
+            }
         }
+
+        return $list;
     }
 
-    public function uploadMediaFile(UploadedFileInterface $uploadedFile, string $filename = null): void
+    /**
+     * @param array|mixed $value
+     * @param array $settings
+     * @return array|mixed
+     */
+    protected function parseFileProperty($value, array $settings = [])
     {
-        $this->checkUploadedMediaFile($uploadedFile);
-
-        if ($filename) {
-            $this->checkMediaFilename(basename($filename));
-        } else {
-            $filename = $uploadedFile->getClientFilename();
+        if (!is_array($value)) {
+            return $value;
         }
 
         $media = $this->getMedia();
-        $grav = Grav::instance();
+        $originalMedia = is_callable([$this, 'getOriginalMedia']) ? $this->getOriginalMedia() : null;
 
-        /** @var UniformResourceLocator $locator */
-        $locator = $grav['locator'];
-        $path = $media->getPath();
-        if (!$path) {
-            $language = $grav['language'];
+        $list = [];
+        foreach ($value as $filename => $info) {
+            if (!is_array($info)) {
+                $list[$filename] = $info;
+                continue;
+            }
 
-            throw new RuntimeException($language->translate('PLUGIN_ADMIN.FAILED_TO_MOVE_UPLOADED_FILE'), 400);
+            if (is_int($filename)) {
+                $filename = $info['path'] ?? $info['name'];
+            }
+
+            /** @var Medium|null $imageFile */
+            $imageFile = $media[$filename];
+
+            /** @var Medium|null $originalFile */
+            $originalFile = $originalMedia ? $originalMedia[$filename] : null;
+
+            $url = $imageFile ? $imageFile->url() : null;
+            $originalUrl = $originalFile ? $originalFile->url() : null;
+            $list[$filename] = [
+                'name' => $info['name'] ?? null,
+                'type' => $info['type'] ?? null,
+                'size' => $info['size'] ?? null,
+                'path' => $filename,
+                'thumb_url' => $url,
+                'image_url' => $originalUrl ?? $url
+            ];
+            if ($originalFile) {
+                $list[$filename]['cropData'] = (object)($originalFile->metadata()['upload']['crop'] ?? []);
+            }
         }
 
-        if ($locator->isStream($path)) {
-            $path = $locator->findResource($path, true, true);
-            $locator->clearCache($path);
+        return $list;
+    }
+
+    /**
+     * @param UploadedFileInterface $uploadedFile
+     * @param string|null $filename
+     * @param string|null $field
+     * @return void
+     * @internal
+     */
+    public function checkUploadedMediaFile(UploadedFileInterface $uploadedFile, string $filename = null, string $field = null)
+    {
+        $media = $this->getMedia();
+        if (!$media instanceof MediaUploadInterface) {
+            throw new RuntimeException("Media for {$this->getFlexDirectory()->getFlexType()} doesn't support file uploads.");
         }
 
-        try {
-            // Upload it
-            $filepath = sprintf('%s/%s', $path, $filename);
-            Folder::create(\dirname($filepath));
-            if ($uploadedFile instanceof FormFlashFile) {
-                $metadata = $uploadedFile->getMetaData();
-                if ($metadata) {
-                    $file = YamlFile::instance($filepath . '.meta.yaml');
-                    $file->save(['upload' => $metadata]);
-                }
-                if ($uploadedFile->getError() === \UPLOAD_ERR_OK) {
-                    $uploadedFile->moveTo($filepath);
-                } elseif (!file_exists($filepath) && $pos = strpos($filename, '/')) {
-                    $origpath = sprintf('%s/%s', $path, substr($filename, $pos));
-                    if (file_exists($origpath)) {
-                        copy($origpath, $filepath);
-                    }
-                }
-            } else {
-                $uploadedFile->moveTo($filepath);
-            }
-        } catch (\Exception $e) {
-            $language = $grav['language'];
+        $media->checkUploadedFile($uploadedFile, $filename, $this->getMediaFieldSettings($field ?? ''));
+    }
+
+    /**
+     * @param UploadedFileInterface $uploadedFile
+     * @param string|null $filename
+     * @param string|null $field
+     * @return void
+     * @internal
+     */
+    public function uploadMediaFile(UploadedFileInterface $uploadedFile, string $filename = null, string $field = null): void
+    {
+        $settings = $this->getMediaFieldSettings($field ?? '');
 
-            throw new RuntimeException($language->translate('PLUGIN_ADMIN.FAILED_TO_MOVE_UPLOADED_FILE'), 400);
+        $media = $field ? $this->getMediaField($field) : $this->getMedia();
+        if (!$media instanceof MediaUploadInterface) {
+            throw new RuntimeException("Media for {$this->getFlexDirectory()->getFlexType()} doesn't support file uploads.");
         }
 
+        $filename = $media->checkUploadedFile($uploadedFile, $filename, $settings);
+        $media->copyUploadedFile($uploadedFile, $filename, $settings);
         $this->clearMediaCache();
     }
 
+    /**
+     * @param string $filename
+     * @return void
+     * @internal
+     */
     public function deleteMediaFile(string $filename): void
     {
-        $grav = Grav::instance();
-        $language = $grav['language'];
+        $media = $this->getMedia();
+        if (!$media instanceof MediaUploadInterface) {
+            throw new RuntimeException("Media for {$this->getFlexDirectory()->getFlexType()} doesn't support file uploads.");
+        }
 
-        $basename = basename($filename);
-        $dirname = dirname($filename);
-        $dirname = $dirname === '.' ? '' : '/' . $dirname;
+        $media->deleteFile($filename);
+        $this->clearMediaCache();
+    }
 
-        if (!Utils::checkFilename($basename)) {
-            throw new RuntimeException($language->translate('PLUGIN_ADMIN.FILE_COULD_NOT_BE_DELETED') . ': Bad filename: ' . $filename, 400);
-        }
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
+    public function __debugInfo()
+    {
+        return parent::__debugInfo() + [
+                'uploads:private' => $this->getUpdatedMedia()
+            ];
+    }
 
-        $media = $this->getMedia();
-        $path = $media->getPath();
-        if (!$path) {
-            return;
+    /**
+     * @param string|null $field
+     * @param string $filename
+     * @param MediaObjectInterface|null $image
+     * @return MediaObject|UploadedMediaObject
+     */
+    protected function buildMediaObject(?string $field, string $filename, MediaObjectInterface $image = null)
+    {
+        if (!$image) {
+            $media = $field ? $this->getMediaField($field) : null;
+            if ($media) {
+                $image = $media[$filename];
+            }
         }
 
-        /** @var UniformResourceLocator $locator */
-        $locator = $grav['locator'];
+        return new MediaObject($field, $filename, $image, $this);
+    }
+
+    /**
+     * @param string|null $field
+     * @return array
+     */
+    protected function buildMediaList(?string $field): array
+    {
+        $names = $field ? (array)$this->getNestedProperty($field) : [];
+        $media = $field ? $this->getMediaField($field) : null;
+        if (null === $media) {
+            $media = $this->getMedia();
+        }
 
-        $targetPath = $path . '/' . $dirname;
-        $targetFile = $path . '/' . $filename;
-        if ($locator->isStream($targetFile)) {
-            $targetPath = $locator->findResource($targetPath, true, true);
-            $targetFile = $locator->findResource($targetFile, true, true);
-            $locator->clearCache($targetPath);
-            $locator->clearCache($targetFile);
+        $list = [];
+        foreach ($names as $key => $val) {
+            $name = is_string($val) ? $val : $key;
+            $medium = $media[$name];
+            if ($medium) {
+                if ($medium->uploaded_file) {
+                    $upload = $medium->uploaded_file;
+                    $id = $upload instanceof FormFlashFile ? $upload->getId() : "{$field}-{$name}";
+
+                    $list[] = new UploadedMediaObject($id, $field, $name, $upload);
+                } else {
+                    $list[] = $this->buildMediaObject($field, $name, $medium);
+                }
+            }
         }
 
-        $fileParts  = pathinfo($basename);
+        return $list;
+    }
 
-        if (!file_exists($targetPath)) {
+    /**
+     * @param array $files
+     * @return void
+     */
+    protected function setUpdatedMedia(array $files): void
+    {
+        $media = $this->getMedia();
+        if (!$media instanceof MediaUploadInterface) {
             return;
         }
 
-        if (file_exists($targetFile)) {
-            $result = unlink($targetFile);
-            if (!$result) {
-                throw new RuntimeException($language->translate('PLUGIN_ADMIN.FILE_COULD_NOT_BE_DELETED') . ': ' . $filename, 500);
+        $filesystem = Filesystem::getInstance(false);
+
+        $list = [];
+        foreach ($files as $field => $group) {
+            $field = (string)$field;
+            // Ignore files without a field and resized images.
+            if ($field === '' || strpos($field, '/')) {
+                continue;
             }
-        }
 
-        // Remove Extra Files
-        foreach (scandir($targetPath, SCANDIR_SORT_NONE) as $file) {
-            $preg_name = preg_quote($fileParts['filename'], '`');
-            $preg_ext =preg_quote($fileParts['extension'], '`');
-            $preg_filename = preg_quote($basename, '`');
-
-            if (preg_match("`({$preg_name}@\d+x\.{$preg_ext}(?:\.meta\.yaml)?$|{$preg_filename}\.meta\.yaml)$`", $file)) {
-                $testPath = $targetPath . '/' . $file;
-                if ($locator->isStream($testPath)) {
-                    $testPath = $locator->findResource($testPath, true, true);
-                    $locator->clearCache($testPath);
+            // Load settings for the field.
+            $settings = $this->getMediaFieldSettings($field);
+            foreach ($group as $filename => $file) {
+                if ($file) {
+                    // File upload.
+                    $filename = $file->getClientFilename();
+
+                    /** @var FormFlashFile $file */
+                    $data = $file->jsonSerialize();
+                    unset($data['tmp_name'], $data['path']);
+                } else {
+                    // File delete.
+                    $data = null;
+                }
+
+                if ($file) {
+                    // Check file upload against media limits (except for max size).
+                    $filename = $media->checkUploadedFile($file, $filename, ['filesize' => 0] + $settings);
                 }
 
-                if (is_file($testPath)) {
-                    $result = unlink($testPath);
-                    if (!$result) {
-                        throw new RuntimeException($language->translate('PLUGIN_ADMIN.FILE_COULD_NOT_BE_DELETED') . ': ' . $filename, 500);
-                    }
+                $self = $settings['self'];
+                if ($this->_loadMedia && $self) {
+                    $filepath = $filename;
+                } else {
+                    $filepath = "{$settings['destination']}/{$filename}";
+                }
+
+                // Calculate path without the retina scaling factor.
+                $realpath = $filesystem->pathname($filepath) . str_replace(['@3x', '@2x'], '', Utils::basename($filepath));
+
+                $list[$filename] = [$file, $settings];
+
+                $path = str_replace('.', "\n", $field);
+                if (null !== $data) {
+                    $data['name'] = $filename;
+                    $data['path'] = $filepath;
+
+                    $this->setNestedProperty("{$path}\n{$realpath}", $data, "\n");
+                } else {
+                    $this->unsetNestedProperty("{$path}\n{$realpath}", "\n");
                 }
             }
         }
 
         $this->clearMediaCache();
+
+        $this->_uploads = $list;
     }
 
     /**
-     * @param array $files
+     * @param MediaCollectionInterface $media
      */
-    protected function setUpdatedMedia(array $files): void
+    protected function addUpdatedMedia(MediaCollectionInterface $media): void
     {
-        $list = [];
-        foreach ($files as $field => $group) {
-            if ($field === '' || \strpos($field, '/', true)) {
-                continue;
+        $updated = false;
+        foreach ($this->getUpdatedMedia() as $filename => $upload) {
+            if (is_array($upload)) {
+                /** @var array{UploadedFileInterface,array} $upload */
+                $settings = $upload[1];
+                if (isset($settings['destination']) && $settings['destination'] === $media->getPath()) {
+                    $upload = $upload[0];
+                } else {
+                    $upload = false;
+                }
             }
-            foreach ($group as $filename => $file) {
-                $list[$filename] = $file;
+            if (false !== $upload) {
+                $medium = $upload ? MediumFactory::fromUploadedFile($upload) : null;
+                $updated = true;
+                if ($medium) {
+                    $medium->uploaded = true;
+                    $medium->uploaded_file = $upload;
+                    $media->add($filename, $medium);
+                } elseif (is_callable([$media, 'hide'])) {
+                    $media->hide($filename);
+                }
             }
         }
 
-        $this->_uploads = $list;
+        if ($updated) {
+            $media->setTimestamps();
+        }
     }
 
     /**
-     * @return array
+     * @return array<string,UploadedFileInterface|array|null>
      */
     protected function getUpdatedMedia(): array
     {
-        return $this->_uploads ?? [];
+        return $this->_uploads;
     }
 
+    /**
+     * @return void
+     */
     protected function saveUpdatedMedia(): void
     {
+        $media = $this->getMedia();
+        if (!$media instanceof MediaUploadInterface) {
+            return;
+        }
+
+        // Upload/delete altered files.
         /**
          * @var string $filename
-         * @var UploadedFileInterface $file
+         * @var UploadedFileInterface|array|null $file
          */
         foreach ($this->getUpdatedMedia() as $filename => $file) {
-            if ($file) {
-                $this->uploadMediaFile($file, $filename);
+            if (is_array($file)) {
+                [$file, $settings] = $file;
+            } else {
+                $settings = null;
+            }
+            if ($file instanceof UploadedFileInterface) {
+                $media->copyUploadedFile($file, $filename, $settings);
             } else {
-                $this->deleteMediaFile($filename);
+                $media->deleteFile($filename, $settings);
             }
         }
 
         $this->setUpdatedMedia([]);
+        $this->clearMediaCache();
+    }
+
+    /**
+     * @return void
+     */
+    protected function freeMedia(): void
+    {
+        $this->unsetObjectProperty('media');
     }
 
     /**
@@ -319,28 +513,64 @@ protected function createMedium($uri)
 
         $file = $uri && $locator->isStream($uri) ? $locator->findResource($uri) : $uri;
 
-        return $file && file_exists($file) ? MediumFactory::fromFile($file) : null;
+        return is_string($file) && file_exists($file) ? MediumFactory::fromFile($file) : null;
     }
 
     /**
-     * @return Cache
+     * @return CacheInterface
      */
     protected function getMediaCache()
     {
         return $this->getCache('object');
     }
 
+    /**
+     * @return MediaCollectionInterface
+     */
     protected function offsetLoad_media()
     {
         return $this->getMedia();
     }
 
+    /**
+     * @return null
+     */
     protected function offsetSerialize_media()
     {
         return null;
     }
 
+    /**
+     * @return FlexDirectory
+     */
     abstract public function getFlexDirectory(): FlexDirectory;
 
-    abstract public function getStorageKey();
+    /**
+     * @return string
+     */
+    abstract public function getStorageKey(): string;
+
+    /**
+     * @param string $filename
+     * @return void
+     * @deprecated 1.7 Use Media class that implements MediaUploadInterface instead.
+     */
+    public function checkMediaFilename(string $filename)
+    {
+        user_error(__METHOD__ . '() is deprecated since Grav 1.7, use Media class that implements MediaUploadInterface instead', E_USER_DEPRECATED);
+
+        // Check the file extension.
+        $extension = strtolower(Utils::pathinfo($filename, PATHINFO_EXTENSION));
+
+        $grav = Grav::instance();
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
+        // If not a supported type, return
+        if (!$extension || !$config->get("media.types.{$extension}")) {
+            $language = $grav['language'];
+            throw new RuntimeException($language->translate('PLUGIN_ADMIN.UNSUPPORTED_FILE_TYPE') . ': ' . $extension, 400);
+        }
+    }
 }
diff --git a/system/src/Grav/Framework/Flex/Traits/FlexRelatedDirectoryTrait.php b/system/src/Grav/Framework/Flex/Traits/FlexRelatedDirectoryTrait.php
new file mode 100644
index 0000000000..de98359e7c
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Traits/FlexRelatedDirectoryTrait.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @package    Grav\Common\Flex
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Flex\Traits;
+
+use Grav\Framework\Flex\FlexDirectory;
+use Grav\Framework\Flex\Interfaces\FlexCollectionInterface;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use RuntimeException;
+use function in_array;
+
+/**
+ * Trait GravTrait
+ * @package Grav\Common\Flex\Traits
+ */
+trait FlexRelatedDirectoryTrait
+{
+    /**
+     * @param string $type
+     * @param string $property
+     * @return FlexCollectionInterface<FlexObjectInterface>
+     */
+    protected function getCollectionByProperty($type, $property)
+    {
+        $directory = $this->getRelatedDirectory($type);
+        $collection = $directory->getCollection();
+        $list = $this->getNestedProperty($property) ?: [];
+
+        /** @var FlexCollectionInterface<FlexObjectInterface> $collection */
+        $collection = $collection->filter(static function ($object) use ($list) {
+            return in_array($object->getKey(), $list, true);
+        });
+
+        return $collection;
+    }
+
+    /**
+     * @param string $type
+     * @return FlexDirectory
+     * @throws RuntimeException
+     */
+    protected function getRelatedDirectory($type): FlexDirectory
+    {
+        $directory = $this->getFlexContainer()->getDirectory($type);
+        if (!$directory) {
+            throw new RuntimeException(ucfirst($type). ' directory does not exist!');
+        }
+
+        return $directory;
+    }
+}
diff --git a/system/src/Grav/Framework/Flex/Traits/FlexRelationshipsTrait.php b/system/src/Grav/Framework/Flex/Traits/FlexRelationshipsTrait.php
new file mode 100644
index 0000000000..2a73ebaa03
--- /dev/null
+++ b/system/src/Grav/Framework/Flex/Traits/FlexRelationshipsTrait.php
@@ -0,0 +1,61 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Flex\Traits;
+
+use Grav\Framework\Contracts\Relationships\RelationshipInterface;
+use Grav\Framework\Contracts\Relationships\RelationshipsInterface;
+use Grav\Framework\Flex\FlexIdentifier;
+use Grav\Framework\Relationships\Relationships;
+
+/**
+ * Trait FlexRelationshipsTrait
+ */
+trait FlexRelationshipsTrait
+{
+    /** @var RelationshipsInterface|null */
+    private $_relationships = null;
+
+    /**
+     * @return Relationships
+     */
+    public function getRelationships(): Relationships
+    {
+        if (!isset($this->_relationships)) {
+            $blueprint = $this->getBlueprint();
+            $options = $blueprint->get('config/relationships', []);
+            $parent = FlexIdentifier::createFromObject($this);
+
+            $this->_relationships = new Relationships($parent, $options);
+        }
+
+        return $this->_relationships;
+    }
+
+    /**
+     * @param string $name
+     * @return RelationshipInterface|null
+     */
+    public function getRelationship(string $name): ?RelationshipInterface
+    {
+        return $this->getRelationships()[$name];
+    }
+
+    protected function resetRelationships(): void
+    {
+        $this->_relationships = null;
+    }
+
+    /**
+     * @param iterable $collection
+     * @return array
+     */
+    protected function buildFlexIdentifierList(iterable $collection): array
+    {
+        $list = [];
+        foreach ($collection as $object) {
+            $list[] = FlexIdentifier::createFromObject($object);
+        }
+
+        return $list;
+    }
+}
diff --git a/system/src/Grav/Framework/Form/FormFlash.php b/system/src/Grav/Framework/Form/FormFlash.php
index e2ba826583..207015bb02 100644
--- a/system/src/Grav/Framework/Form/FormFlash.php
+++ b/system/src/Grav/Framework/Form/FormFlash.php
@@ -3,12 +3,13 @@
 /**
  * @package    Grav\Framework\Form
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Form;
 
+use Exception;
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
 use Grav\Common\User\Interfaces\UserInterface;
@@ -17,12 +18,21 @@
 use Psr\Http\Message\UploadedFileInterface;
 use RocketTheme\Toolbox\File\YamlFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RuntimeException;
+use function func_get_args;
+use function is_array;
 
+/**
+ * Class FormFlash
+ * @package Grav\Framework\Form
+ */
 class FormFlash implements FormFlashInterface
 {
     /** @var bool */
     protected $exists;
     /** @var string */
+    protected $id;
+    /** @var string */
     protected $sessionId;
     /** @var string */
     protected $uniqueId;
@@ -30,13 +40,13 @@ class FormFlash implements FormFlashInterface
     protected $formName;
     /** @var string */
     protected $url;
-    /** @var array */
+    /** @var array|null */
     protected $user;
     /** @var int */
     protected $createdTimestamp;
     /** @var int */
     protected $updatedTimestamp;
-    /** @var array */
+    /** @var array|null */
     protected $data;
     /** @var array */
     protected $files;
@@ -62,41 +72,80 @@ public function __construct($config)
                 'unique_id' => $args[1] ?? null,
                 'form_name' => $args[2] ?? null,
             ];
+            $config = array_filter($config, static function ($val) {
+                return $val !== null;
+            });
         }
 
-        $this->sessionId = $config['session_id'] ?? 'no-session';
+        $this->id = $config['id'] ?? '';
+        $this->sessionId = $config['session_id'] ?? '';
         $this->uniqueId = $config['unique_id'] ?? '';
 
+        $this->setUser($config['user'] ?? null);
+
         $folder = $config['folder'] ?? ($this->sessionId ? 'tmp://forms/' . $this->sessionId : '');
 
         /** @var UniformResourceLocator $locator */
         $locator = Grav::instance()['locator'];
 
         $this->folder = $folder && $locator->isStream($folder) ? $locator->findResource($folder, true, true) : $folder;
-        $file = $this->getTmpIndex();
-        $this->exists = $file->exists();
 
-        if ($this->exists) {
-            try {
-                $data = (array)$file->content();
-            } catch (\Exception $e) {
-                $data = [];
-            }
-            $this->formName = $content['form'] ?? $config['form_name'] ?? '';
+        $this->init($this->loadStoredForm(), $config);
+    }
+
+    /**
+     * @param array|null $data
+     * @param array $config
+     */
+    protected function init(?array $data, array $config): void
+    {
+        if (null === $data) {
+            $this->exists = false;
+            $this->formName = $config['form_name'] ?? '';
+            $this->url = '';
+            $this->createdTimestamp = $this->updatedTimestamp = time();
+            $this->files = [];
+        } else {
+            $this->exists = true;
+            $this->formName = $data['form'] ?? $config['form_name'] ?? '';
             $this->url = $data['url'] ?? '';
             $this->user = $data['user'] ?? null;
             $this->updatedTimestamp = $data['timestamps']['updated'] ?? time();
             $this->createdTimestamp = $data['timestamps']['created'] ?? $this->updatedTimestamp;
             $this->data = $data['data'] ?? null;
             $this->files = $data['files'] ?? [];
-        } else {
-            $this->formName = $config['form_name'] ?? '';
-            $this->url = '';
-            $this->createdTimestamp = $this->updatedTimestamp = time();
-            $this->files = [];
         }
     }
 
+    /**
+     * Load raw flex flash data from the filesystem.
+     *
+     * @return array|null
+     */
+    protected function loadStoredForm(): ?array
+    {
+        $file = $this->getTmpIndex();
+        $exists = $file && $file->exists();
+
+        $data = null;
+        if ($exists) {
+            try {
+                $data = (array)$file->content();
+            } catch (Exception $e) {
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return $this->id && $this->uniqueId ? $this->id . '/' . $this->uniqueId : '';
+    }
+
     /**
      * @inheritDoc
      */
@@ -114,6 +163,7 @@ public function getUniqueId(): string
     }
 
     /**
+     * @return string
      * @deprecated 1.6.11 Use '->getUniqueId()' method instead.
      */
     public function getUniqieId(): string
@@ -200,17 +250,19 @@ public function exists(): bool
     /**
      * @inheritDoc
      */
-    public function save(): self
+    public function save(bool $force = false)
     {
         if (!($this->folder && $this->uniqueId)) {
             return $this;
         }
 
-        if ($this->data || $this->files) {
+        if ($force || $this->data || $this->files) {
             // Only save if there is data or files to be saved.
             $file = $this->getTmpIndex();
-            $file->save($this->jsonSerialize());
-            $this->exists = true;
+            if ($file) {
+                $file->save($this->jsonSerialize());
+                $this->exists = true;
+            }
         } elseif ($this->exists) {
             // Delete empty form flash if it exists (it carries no information).
             return $this->delete();
@@ -222,7 +274,7 @@ public function save(): self
     /**
      * @inheritDoc
      */
-    public function delete(): self
+    public function delete()
     {
         if ($this->folder && $this->uniqueId) {
             $this->removeTmpDir();
@@ -273,6 +325,9 @@ public function addUploadedFile(UploadedFileInterface $upload, string $field = n
         $tmp_dir = $this->getTmpDir();
         $tmp_name = Utils::generateRandomString(12);
         $name = $upload->getClientFilename();
+        if (!$name) {
+            throw new RuntimeException('Uploaded file has no filename');
+        }
 
         // Prepare upload data for later save
         $data = [
@@ -290,19 +345,18 @@ public function addUploadedFile(UploadedFileInterface $upload, string $field = n
         return $name;
     }
 
-
     /**
      * @inheritDoc
      */
     public function addFile(string $filename, string $field, array $crop = null): bool
     {
         if (!file_exists($filename)) {
-            throw new \RuntimeException("File not found: {$filename}");
+            throw new RuntimeException("File not found: {$filename}");
         }
 
         // Prepare upload data for later save
         $data = [
-            'name' => basename($filename),
+            'name' => Utils::basename($filename),
             'type' => Utils::getMimeByLocalFile($filename),
             'size' => filesize($filename),
         ];
@@ -349,8 +403,8 @@ public function removeFile(string $name, string $field = null): bool
      */
     public function clearFiles()
     {
-        foreach ($this->files as $field => $files) {
-            foreach ($files as $name => $upload) {
+        foreach ($this->files as $files) {
+            foreach ($files as $upload) {
                 $this->removeTmpFile($upload['tmp_name'] ?? '');
             }
         }
@@ -365,6 +419,7 @@ public function jsonSerialize(): array
     {
         return [
             'form' => $this->formName,
+            'id' => $this->getId(),
             'unique_id' => $this->uniqueId,
             'url' => $this->url,
             'user' => $this->user,
@@ -437,12 +492,14 @@ public function getTmpDir(): string
     }
 
     /**
-     * @return YamlFile
+     * @return ?YamlFile
      */
-    protected function getTmpIndex(): YamlFile
+    protected function getTmpIndex(): ?YamlFile
     {
+        $tmpDir = $this->getTmpDir();
+
         // Do not use CompiledYamlFile as the file can change multiple times per second.
-        return YamlFile::instance($this->getTmpDir() . '/index.yaml');
+        return $tmpDir ? YamlFile::instance($tmpDir . '/index.yaml') : null;
     }
 
     /**
@@ -457,8 +514,17 @@ protected function removeTmpFile(string $name): void
         }
     }
 
+    /**
+     * @return void
+     */
     protected function removeTmpDir(): void
     {
+        // Make sure that index file cache gets always cleared.
+        $file = $this->getTmpIndex();
+        if ($file) {
+            $file->free();
+        }
+
         $tmpDir = $this->getTmpDir();
         if ($tmpDir && file_exists($tmpDir)) {
             Folder::delete($tmpDir);
@@ -466,15 +532,16 @@ protected function removeTmpDir(): void
     }
 
     /**
-     * @param string $field
+     * @param string|null $field
      * @param string $name
      * @param array $data
      * @param array|null $crop
+     * @return void
      */
     protected function addFileInternal(?string $field, string $name, array $data, array $crop = null): void
     {
         if (!($this->folder && $this->uniqueId)) {
-            throw new \RuntimeException('Cannot upload files: form flash folder not defined');
+            throw new RuntimeException('Cannot upload files: form flash folder not defined');
         }
 
         $field = $field ?: 'undefined';
diff --git a/system/src/Grav/Framework/Form/FormFlashFile.php b/system/src/Grav/Framework/Form/FormFlashFile.php
index 9183689b96..54047d1bc5 100644
--- a/system/src/Grav/Framework/Form/FormFlashFile.php
+++ b/system/src/Grav/Framework/Form/FormFlashFile.php
@@ -3,25 +3,51 @@
 /**
  * @package    Grav\Framework\Form
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Form;
 
+use Grav\Common\Security;
+use Grav\Common\Utils;
 use Grav\Framework\Psr7\Stream;
+use InvalidArgumentException;
+use JsonSerializable;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
+use RuntimeException;
+use function copy;
+use function fopen;
+use function is_string;
+use function sprintf;
 
-class FormFlashFile implements UploadedFileInterface, \JsonSerializable
+/**
+ * Class FormFlashFile
+ * @package Grav\Framework\Form
+ */
+class FormFlashFile implements UploadedFileInterface, JsonSerializable
 {
+    /** @var string */
+    private $id;
+    /** @var string */
     private $field;
+    /** @var bool */
     private $moved = false;
+    /** @var array */
     private $upload;
+    /** @var FormFlash */
     private $flash;
 
+    /**
+     * FormFlashFile constructor.
+     * @param string $field
+     * @param array $upload
+     * @param FormFlash $flash
+     */
     public function __construct(string $field, array $upload, FormFlash $flash)
     {
+        $this->id = $flash->getId() ?: $flash->getUniqueId();
         $this->field = $field;
         $this->upload = $upload;
         $this->flash = $flash;
@@ -43,54 +69,104 @@ public function getStream()
     {
         $this->validateActive();
 
-        $resource = \fopen($this->getTmpFile(), 'rb');
+        $tmpFile = $this->getTmpFile();
+        if (null === $tmpFile) {
+            throw new RuntimeException('No temporary file');
+        }
+
+        $resource = fopen($tmpFile, 'rb');
+        if (false === $resource) {
+            throw new RuntimeException('No temporary file');
+        }
 
         return Stream::create($resource);
     }
 
+    /**
+     * @param string $targetPath
+     * @return void
+     */
     public function moveTo($targetPath)
     {
         $this->validateActive();
 
-        if (!\is_string($targetPath) || empty($targetPath)) {
-            throw new \InvalidArgumentException('Invalid path provided for move operation; must be a non-empty string');
+        if (!is_string($targetPath) || empty($targetPath)) {
+            throw new InvalidArgumentException('Invalid path provided for move operation; must be a non-empty string');
+        }
+        $tmpFile = $this->getTmpFile();
+        if (null === $tmpFile) {
+            throw new RuntimeException('No temporary file');
         }
 
-        $this->moved = \copy($this->getTmpFile(), $targetPath);
+        $this->moved = copy($tmpFile, $targetPath);
 
         if (false === $this->moved) {
-            throw new \RuntimeException(\sprintf('Uploaded file could not be moved to %s', $targetPath));
+            throw new RuntimeException(sprintf('Uploaded file could not be moved to %s', $targetPath));
         }
 
-        $this->flash->removeFile($this->getClientFilename(), $this->field);
+        $filename = $this->getClientFilename();
+        if ($filename) {
+            $this->flash->removeFile($filename, $this->field);
+        }
+    }
+
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getField(): string
+    {
+        return $this->field;
     }
 
+    /**
+     * @return int
+     */
     public function getSize()
     {
         return $this->upload['size'];
     }
 
+    /**
+     * @return int
+     */
     public function getError()
     {
         return $this->upload['error'] ?? \UPLOAD_ERR_OK;
     }
 
+    /**
+     * @return string
+     */
     public function getClientFilename()
     {
         return $this->upload['name'] ?? 'unknown';
     }
 
+    /**
+     * @return string
+     */
     public function getClientMediaType()
     {
         return $this->upload['type'] ?? 'application/octet-stream';
     }
 
-    public function isMoved() : bool
+    /**
+     * @return bool
+     */
+    public function isMoved(): bool
     {
         return $this->moved;
     }
 
-    public function getMetaData() : array
+    /**
+     * @return array
+     */
+    public function getMetaData(): array
     {
         if (isset($this->upload['crop'])) {
             return ['crop' => $this->upload['crop']];
@@ -99,17 +175,42 @@ public function getMetaData() : array
         return [];
     }
 
+    /**
+     * @return string
+     */
     public function getDestination()
     {
         return $this->upload['path'] ?? '';
     }
 
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->upload;
     }
 
-    public function getTmpFile() : ?string
+    /**
+     * @return void
+     */
+    public function checkXss(): void
+    {
+        $tmpFile = $this->getTmpFile();
+        $mime = $this->getClientMediaType();
+        if (Utils::contains($mime, 'svg', false)) {
+            $response = Security::detectXssFromSvgFile($tmpFile);
+            if ($response) {
+                throw new RuntimeException(sprintf('SVG file XSS check failed on %s', $response));
+            }
+        }
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getTmpFile(): ?string
     {
         $tmpName = $this->upload['tmp_name'] ?? null;
 
@@ -122,9 +223,14 @@ public function getTmpFile() : ?string
         return file_exists($tmpFile) ? $tmpFile : null;
     }
 
+    /**
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
     public function __debugInfo()
     {
         return [
+            'id:private' => $this->id,
             'field:private' => $this->field,
             'moved:private' => $this->moved,
             'upload:private' => $this->upload,
@@ -132,20 +238,21 @@ public function __debugInfo()
     }
 
     /**
-     * @throws \RuntimeException if is moved or not ok
+     * @return void
+     * @throws RuntimeException if is moved or not ok
      */
     private function validateActive(): void
     {
         if (!$this->isOk()) {
-            throw new \RuntimeException('Cannot retrieve stream due to upload error');
+            throw new RuntimeException('Cannot retrieve stream due to upload error');
         }
 
         if ($this->moved) {
-            throw new \RuntimeException('Cannot retrieve stream after it has already been moved');
+            throw new RuntimeException('Cannot retrieve stream after it has already been moved');
         }
 
         if (!$this->getTmpFile()) {
-            throw new \RuntimeException('Cannot retrieve stream as the file is missing');
+            throw new RuntimeException('Cannot retrieve stream as the file is missing');
         }
     }
 
diff --git a/system/src/Grav/Framework/Form/Interfaces/FormFactoryInterface.php b/system/src/Grav/Framework/Form/Interfaces/FormFactoryInterface.php
index fb57db19fc..6a85f668c7 100644
--- a/system/src/Grav/Framework/Form/Interfaces/FormFactoryInterface.php
+++ b/system/src/Grav/Framework/Form/Interfaces/FormFactoryInterface.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Form
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,6 +14,10 @@
 use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Page\Page;
 
+/**
+ * Interface FormFactoryInterface
+ * @package Grav\Framework\Form\Interfaces
+ */
 interface FormFactoryInterface
 {
     /**
diff --git a/system/src/Grav/Framework/Form/Interfaces/FormFlashInterface.php b/system/src/Grav/Framework/Form/Interfaces/FormFlashInterface.php
index 8eb85254d3..093006a751 100644
--- a/system/src/Grav/Framework/Form/Interfaces/FormFlashInterface.php
+++ b/system/src/Grav/Framework/Form/Interfaces/FormFlashInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Form
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,6 +11,10 @@
 
 use Psr\Http\Message\UploadedFileInterface;
 
+/**
+ * Interface FormFlashInterface
+ * @package Grav\Framework\Form\Interfaces
+ */
 interface FormFlashInterface extends \JsonSerializable
 {
     /**
@@ -18,6 +22,13 @@ interface FormFlashInterface extends \JsonSerializable
      */
     public function __construct($config);
 
+    /**
+     * Get unique form flash id if set.
+     *
+     * @return string
+     */
+    public function getId(): string;
+
     /**
      * Get session Id associated to this form instance.
      *
@@ -86,6 +97,7 @@ public function getData(): ?array;
      * Set raw form data.
      *
      * @param array|null $data
+     * @return void
      */
     public function setData(?array $data): void;
 
@@ -105,6 +117,8 @@ public function save();
 
     /**
      * Delete this form flash.
+     *
+     * @return $this
      */
     public function delete();
 
@@ -139,7 +153,7 @@ public function addUploadedFile(UploadedFileInterface $upload, string $field = n
      *
      * @param string $filename
      * @param string $field
-     * @param array $crop
+     * @param array|null $crop
      * @return bool
      */
     public function addFile(string $filename, string $field, array $crop = null): bool;
@@ -148,13 +162,15 @@ public function addFile(string $filename, string $field, array $crop = null): bo
      * Remove any file from form flash.
      *
      * @param string $name
-     * @param string $field
+     * @param string|null $field
      * @return bool
      */
     public function removeFile(string $name, string $field = null): bool;
 
     /**
      * Clear form flash from all uploaded files.
+     *
+     * @return void
      */
     public function clearFiles();
 
diff --git a/system/src/Grav/Framework/Form/Interfaces/FormInterface.php b/system/src/Grav/Framework/Form/Interfaces/FormInterface.php
index d218e72827..0edfc42a9d 100644
--- a/system/src/Grav/Framework/Form/Interfaces/FormInterface.php
+++ b/system/src/Grav/Framework/Form/Interfaces/FormInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Form
  *
- * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -122,6 +122,13 @@ public function getFiles(): array;
      */
     public function getValue(string $name);
 
+    /**
+     * Get form flash object.
+     *
+     * @return FormFlashInterface
+     */
+    public function getFlash();
+
     /**
      * @param ServerRequestInterface $request
      * @return $this
@@ -130,7 +137,7 @@ public function handleRequest(ServerRequestInterface $request): FormInterface;
 
     /**
      * @param array $data
-     * @param UploadedFileInterface[] $files
+     * @param UploadedFileInterface[]|null $files
      * @return $this
      */
     public function submit(array $data, array $files = null): FormInterface;
@@ -157,6 +164,8 @@ public function isSubmitted(): bool;
 
     /**
      * Reset form.
+     *
+     * @return void
      */
     public function reset(): void;
 
diff --git a/system/src/Grav/Framework/Form/Traits/FormTrait.php b/system/src/Grav/Framework/Form/Traits/FormTrait.php
index 31c4ff9204..a69ad1e923 100644
--- a/system/src/Grav/Framework/Form/Traits/FormTrait.php
+++ b/system/src/Grav/Framework/Form/Traits/FormTrait.php
@@ -3,28 +3,41 @@
 /**
  * @package    Grav\Framework\Form
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Form\Traits;
 
+use ArrayAccess;
+use Exception;
+use FilesystemIterator;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\Data;
 use Grav\Common\Data\ValidationException;
+use Grav\Common\Debugger;
 use Grav\Common\Form\FormFlash;
 use Grav\Common\Grav;
 use Grav\Common\Twig\Twig;
 use Grav\Common\User\Interfaces\UserInterface;
 use Grav\Common\Utils;
+use Grav\Framework\Compat\Serializable;
 use Grav\Framework\ContentBlock\HtmlBlock;
+use Grav\Framework\Form\FormFlashFile;
+use Grav\Framework\Form\Interfaces\FormFlashInterface;
 use Grav\Framework\Form\Interfaces\FormInterface;
 use Grav\Framework\Session\SessionInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UploadedFileInterface;
+use RuntimeException;
+use SplFileInfo;
 use Twig\Error\LoaderError;
 use Twig\Error\SyntaxError;
+use Twig\Template;
 use Twig\TemplateWrapper;
+use function in_array;
+use function is_array;
+use function is_object;
 
 /**
  * Trait FormTrait
@@ -32,9 +45,11 @@
  */
 trait FormTrait
 {
+    use Serializable;
+
     /** @var string */
     public $status = 'success';
-    /** @var string */
+    /** @var string|null */
     public $message;
     /** @var string[] */
     public $messages = [];
@@ -43,74 +58,142 @@ trait FormTrait
     private $name;
     /** @var string */
     private $id;
+    /** @var bool */
+    private $enabled = true;
     /** @var string */
     private $uniqueid;
+    /** @var string */
+    private $sessionid;
     /** @var bool */
     private $submitted;
-    /** @var Data|object|null */
+    /** @var ArrayAccess<string,mixed>|Data|null */
     private $data;
-    /** @var array|UploadedFileInterface[] */
-    private $files;
-    /** @var FormFlash|null */
+    /** @var UploadedFileInterface[] */
+    private $files = [];
+    /** @var FormFlashInterface|null */
     private $flash;
+    /** @var string */
+    private $flashFolder;
     /** @var Blueprint */
     private $blueprint;
 
+    /**
+     * @return string
+     */
     public function getId(): string
     {
         return $this->id;
     }
 
+    /**
+     * @param string $id
+     */
     public function setId(string $id): void
     {
         $this->id = $id;
     }
 
+    /**
+     * @return void
+     */
+    public function disable(): void
+    {
+        $this->enabled = false;
+    }
+
+    /**
+     * @return void
+     */
+    public function enable(): void
+    {
+        $this->enabled = true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isEnabled(): bool
+    {
+        return $this->enabled;
+    }
+
+    /**
+     * @return string
+     */
     public function getUniqueId(): string
     {
         return $this->uniqueid;
     }
 
+    /**
+     * @param string $uniqueId
+     * @return void
+     */
     public function setUniqueId(string $uniqueId): void
     {
         $this->uniqueid = $uniqueId;
     }
 
+    /**
+     * @return string
+     */
     public function getName(): string
     {
         return $this->name;
     }
 
+    /**
+     * @return string
+     */
     public function getFormName(): string
     {
         return $this->name;
     }
 
+    /**
+     * @return string
+     */
     public function getNonceName(): string
     {
         return 'form-nonce';
     }
 
+    /**
+     * @return string
+     */
     public function getNonceAction(): string
     {
         return 'form';
     }
 
+    /**
+     * @return string
+     */
     public function getNonce(): string
     {
         return Utils::getNonce($this->getNonceAction());
     }
 
+    /**
+     * @return string
+     */
     public function getAction(): string
     {
         return '';
     }
 
+    /**
+     * @return string
+     */
     public function getTask(): string
     {
         return $this->getBlueprint()->get('form/task') ?? '';
     }
 
+    /**
+     * @param string|null $name
+     * @return mixed
+     */
     public function getData(string $name = null)
     {
         return null !== $name ? $this->data[$name] : $this->data;
@@ -121,18 +204,26 @@ public function getData(string $name = null)
      */
     public function getFiles(): array
     {
-        return $this->files ?? [];
+        return $this->files;
     }
 
+    /**
+     * @param string $name
+     * @return mixed|null
+     */
     public function getValue(string $name)
     {
         return $this->data[$name] ?? null;
     }
 
+    /**
+     * @param string $name
+     * @return mixed|null
+     */
     public function getDefaultValue(string $name)
     {
-        $path = explode('.', $name) ?: [];
-        $offset = array_shift($path) ?? '';
+        $path = explode('.', $name);
+        $offset = array_shift($path);
 
         $current = $this->getDefaultValues();
 
@@ -145,9 +236,9 @@ public function getDefaultValue(string $name)
         while ($path) {
             $offset = array_shift($path);
 
-            if ((\is_array($current) || $current instanceof \ArrayAccess) && isset($current[$offset])) {
+            if ((is_array($current) || $current instanceof ArrayAccess) && isset($current[$offset])) {
                 $current = $current[$offset];
-            } elseif (\is_object($current) && isset($current->{$offset})) {
+            } elseif (is_object($current) && isset($current->{$offset})) {
                 $current = $current->{$offset};
             } else {
                 return null;
@@ -180,14 +271,17 @@ public function handleRequest(ServerRequestInterface $request): FormInterface
             /** @var Twig $twig */
             $twig = $grav['twig'];
             $twig->twig_vars['form'] = $this;
-
         }
 
         try {
             [$data, $files] = $this->parseRequest($request);
 
             $this->submit($data, $files);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
+            /** @var Debugger $debugger */
+            $debugger = $grav['debugger'];
+            $debugger->addException($e);
+
             $this->setError($e->getMessage());
         }
 
@@ -208,26 +302,41 @@ public function setRequest(ServerRequestInterface $request): FormInterface
         return $this;
     }
 
+    /**
+     * @return bool
+     */
     public function isValid(): bool
     {
         return $this->status === 'success';
     }
 
+    /**
+     * @return string|null
+     */
     public function getError(): ?string
     {
         return !$this->isValid() ? $this->message : null;
     }
 
+    /**
+     * @return array
+     */
     public function getErrors(): array
     {
         return !$this->isValid() ? $this->messages : [];
     }
 
+    /**
+     * @return bool
+     */
     public function isSubmitted(): bool
     {
         return $this->submitted;
     }
 
+    /**
+     * @return bool
+     */
     public function validate(): bool
     {
         if (!$this->isValid()) {
@@ -239,7 +348,11 @@ public function validate(): bool
             $this->validateUploads($this->getFiles());
         } catch (ValidationException $e) {
             $this->setErrors($e->getMessages());
-        }  catch (\Exception $e) {
+        } catch (Exception $e) {
+            /** @var Debugger $debugger */
+            $debugger = Grav::instance()['debugger'];
+            $debugger->addException($e);
+
             $this->setError($e->getMessage());
         }
 
@@ -250,14 +363,14 @@ public function validate(): bool
 
     /**
      * @param array $data
-     * @param UploadedFileInterface[] $files
+     * @param UploadedFileInterface[]|null $files
      * @return FormInterface|$this
      */
     public function submit(array $data, array $files = null): FormInterface
     {
         try {
             if ($this->isSubmitted()) {
-                throw new \RuntimeException('Form has already been submitted');
+                throw new RuntimeException('Form has already been submitted');
             }
 
             $this->data = new Data($data, $this->getBlueprint());
@@ -270,13 +383,20 @@ public function submit(array $data, array $files = null): FormInterface
             $this->doSubmit($this->data->toArray(), $this->files);
 
             $this->submitted = true;
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
+            /** @var Debugger $debugger */
+            $debugger = Grav::instance()['debugger'];
+            $debugger->addException($e);
+
             $this->setError($e->getMessage());
         }
 
         return $this;
     }
 
+    /**
+     * @return void
+     */
     public function reset(): void
     {
         // Make sure that the flash object gets deleted.
@@ -291,51 +411,41 @@ public function reset(): void
         $this->flash = null;
     }
 
+    /**
+     * @return array
+     */
     public function getFields(): array
     {
         return $this->getBlueprint()->fields();
     }
 
+    /**
+     * @return array
+     */
     public function getButtons(): array
     {
         return $this->getBlueprint()->get('form/buttons') ?? [];
     }
 
-    public function getTasks(): array
-    {
-        return $this->getBlueprint()->get('form/tasks') ?? [];
-    }
-
-    abstract public function getBlueprint(): Blueprint;
-
     /**
-     * Implements \Serializable::serialize().
-     *
-     * @return string
+     * @return array
      */
-    public function serialize(): string
+    public function getTasks(): array
     {
-        return serialize($this->doSerialize());
+        return $this->getBlueprint()->get('form/tasks') ?? [];
     }
 
     /**
-     * Implements \Serializable::unserialize().
-     *
-     * @param string $serialized
+     * @return Blueprint
      */
-    public function unserialize($serialized): void
-    {
-        $data = unserialize($serialized, ['allowed_classes' => false]);
-
-        $this->doUnserialize($data);
-    }
+    abstract public function getBlueprint(): Blueprint;
 
     /**
      * Get form flash object.
      *
-     * @return FormFlash
+     * @return FormFlashInterface
      */
-    public function getFlash(): FormFlash
+    public function getFlash()
     {
         if (null === $this->flash) {
             $grav = Grav::instance();
@@ -343,10 +453,10 @@ public function getFlash(): FormFlash
                 'session_id' => $this->getSessionId(),
                 'unique_id' => $this->getUniqueId(),
                 'form_name' => $this->getName(),
-                'folder' => $this->getFlashFolder()
+                'folder' => $this->getFlashFolder(),
+                'id' => $this->getFlashId()
             ];
 
-
             $this->flash = new FormFlash($config);
             $this->flash->setUrl($grav['uri']->url)->setUser($grav['user'] ?? null);
         }
@@ -357,7 +467,7 @@ public function getFlash(): FormFlash
     /**
      * Get all available form flash objects for this form.
      *
-     * @return FormFlash[]
+     * @return FormFlashInterface[]
      */
     public function getAllFlashes(): array
     {
@@ -369,14 +479,15 @@ public function getAllFlashes(): array
         $name = $this->getName();
 
         $list = [];
-        /** @var \SplFileInfo $file */
-        foreach (new \FilesystemIterator($folder) as $file) {
+        /** @var SplFileInfo $file */
+        foreach (new FilesystemIterator($folder) as $file) {
             $uniqueId = $file->getFilename();
             $config = [
                 'session_id' => $this->getSessionId(),
                 'unique_id' => $uniqueId,
                 'form_name' => $name,
-                'folder' => $this->getFlashFolder()
+                'folder' => $this->getFlashFolder(),
+                'id' => $this->getFlashId()
             ];
             $flash = new FormFlash($config);
             if ($flash->exists() && $flash->getFormName() === $name) {
@@ -385,7 +496,6 @@ public function getAllFlashes(): array
         }
 
         return $list;
-
     }
 
     /**
@@ -412,31 +522,79 @@ public function render(string $layout = null, array $context = [])
         return $block;
     }
 
+    /**
+     * @return array
+     */
+    public function jsonSerialize(): array
+    {
+        return $this->doSerialize();
+    }
+
+    /**
+     * @return array
+     */
+    final public function __serialize(): array
+    {
+        return $this->doSerialize();
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    final public function __unserialize(array $data): void
+    {
+        $this->doUnserialize($data);
+    }
+
     protected function getSessionId(): string
     {
-        /** @var Grav $grav */
-        $grav = Grav::instance();
+        if (null === $this->sessionid) {
+            /** @var Grav $grav */
+            $grav = Grav::instance();
 
-        /** @var SessionInterface $session */
-        $session = $grav['session'] ?? null;
+            /** @var SessionInterface|null $session */
+            $session = $grav['session'] ?? null;
+
+            $this->sessionid = $session ? ($session->getId() ?? '') : '';
+        }
 
-        return $session ? ($session->getId() ?? '') : '';
+        return $this->sessionid;
+    }
+
+    /**
+     * @param string $sessionId
+     * @return void
+     */
+    protected function setSessionId(string $sessionId): void
+    {
+        $this->sessionid = $sessionId;
     }
 
+    /**
+     * @return void
+     */
     protected function unsetFlash(): void
     {
         $this->flash = null;
     }
 
+    /**
+     * @return string|null
+     */
     protected function getFlashFolder(): ?string
     {
         $grav = Grav::instance();
 
-        /** @var UserInterface $user */
+        /** @var UserInterface|null $user */
         $user = $grav['user'] ?? null;
-        $userExists = $user && $user->exists();
-        $username = $userExists ? $user->username : null;
-        $mediaFolder = $userExists ? $user->getMediaFolder() : null;
+        if (null !== $user && $user->exists()) {
+            $username = $user->username;
+            $mediaFolder = $user->getMediaFolder();
+        } else {
+            $username = null;
+            $mediaFolder = null;
+        }
         $session = $grav['session'] ?? null;
         $sessionId = $session ? $session->getId() : null;
 
@@ -449,18 +607,62 @@ protected function getFlashFolder(): ?string
             '[ACCOUNT]' => $mediaFolder ?? '!!'
         ];
 
-        $flashFolder = $this->getBlueprint()->get('form/flash_folder', 'tmp://forms/[SESSIONID]');
+        $flashLookupFolder = $this->getFlashLookupFolder();
+
+        $path = str_replace(array_keys($dataMap), array_values($dataMap), $flashLookupFolder);
+
+        // Make sure we only return valid paths.
+        return strpos($path, '!!') === false ? rtrim($path, '/') : null;
+    }
+
+    /**
+     * @return string|null
+     */
+    protected function getFlashId(): ?string
+    {
+        // Fill template token keys/value pairs.
+        $dataMap = [
+            '[FORM_NAME]' => $this->getName(),
+            '[SESSIONID]' => 'session',
+            '[USERNAME]' => '!!',
+            '[USERNAME_OR_SESSIONID]' => '!!',
+            '[ACCOUNT]' => 'account'
+        ];
+
+        $flashLookupFolder = $this->getFlashLookupFolder();
 
-        $path = str_replace(array_keys($dataMap), array_values($dataMap), $flashFolder);
+        $path = str_replace(array_keys($dataMap), array_values($dataMap), $flashLookupFolder);
 
         // Make sure we only return valid paths.
         return strpos($path, '!!') === false ? rtrim($path, '/') : null;
     }
 
+    /**
+     * @return string
+     */
+    protected function getFlashLookupFolder(): string
+    {
+        if (null === $this->flashFolder) {
+            $this->flashFolder = $this->getBlueprint()->get('form/flash_folder') ?? 'tmp://forms/[SESSIONID]';
+        }
+
+        return $this->flashFolder;
+    }
+
+    /**
+     * @param string $folder
+     * @return void
+     */
+    protected function setFlashLookupFolder(string $folder): void
+    {
+        $this->flashFolder = $folder;
+    }
+
     /**
      * Set a single error.
      *
      * @param string $error
+     * @return void
      */
     protected function setError(string $error): void
     {
@@ -472,6 +674,7 @@ protected function setError(string $error): void
      * Set all errors.
      *
      * @param array $errors
+     * @return void
      */
     protected function setErrors(array $errors): void
     {
@@ -481,7 +684,7 @@ protected function setErrors(array $errors): void
 
     /**
      * @param string $layout
-     * @return TemplateWrapper
+     * @return Template|TemplateWrapper
      * @throws LoaderError
      * @throws SyntaxError
      */
@@ -509,11 +712,11 @@ protected function getTemplate($layout)
     protected function parseRequest(ServerRequestInterface $request): array
     {
         $method = $request->getMethod();
-        if (!\in_array($method, ['PUT', 'POST', 'PATCH'])) {
-            throw new \RuntimeException(sprintf('FlexForm: Bad HTTP method %s', $method));
+        if (!in_array($method, ['PUT', 'POST', 'PATCH'])) {
+            throw new RuntimeException(sprintf('FlexForm: Bad HTTP method %s', $method));
         }
 
-        $body = $request->getParsedBody();
+        $body = (array)$request->getParsedBody();
         $data = isset($body['data']) ? $this->decodeData($body['data']) : null;
 
         $flash = $this->getFlash();
@@ -532,27 +735,20 @@ protected function parseRequest(ServerRequestInterface $request): array
 
         return [
             $data,
-            $files ?? []
+            $files
         ];
     }
 
-    /**
-     * Form submit logic goes here.
-     *
-     * @param array $data
-     * @param array $files
-     * @return mixed
-     */
-    abstract protected function doSubmit(array $data, array $files);
-
     /**
      * Validate data and throw validation exceptions if validation fails.
      *
-     * @param \ArrayAccess $data
+     * @param ArrayAccess|Data|null $data
+     * @return void
      * @throws ValidationException
-     * @throws \Exception
+     * @phpstan-param ArrayAccess<string,mixed>|Data|null $data
+     * @throws Exception
      */
-    protected function validateData(\ArrayAccess $data): void
+    protected function validateData($data = null): void
     {
         if ($data instanceof Data) {
             $data->validate();
@@ -562,9 +758,11 @@ protected function validateData(\ArrayAccess $data): void
     /**
      * Filter validated data.
      *
-     * @param \ArrayAccess $data
+     * @param ArrayAccess|Data|null $data
+     * @return void
+     * @phpstan-param ArrayAccess<string,mixed>|Data|null $data
      */
-    protected function filterData(\ArrayAccess $data): void
+    protected function filterData($data = null): void
     {
         if ($data instanceof Data) {
             $data->filter();
@@ -575,6 +773,7 @@ protected function filterData(\ArrayAccess $data): void
      * Validate all uploaded files.
      *
      * @param array $files
+     * @return void
      */
     protected function validateUploads(array $files): void
     {
@@ -594,18 +793,22 @@ protected function validateUploads(array $files): void
      * Validate uploaded file.
      *
      * @param UploadedFileInterface $file
+     * @return void
      */
     protected function validateUpload(UploadedFileInterface $file): void
     {
         // Handle bad filenames.
         $filename = $file->getClientFilename();
-
-        if (!Utils::checkFilename($filename)) {
+        if ($filename && !Utils::checkFilename($filename)) {
             $grav = Grav::instance();
-            throw new \RuntimeException(
+            throw new RuntimeException(
                 sprintf($grav['language']->translate('PLUGIN_FORM.FILEUPLOAD_UNABLE_TO_UPLOAD', null, true), $filename, 'Bad filename')
             );
         }
+
+        if ($file instanceof FormFlashFile) {
+            $file->checkXss();
+        }
     }
 
     /**
@@ -616,13 +819,14 @@ protected function validateUpload(UploadedFileInterface $file): void
      */
     protected function decodeData($data): array
     {
-        if (!\is_array($data)) {
+        if (!is_array($data)) {
             return [];
         }
 
         // Decode JSON encoded fields and merge them to data.
         if (isset($data['_json'])) {
             $data = array_replace_recursive($data, $this->jsonDecode($data['_json']));
+
             unset($data['_json']);
         }
 
@@ -638,9 +842,9 @@ protected function decodeData($data): array
     protected function jsonDecode(array $data): array
     {
         foreach ($data as $key => &$value) {
-            if (\is_array($value)) {
+            if (is_array($value)) {
                 $value = $this->jsonDecode($value);
-            } elseif ($value === '') {
+            } elseif (trim($value) === '') {
                 unset($data[$key]);
             } else {
                 $value = json_decode($value, true);
@@ -676,6 +880,7 @@ protected function doSerialize(): array
 
     /**
      * @param array $data
+     * @return void
      */
     protected function doUnserialize(array $data): void
     {
diff --git a/system/src/Grav/Framework/Interfaces/RenderInterface.php b/system/src/Grav/Framework/Interfaces/RenderInterface.php
index ca6d9bca40..5bc6e58358 100644
--- a/system/src/Grav/Framework/Interfaces/RenderInterface.php
+++ b/system/src/Grav/Framework/Interfaces/RenderInterface.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Interfaces
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
diff --git a/system/src/Grav/Framework/Logger/Processors/UserProcessor.php b/system/src/Grav/Framework/Logger/Processors/UserProcessor.php
new file mode 100644
index 0000000000..f0ebef10cd
--- /dev/null
+++ b/system/src/Grav/Framework/Logger/Processors/UserProcessor.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Logger
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Logger\Processors;
+
+use Grav\Common\Grav;
+use Grav\Common\User\Interfaces\UserInterface;
+use Monolog\Processor\ProcessorInterface;
+
+/**
+ * Adds username and email to log messages.
+ */
+class UserProcessor implements ProcessorInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function __invoke(array $record): array
+    {
+        /** @var UserInterface|null $user */
+        $user = Grav::instance()['user'] ?? null;
+        if ($user && $user->exists()) {
+            $record['extra']['user'] = ['username' => $user->username, 'email' => $user->email];
+        }
+
+        return $record;
+    }
+}
diff --git a/system/src/Grav/Framework/Media/Interfaces/MediaCollectionInterface.php b/system/src/Grav/Framework/Media/Interfaces/MediaCollectionInterface.php
index e834bc852c..2bac98f153 100644
--- a/system/src/Grav/Framework/Media/Interfaces/MediaCollectionInterface.php
+++ b/system/src/Grav/Framework/Media/Interfaces/MediaCollectionInterface.php
@@ -3,15 +3,21 @@
 /**
  * @package    Grav\Framework\Media
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Media\Interfaces;
 
+use ArrayAccess;
+use Countable;
+use Iterator;
+
 /**
  * Class implements media collection interface.
+ * @extends ArrayAccess<string,MediaObjectInterface>
+ * @extends Iterator<string,MediaObjectInterface>
  */
-interface MediaCollectionInterface extends \ArrayAccess, \Countable, \Iterator
+interface MediaCollectionInterface extends ArrayAccess, Countable, Iterator
 {
 }
diff --git a/system/src/Grav/Framework/Media/Interfaces/MediaInterface.php b/system/src/Grav/Framework/Media/Interfaces/MediaInterface.php
index b06817b3b1..8688ad1c39 100644
--- a/system/src/Grav/Framework/Media/Interfaces/MediaInterface.php
+++ b/system/src/Grav/Framework/Media/Interfaces/MediaInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Media
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
diff --git a/system/src/Grav/Framework/Media/Interfaces/MediaManipulationInterface.php b/system/src/Grav/Framework/Media/Interfaces/MediaManipulationInterface.php
index 0f609d2482..bca9a228d4 100644
--- a/system/src/Grav/Framework/Media/Interfaces/MediaManipulationInterface.php
+++ b/system/src/Grav/Framework/Media/Interfaces/MediaManipulationInterface.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Media
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -17,16 +17,17 @@
 /**
  * Interface MediaManipulationInterface
  * @package Grav\Framework\Media\Interfaces
+ * @deprecated 1.7 Not used currently
  */
 interface MediaManipulationInterface extends MediaInterface
 {
     /**
      * @param UploadedFileInterface $uploadedFile
      */
-    public function uploadMediaFile(UploadedFileInterface $uploadedFile) : void;
+    public function uploadMediaFile(UploadedFileInterface $uploadedFile): void;
 
     /**
      * @param string $filename
      */
-    public function deleteMediaFile(string $filename) : void;
+    public function deleteMediaFile(string $filename): void;
 }
diff --git a/system/src/Grav/Framework/Media/Interfaces/MediaObjectInterface.php b/system/src/Grav/Framework/Media/Interfaces/MediaObjectInterface.php
index 1fc46b7598..39a063f723 100644
--- a/system/src/Grav/Framework/Media/Interfaces/MediaObjectInterface.php
+++ b/system/src/Grav/Framework/Media/Interfaces/MediaObjectInterface.php
@@ -3,15 +3,45 @@
 /**
  * @package    Grav\Framework\Media
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Media\Interfaces;
 
+use Psr\Http\Message\UploadedFileInterface;
+
 /**
  * Class implements media object interface.
+ *
+ * @property UploadedFileInterface|null $uploaded_file
  */
 interface MediaObjectInterface
 {
+    /**
+     * Returns an array containing the file metadata
+     *
+     * @return array
+     */
+    public function getMeta();
+
+    /**
+     * Return URL to file.
+     *
+     * @param bool $reset
+     * @return string
+     */
+    public function url($reset = true);
+
+    /**
+     * Get value by using dot notation for nested arrays/objects.
+     *
+     * @example $value = $this->get('this.is.my.nested.variable');
+     *
+     * @param string $name Dot separated path to the requested value.
+     * @param mixed $default Default value (or null).
+     * @param string|null $separator Separator, defaults to '.'
+     * @return mixed Value.
+     */
+    public function get($name, $default = null, $separator = null);
 }
diff --git a/system/src/Grav/Framework/Media/MediaIdentifier.php b/system/src/Grav/Framework/Media/MediaIdentifier.php
new file mode 100644
index 0000000000..986e997c70
--- /dev/null
+++ b/system/src/Grav/Framework/Media/MediaIdentifier.php
@@ -0,0 +1,150 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Media;
+
+use Grav\Common\Grav;
+use Grav\Common\User\Interfaces\UserInterface;
+use Grav\Framework\Contracts\Media\MediaObjectInterface;
+use Grav\Framework\Flex\Flex;
+use Grav\Framework\Flex\FlexFormFlash;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use Grav\Framework\Object\Identifiers\Identifier;
+
+/**
+ * Interface IdentifierInterface
+ *
+ * @template T of MediaObjectInterface
+ * @extends Identifier<T>
+ */
+class MediaIdentifier extends Identifier
+{
+    /** @var MediaObjectInterface|null */
+    private $object = null;
+
+    /**
+     * @param MediaObjectInterface $object
+     * @return MediaIdentifier<T>
+     */
+    public static function createFromObject(MediaObjectInterface $object): MediaIdentifier
+    {
+        $instance = new static($object->getId());
+        $instance->setObject($object);
+
+        return $instance;
+    }
+
+    /**
+     * @param string $id
+     */
+    public function __construct(string $id)
+    {
+        parent::__construct($id, 'media');
+    }
+
+    /**
+     * @return T
+     */
+    public function getObject(): ?MediaObjectInterface
+    {
+        if (!isset($this->object)) {
+            $type = $this->getType();
+            $id = $this->getId();
+
+            $parts = explode('/', $id);
+            if ($type === 'media' && str_starts_with($id, 'uploads/')) {
+                array_shift($parts);
+                [, $folder, $uniqueId, $field, $filename] = $this->findFlash($parts);
+
+                $flash = $this->getFlash($folder, $uniqueId);
+                if ($flash->exists()) {
+
+                    $uploadedFile = $flash->getFilesByField($field)[$filename] ?? null;
+
+                    $this->object = UploadedMediaObject::createFromFlash($flash, $field, $filename, $uploadedFile);
+                }
+            } else {
+                $type = array_shift($parts);
+                $key = array_shift($parts);
+                $field = array_shift($parts);
+                $filename = implode('/', $parts);
+
+                $flexObject = $this->getFlexObject($type, $key);
+                if ($flexObject && method_exists($flexObject, 'getMediaField') && method_exists($flexObject, 'getMedia')) {
+                    $media = $field !== 'media' ? $flexObject->getMediaField($field) : $flexObject->getMedia();
+                    $image = null;
+                    if ($media) {
+                        $image = $media[$filename];
+                    }
+
+                    $this->object = new MediaObject($field, $filename, $image, $flexObject);
+                }
+            }
+
+            if (!isset($this->object)) {
+                throw new \RuntimeException(sprintf('Object not found for identifier {type: "%s", id: "%s"}', $type, $id));
+            }
+        }
+
+        return $this->object;
+    }
+
+    /**
+     * @param T $object
+     */
+    public function setObject(MediaObjectInterface $object): void
+    {
+        $type = $this->getType();
+        $objectType = $object->getType();
+
+        if ($type !== $objectType) {
+            throw new \RuntimeException(sprintf('Object has to be type %s, %s given', $type, $objectType));
+        }
+
+        $this->object = $object;
+    }
+
+    protected function findFlash(array $parts): ?array
+    {
+        $type = array_shift($parts);
+        if ($type === 'account') {
+            /** @var UserInterface|null $user */
+            $user = Grav::instance()['user'] ?? null;
+            $folder = $user->getMediaFolder();
+        } else {
+            $folder = 'tmp://';
+        }
+
+        if (!$folder) {
+            return null;
+        }
+
+        do {
+            $part = array_shift($parts);
+            $folder .= "/{$part}";
+        } while (!str_starts_with($part, 'flex-'));
+
+        $uniqueId = array_shift($parts);
+        $field = array_shift($parts);
+        $filename = implode('/', $parts);
+
+        return [$type, $folder, $uniqueId, $field, $filename];
+    }
+
+    protected function getFlash(string $folder, string $uniqueId): FlexFormFlash
+    {
+        $config = [
+            'unique_id' => $uniqueId,
+            'folder' => $folder
+        ];
+
+        return new FlexFormFlash($config);
+    }
+
+    protected function getFlexObject(string $type, string $key): ?FlexObjectInterface
+    {
+        /** @var Flex $flex */
+        $flex = Grav::instance()['flex'];
+
+        return $flex->getObject($key, $type);
+    }
+}
diff --git a/system/src/Grav/Framework/Media/MediaObject.php b/system/src/Grav/Framework/Media/MediaObject.php
new file mode 100644
index 0000000000..8a438bf93a
--- /dev/null
+++ b/system/src/Grav/Framework/Media/MediaObject.php
@@ -0,0 +1,215 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Media;
+
+use Grav\Common\Page\Medium\ImageMedium;
+use Grav\Framework\Contracts\Media\MediaObjectInterface;
+use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
+use Grav\Framework\Media\Interfaces\MediaObjectInterface as GravMediaObjectInterface;
+use Grav\Framework\Psr7\Response;
+use Psr\Http\Message\ResponseInterface;
+use Throwable;
+
+/**
+ * Class MediaObject
+ */
+class MediaObject implements MediaObjectInterface
+{
+    /** @var string */
+    static public $placeholderImage = 'image://media/thumb.png';
+
+    /** @var FlexObjectInterface */
+    public $object;
+    /** @var GravMediaObjectInterface|null */
+    public $media;
+
+    /** @var string|null */
+    private $field;
+    /** @var string */
+    private $filename;
+
+    /**
+     * MediaObject constructor.
+     * @param string|null $field
+     * @param string $filename
+     * @param GravMediaObjectInterface|null $media
+     * @param FlexObjectInterface $object
+     */
+    public function __construct(?string $field, string $filename, ?GravMediaObjectInterface $media, FlexObjectInterface $object)
+    {
+        $this->field = $field;
+        $this->filename = $filename;
+        $this->media = $media;
+        $this->object = $object;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return 'media';
+    }
+
+    /**
+     * @return string
+     */
+    public function getId(): string
+    {
+        $field = $this->field;
+        $object = $this->object;
+        $path = $field ? "/{$field}/" : '/media/';
+
+        return $object->getType() . '/' . $object->getKey() . $path . basename($this->filename);
+    }
+
+    /**
+     * @return bool
+     */
+    public function exists(): bool
+    {
+        return $this->media !== null;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMeta(): array
+    {
+        if (!isset($this->media)) {
+            return [];
+        }
+
+        return $this->media->getMeta();
+    }
+
+    /**
+     * @param string $field
+     * @return mixed|null
+     */
+    public function get(string $field)
+    {
+        if (!isset($this->media)) {
+            return null;
+        }
+
+        return $this->media->get($field);
+    }
+
+    /**
+     * @return string
+     */
+    public function getUrl(): string
+    {
+        if (!isset($this->media)) {
+            return '';
+        }
+
+        return $this->media->url();
+    }
+
+    /**
+     * Create media response.
+     *
+     * @param array $actions
+     * @return Response
+     */
+    public function createResponse(array $actions): ResponseInterface
+    {
+        if (!isset($this->media)) {
+            return $this->create404Response($actions);
+        }
+
+        $media = $this->media;
+
+        if ($actions) {
+            $media = $this->processMediaActions($media, $actions);
+        }
+
+        // FIXME: This only works for images
+        if (!$media instanceof ImageMedium) {
+            throw new \RuntimeException('Not Implemented', 500);
+        }
+
+        $filename = $media->path(false);
+        $time = filemtime($filename);
+        $size = filesize($filename);
+        $body = fopen($filename, 'rb');
+        $headers = [
+            'Content-Type' => $media->get('mime'),
+            'Last-Modified' => gmdate('D, d M Y H:i:s', $time) . ' GMT',
+            'ETag' => sprintf('%x-%x', $size, $time)
+        ];
+
+        return new Response(200, $headers, $body);
+    }
+
+    /**
+     * Process media actions
+     *
+     * @param GravMediaObjectInterface $medium
+     * @param array $actions
+     * @return GravMediaObjectInterface
+     */
+    protected function processMediaActions(GravMediaObjectInterface $medium, array $actions): GravMediaObjectInterface
+    {
+        // loop through actions for the image and call them
+        foreach ($actions as $method => $params) {
+            $matches = [];
+
+            if (preg_match('/\[(.*)]/', $params, $matches)) {
+                $args = [explode(',', $matches[1])];
+            } else {
+                $args = explode(',', $params);
+            }
+
+            try {
+                $medium->{$method}(...$args);
+            } catch (Throwable $e) {
+                // Ignore all errors for now and just skip the action.
+            }
+        }
+
+        return $medium;
+    }
+
+    /**
+     * @param array $actions
+     * @return Response
+     */
+    protected function create404Response(array $actions): Response
+    {
+        // Display placeholder image.
+        $filename = static::$placeholderImage;
+
+        $time = filemtime($filename);
+        $size = filesize($filename);
+        $body = fopen($filename, 'rb');
+        $headers = [
+            'Content-Type' => 'image/svg',
+            'Last-Modified' => gmdate('D, d M Y H:i:s', $time) . ' GMT',
+            'ETag' => sprintf('%x-%x', $size, $time)
+        ];
+
+        return new Response(404, $headers, $body);
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize(): array
+    {
+        return [
+            'type' => $this->getType(),
+            'id' => $this->getId()
+        ];
+    }
+
+    /**
+     * @return string[]
+     */
+    public function __debugInfo(): array
+    {
+        return $this->jsonSerialize();
+    }
+}
diff --git a/system/src/Grav/Framework/Media/UploadedMediaObject.php b/system/src/Grav/Framework/Media/UploadedMediaObject.php
new file mode 100644
index 0000000000..0fe12e1cc0
--- /dev/null
+++ b/system/src/Grav/Framework/Media/UploadedMediaObject.php
@@ -0,0 +1,172 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Media;
+
+use Grav\Framework\Contracts\Media\MediaObjectInterface;
+use Grav\Framework\Flex\FlexFormFlash;
+use Grav\Framework\Form\Interfaces\FormFlashInterface;
+use Grav\Framework\Psr7\Response;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UploadedFileInterface;
+
+/**
+ * Class UploadedMediaObject
+ */
+class UploadedMediaObject implements MediaObjectInterface
+{
+    /** @var string */
+    static public $placeholderImage = 'image://media/thumb.png';
+
+    /** @var FormFlashInterface */
+    public $object;
+
+    /** @var string */
+    private $id;
+    /** @var string|null */
+    private $field;
+    /** @var string */
+    private $filename;
+    /** @var array */
+    private $meta;
+    /** @var UploadedFileInterface|null */
+    private $uploadedFile;
+
+    /**
+     * @param FlexFormFlash $flash
+     * @param string|null $field
+     * @param string $filename
+     * @param UploadedFileInterface|null $uploadedFile
+     * @return static
+     */
+    public static function createFromFlash(FlexFormFlash $flash, ?string $field, string $filename, ?UploadedFileInterface $uploadedFile = null)
+    {
+        $id = $flash->getId();
+
+        return new static($id, $field, $filename, $uploadedFile);
+    }
+
+    /**
+     * @param string $id
+     * @param string|null $field
+     * @param string $filename
+     * @param UploadedFileInterface|null $uploadedFile
+     */
+    public function __construct(string $id, ?string $field, string $filename, ?UploadedFileInterface $uploadedFile = null)
+    {
+        $this->id = $id;
+        $this->field = $field;
+        $this->filename = $filename;
+        $this->uploadedFile = $uploadedFile;
+        if ($uploadedFile) {
+            $this->meta = [
+                'filename' => $uploadedFile->getClientFilename(),
+                'mime' => $uploadedFile->getClientMediaType(),
+                'size' => $uploadedFile->getSize()
+            ];
+        } else {
+            $this->meta = [];
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return 'media';
+    }
+
+    /**
+     * @return string
+     */
+    public function getId(): string
+    {
+        $id = $this->id;
+        $field = $this->field;
+        $path = $field ? "/{$field}/" : '';
+
+        return 'uploads/' . $id . $path . basename($this->filename);
+    }
+
+    /**
+     * @return bool
+     */
+    public function exists(): bool
+    {
+        //return $this->uploadedFile !== null;
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMeta(): array
+    {
+        return $this->meta;
+    }
+
+    /**
+     * @param string $field
+     * @return mixed|null
+     */
+    public function get(string $field)
+    {
+        return $this->meta[$field] ?? null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUrl(): string
+    {
+        return '';
+    }
+
+    /**
+     * @return UploadedFileInterface|null
+     */
+    public function getUploadedFile(): ?UploadedFileInterface
+    {
+        return $this->uploadedFile;
+    }
+
+    /**
+     * @param array $actions
+     * @return Response
+     */
+    public function createResponse(array $actions): ResponseInterface
+    {
+        // Display placeholder image.
+        $filename = static::$placeholderImage;
+
+        $time = filemtime($filename);
+        $size = filesize($filename);
+        $body = fopen($filename, 'rb');
+        $headers = [
+            'Content-Type' => 'image/svg',
+            'Last-Modified' => gmdate('D, d M Y H:i:s', $time) . ' GMT',
+            'ETag' => sprintf('%x-%x', $size, $time)
+        ];
+
+        return new Response(404, $headers, $body);
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize(): array
+    {
+        return [
+            'type' => $this->getType(),
+            'id' => $this->getId()
+        ];
+    }
+
+    /**
+     * @return string[]
+     */
+    public function __debugInfo(): array
+    {
+        return $this->jsonSerialize();
+    }
+}
diff --git a/system/src/Grav/Framework/Mime/MimeTypes.php b/system/src/Grav/Framework/Mime/MimeTypes.php
new file mode 100644
index 0000000000..e3a5ea8ca1
--- /dev/null
+++ b/system/src/Grav/Framework/Mime/MimeTypes.php
@@ -0,0 +1,107 @@
+<?php declare(strict_types=1);
+
+/**
+ * @package    Grav\Framework\Mime
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Mime;
+
+use function in_array;
+
+/**
+ * Class to handle mime-types.
+ */
+class MimeTypes
+{
+    /** @var array */
+    protected $extensions;
+    /** @var array */
+    protected $mimes;
+
+    /**
+     * Create a new mime types instance with the given mappings.
+     *
+     * @param array $mimes An associative array containing ['ext' => ['mime/type', 'mime/type2']]
+     */
+    public static function createFromMimes(array $mimes): self
+    {
+        $extensions = [];
+        foreach ($mimes as $ext => $list) {
+            foreach ($list as $mime) {
+                $list = $extensions[$mime] ?? [];
+                if (!in_array($ext, $list, true)) {
+                    $list[] = $ext;
+                    $extensions[$mime] = $list;
+                }
+            }
+        }
+
+        return new static($extensions, $mimes);
+    }
+
+    /**
+     * @param string $extension
+     * @return string|null
+     */
+    public function getMimeType(string $extension): ?string
+    {
+        $extension = $this->cleanInput($extension);
+
+        return $this->mimes[$extension][0] ?? null;
+    }
+
+    /**
+     * @param string $mime
+     * @return string|null
+     */
+    public function getExtension(string $mime): ?string
+    {
+        $mime = $this->cleanInput($mime);
+
+        return $this->extensions[$mime][0] ?? null;
+    }
+
+    /**
+     * @param string $extension
+     * @return array
+     */
+    public function getMimeTypes(string $extension): array
+    {
+        $extension = $this->cleanInput($extension);
+
+        return $this->mimes[$extension] ?? [];
+    }
+
+    /**
+     * @param string $mime
+     * @return array
+     */
+    public function getExtensions(string $mime): array
+    {
+        $mime = $this->cleanInput($mime);
+
+        return $this->extensions[$mime] ?? [];
+    }
+
+    /**
+     * @param string $input
+     * @return string
+     */
+    protected function cleanInput(string $input): string
+    {
+        return strtolower(trim($input));
+    }
+
+    /**
+     * @param array $extensions
+     * @param array $mimes
+     */
+    protected function __construct(array $extensions, array $mimes)
+    {
+        $this->extensions = $extensions;
+        $this->mimes = $mimes;
+    }
+}
diff --git a/system/src/Grav/Framework/Object/Access/ArrayAccessTrait.php b/system/src/Grav/Framework/Object/Access/ArrayAccessTrait.php
index 1d438495c7..4b67599fb5 100644
--- a/system/src/Grav/Framework/Object/Access/ArrayAccessTrait.php
+++ b/system/src/Grav/Framework/Object/Access/ArrayAccessTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -21,6 +21,7 @@ trait ArrayAccessTrait
      * @param mixed $offset  An offset to check for.
      * @return bool          Returns TRUE on success or FALSE on failure.
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return $this->hasProperty($offset);
@@ -32,6 +33,7 @@ public function offsetExists($offset)
      * @param mixed $offset  The offset to retrieve.
      * @return mixed         Can return all value types.
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->getProperty($offset);
@@ -42,7 +44,9 @@ public function offsetGet($offset)
      *
      * @param mixed $offset  The offset to assign the value to.
      * @param mixed $value   The value to set.
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->setProperty($offset, $value);
@@ -52,14 +56,11 @@ public function offsetSet($offset, $value)
      * Unsets an offset.
      *
      * @param mixed $offset  The offset to unset.
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         $this->unsetProperty($offset);
     }
-
-    abstract public function hasProperty($property);
-    abstract public function getProperty($property, $default = null);
-    abstract public function setProperty($property, $value);
-    abstract public function unsetProperty($property);
 }
diff --git a/system/src/Grav/Framework/Object/Access/NestedArrayAccessTrait.php b/system/src/Grav/Framework/Object/Access/NestedArrayAccessTrait.php
index 858b391ec4..d9acb104f1 100644
--- a/system/src/Grav/Framework/Object/Access/NestedArrayAccessTrait.php
+++ b/system/src/Grav/Framework/Object/Access/NestedArrayAccessTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -21,6 +21,7 @@ trait NestedArrayAccessTrait
      * @param mixed $offset  An offset to check for.
      * @return bool          Returns TRUE on success or FALSE on failure.
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return $this->hasNestedProperty($offset);
@@ -32,6 +33,7 @@ public function offsetExists($offset)
      * @param mixed $offset  The offset to retrieve.
      * @return mixed         Can return all value types.
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->getNestedProperty($offset);
@@ -42,7 +44,9 @@ public function offsetGet($offset)
      *
      * @param mixed $offset  The offset to assign the value to.
      * @param mixed $value   The value to set.
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->setNestedProperty($offset, $value);
@@ -52,14 +56,11 @@ public function offsetSet($offset, $value)
      * Unsets an offset.
      *
      * @param mixed $offset  The offset to unset.
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         $this->unsetNestedProperty($offset);
     }
-
-    abstract public function hasNestedProperty($property, $separator = null);
-    abstract public function getNestedProperty($property, $default = null, $separator = null);
-    abstract public function setNestedProperty($property, $value, $separator = null);
-    abstract public function unsetNestedProperty($property, $separator = null);
 }
diff --git a/system/src/Grav/Framework/Object/Access/NestedPropertyCollectionTrait.php b/system/src/Grav/Framework/Object/Access/NestedPropertyCollectionTrait.php
index 5ac0390004..561b6fec31 100644
--- a/system/src/Grav/Framework/Object/Access/NestedPropertyCollectionTrait.php
+++ b/system/src/Grav/Framework/Object/Access/NestedPropertyCollectionTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -19,7 +19,7 @@ trait NestedPropertyCollectionTrait
 {
     /**
      * @param string $property      Object property to be matched.
-     * @param string $separator     Separator, defaults to '.'
+     * @param string|null $separator     Separator, defaults to '.'
      * @return array                Key/Value pairs of the properties.
      */
     public function hasNestedProperty($property, $separator = null)
@@ -37,7 +37,7 @@ public function hasNestedProperty($property, $separator = null)
     /**
      * @param string $property      Object property to be fetched.
      * @param mixed $default        Default value if not set.
-     * @param string $separator     Separator, defaults to '.'
+     * @param string|null $separator     Separator, defaults to '.'
      * @return array                Key/Value pairs of the properties.
      */
     public function getNestedProperty($property, $default = null, $separator = null)
@@ -54,8 +54,8 @@ public function getNestedProperty($property, $default = null, $separator = null)
 
     /**
      * @param string $property      Object property to be updated.
-     * @param string $value         New value.
-     * @param string $separator     Separator, defaults to '.'
+     * @param mixed  $value         New value.
+     * @param string|null $separator     Separator, defaults to '.'
      * @return $this
      */
     public function setNestedProperty($property, $value, $separator = null)
@@ -70,7 +70,7 @@ public function setNestedProperty($property, $value, $separator = null)
 
     /**
      * @param string $property      Object property to be updated.
-     * @param string $separator     Separator, defaults to '.'
+     * @param string|null $separator     Separator, defaults to '.'
      * @return $this
      */
     public function unsetNestedProperty($property, $separator = null)
@@ -86,7 +86,7 @@ public function unsetNestedProperty($property, $separator = null)
     /**
      * @param string $property      Object property to be updated.
      * @param string $default       Default value.
-     * @param string $separator     Separator, defaults to '.'
+     * @param string|null $separator     Separator, defaults to '.'
      * @return $this
      */
     public function defNestedProperty($property, $default, $separator = null)
@@ -103,7 +103,7 @@ public function defNestedProperty($property, $default, $separator = null)
      * Group items in the collection by a field.
      *
      * @param string $property      Object property to be used to make groups.
-     * @param string $separator     Separator, defaults to '.'
+     * @param string|null $separator     Separator, defaults to '.'
      * @return array
      */
     public function group($property, $separator = null)
@@ -117,9 +117,4 @@ public function group($property, $separator = null)
 
         return $list;
     }
-
-    /**
-     * @return \Traversable
-     */
-    abstract public function getIterator();
 }
diff --git a/system/src/Grav/Framework/Object/Access/NestedPropertyTrait.php b/system/src/Grav/Framework/Object/Access/NestedPropertyTrait.php
index 22008714b6..64107e0d39 100644
--- a/system/src/Grav/Framework/Object/Access/NestedPropertyTrait.php
+++ b/system/src/Grav/Framework/Object/Access/NestedPropertyTrait.php
@@ -3,13 +3,17 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object\Access;
 
 use Grav\Framework\Object\Interfaces\ObjectInterface;
+use RuntimeException;
+use stdClass;
+use function is_array;
+use function is_object;
 
 /**
  * Nested Property Object Trait
@@ -19,27 +23,27 @@ trait NestedPropertyTrait
 {
     /**
      * @param string $property      Object property name.
-     * @param string $separator     Separator, defaults to '.'
+     * @param string|null $separator     Separator, defaults to '.'
      * @return bool                 True if property has been defined (can be null).
      */
     public function hasNestedProperty($property, $separator = null)
     {
-        $test = new \stdClass;
+        $test = new stdClass;
 
         return $this->getNestedProperty($property, $test, $separator) !== $test;
     }
 
     /**
      * @param string $property      Object property to be fetched.
-     * @param mixed $default        Default value if property has not been set.
-     * @param string $separator     Separator, defaults to '.'
+     * @param mixed|null $default    Default value if property has not been set.
+     * @param string|null $separator Separator, defaults to '.'
      * @return mixed                Property value.
      */
     public function getNestedProperty($property, $default = null, $separator = null)
     {
         $separator = $separator ?: '.';
-        $path = explode($separator, $property) ?: [];
-        $offset = array_shift($path) ?? '';
+        $path = explode($separator, $property);
+        $offset = array_shift($path);
 
         if (!$this->hasProperty($offset)) {
             return $default;
@@ -58,9 +62,9 @@ public function getNestedProperty($property, $default = null, $separator = null)
 
             $offset = array_shift($path);
 
-            if ((\is_array($current) || is_a($current, 'ArrayAccess')) && isset($current[$offset])) {
+            if ((is_array($current) || is_a($current, 'ArrayAccess')) && isset($current[$offset])) {
                 $current = $current[$offset];
-            } elseif (\is_object($current) && isset($current->{$offset})) {
+            } elseif (is_object($current) && isset($current->{$offset})) {
                 $current = $current->{$offset};
             } else {
                 return $default;
@@ -73,16 +77,16 @@ public function getNestedProperty($property, $default = null, $separator = null)
 
     /**
      * @param string $property      Object property to be updated.
-     * @param string $value         New value.
-     * @param string $separator     Separator, defaults to '.'
+     * @param mixed  $value         New value.
+     * @param string|null $separator     Separator, defaults to '.'
      * @return $this
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function setNestedProperty($property, $value, $separator = null)
     {
         $separator = $separator ?: '.';
-        $path = explode($separator, $property) ?: [];
-        $offset = array_shift($path) ?? '';
+        $path = explode($separator, $property);
+        $offset = array_shift($path);
 
         if (!$path) {
             $this->setProperty($offset, $value);
@@ -98,12 +102,12 @@ public function setNestedProperty($property, $value, $separator = null)
             // Handle arrays and scalars.
             if ($current === null) {
                 $current = [$offset => []];
-            } elseif (\is_array($current)) {
+            } elseif (is_array($current)) {
                 if (!isset($current[$offset])) {
                     $current[$offset] = [];
                 }
             } else {
-                throw new \RuntimeException("Cannot set nested property {$property} on non-array value");
+                throw new RuntimeException("Cannot set nested property {$property} on non-array value");
             }
 
             $current = &$current[$offset];
@@ -116,15 +120,15 @@ public function setNestedProperty($property, $value, $separator = null)
 
     /**
      * @param string $property      Object property to be updated.
-     * @param string $separator     Separator, defaults to '.'
+     * @param string|null $separator     Separator, defaults to '.'
      * @return $this
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function unsetNestedProperty($property, $separator = null)
     {
         $separator = $separator ?: '.';
-        $path = explode($separator, $property) ?: [];
-        $offset = array_shift($path) ?? '';
+        $path = explode($separator, $property);
+        $offset = array_shift($path);
 
         if (!$path) {
             $this->unsetProperty($offset);
@@ -142,12 +146,12 @@ public function unsetNestedProperty($property, $separator = null)
             if ($current === null) {
                 return $this;
             }
-            if (\is_array($current)) {
+            if (is_array($current)) {
                 if (!isset($current[$offset])) {
                     return $this;
                 }
             } else {
-                throw new \RuntimeException("Cannot unset nested property {$property} on non-array value");
+                throw new RuntimeException("Cannot unset nested property {$property} on non-array value");
             }
 
             $current = &$current[$offset];
@@ -161,9 +165,9 @@ public function unsetNestedProperty($property, $separator = null)
     /**
      * @param string $property      Object property to be updated.
      * @param mixed  $default       Default value.
-     * @param string $separator     Separator, defaults to '.'
+     * @param string|null $separator     Separator, defaults to '.'
      * @return $this
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function defNestedProperty($property, $default, $separator = null)
     {
@@ -173,11 +177,4 @@ public function defNestedProperty($property, $default, $separator = null)
 
         return $this;
     }
-
-
-    abstract public function hasProperty($property);
-    abstract public function getProperty($property, $default = null);
-    abstract public function setProperty($property, $value);
-    abstract public function unsetProperty($property);
-    abstract protected function &doGetProperty($property, $default = null, $doCreate = false);
 }
diff --git a/system/src/Grav/Framework/Object/Access/OverloadedPropertyTrait.php b/system/src/Grav/Framework/Object/Access/OverloadedPropertyTrait.php
index 029dbba5f0..f417fba028 100644
--- a/system/src/Grav/Framework/Object/Access/OverloadedPropertyTrait.php
+++ b/system/src/Grav/Framework/Object/Access/OverloadedPropertyTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -21,6 +21,7 @@ trait OverloadedPropertyTrait
      * @param mixed $offset  An offset to check for.
      * @return bool          Returns TRUE on success or FALSE on failure.
      */
+    #[\ReturnTypeWillChange]
     public function __isset($offset)
     {
         return $this->hasProperty($offset);
@@ -32,6 +33,7 @@ public function __isset($offset)
      * @param mixed $offset  The offset to retrieve.
      * @return mixed         Can return all value types.
      */
+    #[\ReturnTypeWillChange]
     public function __get($offset)
     {
         return $this->getProperty($offset);
@@ -42,7 +44,9 @@ public function __get($offset)
      *
      * @param mixed $offset  The offset to assign the value to.
      * @param mixed $value   The value to set.
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function __set($offset, $value)
     {
         $this->setProperty($offset, $value);
@@ -52,14 +56,11 @@ public function __set($offset, $value)
      * Magic method to unset the attribute
      *
      * @param mixed $offset The name value to unset
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function __unset($offset)
     {
         $this->unsetProperty($offset);
     }
-
-    abstract public function hasProperty($property);
-    abstract public function getProperty($property, $default = null);
-    abstract public function setProperty($property, $value);
-    abstract public function unsetProperty($property);
 }
diff --git a/system/src/Grav/Framework/Object/ArrayObject.php b/system/src/Grav/Framework/Object/ArrayObject.php
index a7062e84b2..a38864c890 100644
--- a/system/src/Grav/Framework/Object/ArrayObject.php
+++ b/system/src/Grav/Framework/Object/ArrayObject.php
@@ -3,12 +3,13 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object;
 
+use ArrayAccess;
 use Grav\Framework\Object\Access\NestedArrayAccessTrait;
 use Grav\Framework\Object\Access\NestedPropertyTrait;
 use Grav\Framework\Object\Access\OverloadedPropertyTrait;
@@ -18,8 +19,9 @@
 
 /**
  * Array Objects keep the data in private array property.
+ * @implements ArrayAccess<string,mixed>
  */
-class ArrayObject implements NestedObjectInterface, \ArrayAccess
+class ArrayObject implements NestedObjectInterface, ArrayAccess
 {
     use ObjectTrait;
     use ArrayPropertyTrait;
diff --git a/system/src/Grav/Framework/Object/Base/ObjectCollectionTrait.php b/system/src/Grav/Framework/Object/Base/ObjectCollectionTrait.php
index 7e71d91993..e29370add8 100644
--- a/system/src/Grav/Framework/Object/Base/ObjectCollectionTrait.php
+++ b/system/src/Grav/Framework/Object/Base/ObjectCollectionTrait.php
@@ -3,41 +3,234 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object\Base;
 
+use Grav\Framework\Compat\Serializable;
 use Grav\Framework\Object\Interfaces\ObjectInterface;
+use InvalidArgumentException;
+use function call_user_func_array;
+use function get_class;
+use function is_callable;
+use function is_object;
 
 /**
  * ObjectCollection Trait
  * @package Grav\Framework\Object
+ *
+ * @template TKey as array-key
+ * @template T as ObjectInterface
  */
 trait ObjectCollectionTrait
 {
-    use ObjectTrait {
-        setKey as public;
+    use Serializable;
+
+    /** @var string */
+    protected static $type;
+
+    /** @var string */
+    private $_key;
+
+    /**
+     * @return string
+     */
+    protected function getTypePrefix()
+    {
+        return '';
+    }
+
+    /**
+     * @param bool $prefix
+     * @return string
+     */
+    public function getType($prefix = true)
+    {
+        $type = $prefix ? $this->getTypePrefix() : '';
+
+        if (static::$type) {
+            return $type . static::$type;
+        }
+
+        $class = get_class($this);
+
+        return $type . strtolower(substr($class, strrpos($class, '\\') + 1));
+    }
+
+    /**
+     * @return string
+     */
+    public function getKey()
+    {
+        return $this->_key ?: $this->getType() . '@@' . spl_object_hash($this);
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasKey()
+    {
+        return !empty($this->_key);
+    }
+
+    /**
+     * @param string $property      Object property name.
+     * @return bool[]               True if property has been defined (can be null).
+     */
+    public function hasProperty($property)
+    {
+        return $this->doHasProperty($property);
+    }
+
+    /**
+     * @param string $property      Object property to be fetched.
+     * @param mixed $default        Default value if property has not been set.
+     * @return mixed[]              Property values.
+     */
+    public function getProperty($property, $default = null)
+    {
+        return $this->doGetProperty($property, $default);
+    }
+
+    /**
+     * @param string $property      Object property to be updated.
+     * @param mixed  $value         New value.
+     * @return $this
+     */
+    public function setProperty($property, $value)
+    {
+        $this->doSetProperty($property, $value);
+
+        return $this;
+    }
+
+    /**
+     * @param string  $property     Object property to be unset.
+     * @return $this
+     */
+    public function unsetProperty($property)
+    {
+        $this->doUnsetProperty($property);
+
+        return $this;
+    }
+
+    /**
+     * @param string  $property     Object property to be defined.
+     * @param mixed   $default      Default value.
+     * @return $this
+     */
+    public function defProperty($property, $default)
+    {
+        if (!$this->hasProperty($property)) {
+            $this->setProperty($property, $default);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    final public function __serialize(): array
+    {
+        return $this->doSerialize();
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    final public function __unserialize(array $data): void
+    {
+        if (method_exists($this, 'initObjectProperties')) {
+            $this->initObjectProperties();
+        }
+
+        $this->doUnserialize($data);
+    }
+
+
+    /**
+     * @return array
+     */
+    protected function doSerialize()
+    {
+        return [
+            'key' => $this->getKey(),
+            'type' => $this->getType(),
+            'elements' => $this->getElements()
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    protected function doUnserialize(array $data)
+    {
+        if (!isset($data['key'], $data['type'], $data['elements']) || $data['type'] !== $this->getType()) {
+            throw new InvalidArgumentException("Cannot unserialize '{$this->getType()}': Bad data");
+        }
+
+        $this->setKey($data['key']);
+        $this->setElements($data['elements']);
+    }
+
+    /**
+     * Implements JsonSerializable interface.
+     *
+     * @return array
+     */
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
+    {
+        return $this->doSerialize();
+    }
+
+    /**
+     * Returns a string representation of this object.
+     *
+     * @return string
+     */
+    #[\ReturnTypeWillChange]
+    public function __toString()
+    {
+        return $this->getKey();
+    }
+
+    /**
+     * @param string $key
+     * @return $this
+     */
+    public function setKey($key)
+    {
+        $this->_key = (string) $key;
+
+        return $this;
     }
 
     /**
      * Create a copy from this collection by cloning all objects in the collection.
      *
-     * @return static
+     * @return static<TKey,T>
      */
     public function copy()
     {
         $list = [];
         foreach ($this->getIterator() as $key => $value) {
-            $list[$key] = \is_object($value) ? clone $value : $value;
+            /** @phpstan-ignore-next-line */
+            $list[$key] = is_object($value) ? clone $value : $value;
         }
 
+        /** @phpstan-var static<TKey,T> */
         return $this->createFrom($list);
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function getObjectKeys()
     {
@@ -54,7 +247,7 @@ public function doHasProperty($property)
 
         /** @var ObjectInterface $element */
         foreach ($this->getIterator() as $id => $element) {
-            $list[$id] = $element->hasProperty($property);
+            $list[$id] = (bool)$element->hasProperty($property);
         }
 
         return $list;
@@ -63,9 +256,10 @@ public function doHasProperty($property)
     /**
      * @param string $property      Object property to be fetched.
      * @param mixed $default        Default value if not set.
+     * @param bool $doCreate        Not being used.
      * @return mixed[]              Key/Value pairs of the properties.
      */
-    public function doGetProperty($property, $default = null)
+    public function &doGetProperty($property, $default = null, $doCreate = false)
     {
         $list = [];
 
@@ -135,8 +329,8 @@ public function call($method, array $arguments = [])
          * @var ObjectInterface $element
          */
         foreach ($this->getIterator() as $id => $element) {
-            $callable = method_exists($element, $method) ? [$element, $method] : null;
-            $list[$id] = $callable ? \call_user_func_array($callable, $arguments) : null;
+            $callable = [$element, $method];
+            $list[$id] = is_callable($callable) ? call_user_func_array($callable, $arguments) : null;
         }
 
         return $list;
@@ -147,6 +341,7 @@ public function call($method, array $arguments = [])
      *
      * @param string $property
      * @return array
+     * @phpstan-return array<TKey,T>
      */
     public function group($property)
     {
@@ -165,11 +360,13 @@ public function group($property)
      *
      * @param string $property
      * @return static[]
+     * @phpstan-return array<static<TKey,T>>
      */
     public function collectionGroup($property)
     {
         $collections = [];
         foreach ($this->group($property) as $id => $elements) {
+            /** @phpstan-var static<TKey,T> $collection */
             $collection = $this->createFrom($elements);
 
             $collections[$id] = $collection;
@@ -177,9 +374,4 @@ public function collectionGroup($property)
 
         return $collections;
     }
-
-    /**
-     * @return \Traversable
-     */
-    abstract public function getIterator();
 }
diff --git a/system/src/Grav/Framework/Object/Base/ObjectTrait.php b/system/src/Grav/Framework/Object/Base/ObjectTrait.php
index baeeb2bb7d..86df8c783b 100644
--- a/system/src/Grav/Framework/Object/Base/ObjectTrait.php
+++ b/system/src/Grav/Framework/Object/Base/ObjectTrait.php
@@ -3,12 +3,16 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object\Base;
 
+use Grav\Framework\Compat\Serializable;
+use InvalidArgumentException;
+use function get_class;
+
 /**
  * Object trait.
  *
@@ -16,12 +20,12 @@
  */
 trait ObjectTrait
 {
+    use Serializable;
+
     /** @var string */
-    static protected $type;
+    protected static $type;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $_key;
 
     /**
@@ -44,7 +48,7 @@ public function getType($prefix = true)
             return $type . static::$type;
         }
 
-        $class = \get_class($this);
+        $class = get_class($this);
         return $type . strtolower(substr($class, strrpos($class, '\\') + 1));
     }
 
@@ -66,7 +70,7 @@ public function hasKey()
 
     /**
      * @param string $property      Object property name.
-     * @return bool|bool[]          True if property has been defined (can be null).
+     * @return bool                 True if property has been defined (can be null).
      */
     public function hasProperty($property)
     {
@@ -76,7 +80,7 @@ public function hasProperty($property)
     /**
      * @param string $property      Object property to be fetched.
      * @param mixed $default        Default value if property has not been set.
-     * @return mixed|mixed[]        Property value.
+     * @return mixed                Property value.
      */
     public function getProperty($property, $default = null)
     {
@@ -121,25 +125,23 @@ public function defProperty($property, $default)
     }
 
     /**
-     * Implements Serializable interface.
-     *
-     * @return string
+     * @return array
      */
-    public function serialize()
+    final public function __serialize(): array
     {
-        return serialize($this->doSerialize());
+        return $this->doSerialize();
     }
 
     /**
-     * @param string $serialized
+     * @param array $data
+     * @return void
      */
-    public function unserialize($serialized)
+    final public function __unserialize(array $data): void
     {
-        $data = unserialize($serialized);
-
         if (method_exists($this, 'initObjectProperties')) {
             $this->initObjectProperties();
         }
+
         $this->doUnserialize($data);
     }
 
@@ -153,11 +155,12 @@ protected function doSerialize()
 
     /**
      * @param array $serialized
+     * @return void
      */
     protected function doUnserialize(array $serialized)
     {
         if (!isset($serialized['key'], $serialized['type'], $serialized['elements']) || $serialized['type'] !== $this->getType()) {
-            throw new \InvalidArgumentException("Cannot unserialize '{$this->getType()}': Bad data");
+            throw new InvalidArgumentException("Cannot unserialize '{$this->getType()}': Bad data");
         }
 
         $this->setKey($serialized['key']);
@@ -169,6 +172,7 @@ protected function doUnserialize(array $serialized)
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->doSerialize();
@@ -179,6 +183,7 @@ public function jsonSerialize()
      *
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function __toString()
     {
         return $this->getKey();
@@ -194,11 +199,4 @@ protected function setKey($key)
 
         return $this;
     }
-
-    abstract protected function doHasProperty($property);
-    abstract protected function &doGetProperty($property, $default = null, $doCreate = false);
-    abstract protected function doSetProperty($property, $value);
-    abstract protected function doUnsetProperty($property);
-    abstract protected function getElements();
-    abstract protected function setElements(array $elements);
 }
diff --git a/system/src/Grav/Framework/Object/Collection/ObjectExpressionVisitor.php b/system/src/Grav/Framework/Object/Collection/ObjectExpressionVisitor.php
index 0eefb78a07..e8b12b7f42 100644
--- a/system/src/Grav/Framework/Object/Collection/ObjectExpressionVisitor.php
+++ b/system/src/Grav/Framework/Object/Collection/ObjectExpressionVisitor.php
@@ -3,15 +3,27 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object\Collection;
 
+use ArrayAccess;
+use Closure;
 use Doctrine\Common\Collections\Expr\ClosureExpressionVisitor;
 use Doctrine\Common\Collections\Expr\Comparison;
+use RuntimeException;
+use function in_array;
+use function is_array;
+use function is_callable;
+use function is_string;
+use function strlen;
 
+/**
+ * Class ObjectExpressionVisitor
+ * @package Grav\Framework\Object\Collection
+ */
 class ObjectExpressionVisitor extends ClosureExpressionVisitor
 {
     /**
@@ -19,7 +31,6 @@ class ObjectExpressionVisitor extends ClosureExpressionVisitor
      *
      * @param object $object
      * @param string $field
-     *
      * @return mixed
      */
     public static function getObjectFieldValue($object, $field)
@@ -28,11 +39,11 @@ public static function getObjectFieldValue($object, $field)
 
         $pos = strpos($field, '(');
         if (false !== $pos) {
-            list ($op, $field) = explode('(', $field, 2);
+            [$op, $field] = explode('(', $field, 2);
             $field = rtrim($field, ')');
         }
 
-        if (isset($object[$field])) {
+        if ($object instanceof ArrayAccess && isset($object[$field])) {
             $value = $object[$field];
         } else {
             $accessors = array('', 'get', 'is');
@@ -40,7 +51,7 @@ public static function getObjectFieldValue($object, $field)
             foreach ($accessors as $accessor) {
                 $accessor .= $field;
 
-                if (!method_exists($object, $accessor)) {
+                if (!is_callable([$object, $accessor])) {
                     continue;
                 }
 
@@ -59,31 +70,55 @@ public static function getObjectFieldValue($object, $field)
         return $value;
     }
 
+    /**
+     * @param string $str
+     * @return string
+     */
     public static function filterLower($str)
     {
         return mb_strtolower($str);
     }
 
+    /**
+     * @param string $str
+     * @return string
+     */
     public static function filterUpper($str)
     {
         return mb_strtoupper($str);
     }
 
+    /**
+     * @param string $str
+     * @return int
+     */
     public static function filterLength($str)
     {
         return mb_strlen($str);
     }
 
+    /**
+     * @param string $str
+     * @return string
+     */
     public static function filterLtrim($str)
     {
         return ltrim($str);
     }
 
+    /**
+     * @param string $str
+     * @return string
+     */
     public static function filterRtrim($str)
     {
         return rtrim($str);
     }
 
+    /**
+     * @param string $str
+     * @return string
+     */
     public static function filterTrim($str)
     {
         return trim($str);
@@ -92,16 +127,18 @@ public static function filterTrim($str)
     /**
      * Helper for sorting arrays of objects based on multiple fields + orientations.
      *
+     * Comparison between two strings is natural and case insensitive.
+     *
      * @param string   $name
      * @param int      $orientation
-     * @param \Closure $next
+     * @param Closure|null $next
      *
-     * @return \Closure
+     * @return Closure
      */
-    public static function sortByField($name, $orientation = 1, \Closure $next = null)
+    public static function sortByField($name, $orientation = 1, Closure $next = null)
     {
         if (!$next) {
-            $next = function($a, $b) {
+            $next = function ($a, $b) {
                 return 0;
             };
         }
@@ -114,6 +151,11 @@ public static function sortByField($name, $orientation = 1, \Closure $next = nul
                 return $next($a, $b);
             }
 
+            // For strings we use natural case insensitive sorting.
+            if (is_string($aValue) && is_string($bValue)) {
+                return strnatcasecmp($aValue, $bValue) * $orientation;
+            }
+
             return (($aValue > $bValue) ? 1 : -1) * $orientation;
         };
     }
@@ -159,12 +201,12 @@ public function walkComparison(Comparison $comparison)
 
             case Comparison::IN:
                 return function ($object) use ($field, $value) {
-                    return \in_array(static::getObjectFieldValue($object, $field), $value, true);
+                    return in_array(static::getObjectFieldValue($object, $field), $value, true);
                 };
 
             case Comparison::NIN:
                 return function ($object) use ($field, $value) {
-                    return !\in_array(static::getObjectFieldValue($object, $field), $value, true);
+                    return !in_array(static::getObjectFieldValue($object, $field), $value, true);
                 };
 
             case Comparison::CONTAINS:
@@ -175,10 +217,10 @@ public function walkComparison(Comparison $comparison)
             case Comparison::MEMBER_OF:
                 return function ($object) use ($field, $value) {
                     $fieldValues = static::getObjectFieldValue($object, $field);
-                    if (!\is_array($fieldValues)) {
+                    if (!is_array($fieldValues)) {
                         $fieldValues = iterator_to_array($fieldValues);
                     }
-                    return \in_array($value, $fieldValues, true);
+                    return in_array($value, $fieldValues, true);
                 };
 
             case Comparison::STARTS_WITH:
@@ -191,9 +233,8 @@ public function walkComparison(Comparison $comparison)
                     return $value === substr(static::getObjectFieldValue($object, $field), -strlen($value));
                 };
 
-
             default:
-                throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator());
+                throw new RuntimeException('Unknown comparison operator: ' . $comparison->getOperator());
         }
     }
 }
diff --git a/system/src/Grav/Framework/Object/Identifiers/Identifier.php b/system/src/Grav/Framework/Object/Identifiers/Identifier.php
new file mode 100644
index 0000000000..69f41d2b87
--- /dev/null
+++ b/system/src/Grav/Framework/Object/Identifiers/Identifier.php
@@ -0,0 +1,66 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Object\Identifiers;
+
+use Grav\Framework\Contracts\Object\IdentifierInterface;
+
+/**
+ * Interface IdentifierInterface
+ *
+ * @template T of object
+ */
+class Identifier implements IdentifierInterface
+{
+    /** @var string */
+    private $id;
+    /** @var string */
+    private $type;
+
+    /**
+     * IdentifierInterface constructor.
+     * @param string $id
+     * @param string $type
+     */
+    public function __construct(string $id, string $type)
+    {
+        $this->id = $id;
+        $this->type = $type;
+    }
+
+    /**
+     * @return string
+     * @phpstan-pure
+     */
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     * @phpstan-pure
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize(): array
+    {
+        return [
+            'type' => $this->type,
+            'id' => $this->id
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function __debugInfo(): array
+    {
+        return $this->jsonSerialize();
+    }
+}
diff --git a/system/src/Grav/Framework/Object/Interfaces/NestedObjectCollectionInterface.php b/system/src/Grav/Framework/Object/Interfaces/NestedObjectCollectionInterface.php
new file mode 100644
index 0000000000..9f00babbfd
--- /dev/null
+++ b/system/src/Grav/Framework/Object/Interfaces/NestedObjectCollectionInterface.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Object
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Object\Interfaces;
+
+use RuntimeException;
+
+/**
+ * Common Interface for both Objects and Collections
+ * @package Grav\Framework\Object
+ *
+ * @template TKey of array-key
+ * @template T
+ * @extends ObjectCollectionInterface<TKey,T>
+ */
+interface NestedObjectCollectionInterface extends ObjectCollectionInterface
+{
+    /**
+     * @param  string       $property   Object property name.
+     * @param  string|null  $separator  Separator, defaults to '.'
+     * @return bool[]                   List of [key => bool] pairs.
+     */
+    public function hasNestedProperty($property, $separator = null);
+
+    /**
+     * @param  string       $property   Object property to be fetched.
+     * @param  mixed|null   $default    Default value if property has not been set.
+     * @param  string|null  $separator  Separator, defaults to '.'
+     * @return mixed[]                  List of [key => value] pairs.
+     */
+    public function getNestedProperty($property, $default = null, $separator = null);
+
+    /**
+     * @param  string       $property    Object property to be updated.
+     * @param  mixed        $value       New value.
+     * @param  string|null  $separator   Separator, defaults to '.'
+     * @return $this
+     * @throws RuntimeException
+     */
+    public function setNestedProperty($property, $value, $separator = null);
+
+    /**
+     * @param  string $property         Object property to be defined.
+     * @param  mixed  $default          Default value.
+     * @param  string|null $separator   Separator, defaults to '.'
+     * @return $this
+     * @throws RuntimeException
+     */
+    public function defNestedProperty($property, $default, $separator = null);
+
+    /**
+     * @param  string       $property   Object property to be unset.
+     * @param  string|null  $separator  Separator, defaults to '.'
+     * @return $this
+     * @throws RuntimeException
+     */
+    public function unsetNestedProperty($property, $separator = null);
+}
diff --git a/system/src/Grav/Framework/Object/Interfaces/NestedObjectInterface.php b/system/src/Grav/Framework/Object/Interfaces/NestedObjectInterface.php
index 8d6025a328..c144d8e920 100644
--- a/system/src/Grav/Framework/Object/Interfaces/NestedObjectInterface.php
+++ b/system/src/Grav/Framework/Object/Interfaces/NestedObjectInterface.php
@@ -3,12 +3,14 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object\Interfaces;
 
+use RuntimeException;
+
 /**
  * Common Interface for both Objects and Collections
  * @package Grav\Framework\Object
@@ -35,7 +37,7 @@ public function getNestedProperty($property, $default = null, $separator = null)
      * @param  mixed        $value       New value.
      * @param  string|null  $separator   Separator, defaults to '.'
      * @return $this
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function setNestedProperty($property, $value, $separator = null);
 
@@ -44,7 +46,7 @@ public function setNestedProperty($property, $value, $separator = null);
      * @param  mixed  $default          Default value.
      * @param  string|null $separator   Separator, defaults to '.'
      * @return $this
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function defNestedProperty($property, $default, $separator = null);
 
@@ -52,7 +54,7 @@ public function defNestedProperty($property, $default, $separator = null);
      * @param  string       $property   Object property to be unset.
      * @param  string|null  $separator  Separator, defaults to '.'
      * @return $this
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function unsetNestedProperty($property, $separator = null);
 }
diff --git a/system/src/Grav/Framework/Object/Interfaces/ObjectCollectionInterface.php b/system/src/Grav/Framework/Object/Interfaces/ObjectCollectionInterface.php
index 7323294b1d..bd25f61837 100644
--- a/system/src/Grav/Framework/Object/Interfaces/ObjectCollectionInterface.php
+++ b/system/src/Grav/Framework/Object/Interfaces/ObjectCollectionInterface.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,19 +11,27 @@
 
 use Doctrine\Common\Collections\Selectable;
 use Grav\Framework\Collection\CollectionInterface;
+use Serializable;
 
 /**
  * ObjectCollection Interface
  * @package Grav\Framework\Collection
+ * @template TKey of array-key
+ * @template T
+ * @extends CollectionInterface<TKey,T>
+ * @extends Selectable<TKey,T>
  */
-interface ObjectCollectionInterface extends CollectionInterface, Selectable, ObjectInterface
+interface ObjectCollectionInterface extends CollectionInterface, Selectable, Serializable
 {
     /**
-     * Create a copy from this collection by cloning all objects in the collection.
-     *
-     * @return static
+     * @return string
      */
-    public function copy();
+    public function getType();
+
+    /**
+     * @return string
+     */
+    public function getKey();
 
     /**
      * @param string $key
@@ -31,6 +39,47 @@ public function copy();
      */
     public function setKey($key);
 
+    /**
+     * @param  string       $property   Object property name.
+     * @return bool[]                   List of [key => bool] pairs.
+     */
+    public function hasProperty($property);
+
+    /**
+     * @param  string       $property   Object property to be fetched.
+     * @param  mixed|null   $default    Default value if property has not been set.
+     * @return mixed[]                  List of [key => value] pairs.
+     */
+    public function getProperty($property, $default = null);
+
+    /**
+     * @param  string   $property      Object property to be updated.
+     * @param  mixed    $value         New value.
+     * @return $this
+     */
+    public function setProperty($property, $value);
+
+    /**
+     * @param  string  $property        Object property to be defined.
+     * @param  mixed   $default         Default value.
+     * @return $this
+     */
+    public function defProperty($property, $default);
+
+    /**
+     * @param  string  $property     Object property to be unset.
+     * @return $this
+     */
+    public function unsetProperty($property);
+
+    /**
+     * Create a copy from this collection by cloning all objects in the collection.
+     *
+     * @return static
+     * @phpstan-return static<TKey,T>
+     */
+    public function copy();
+
     /**
      * @return array
      */
@@ -41,7 +90,7 @@ public function getObjectKeys();
      * @param array  $arguments     List of arguments passed to the function.
      * @return array                Return values.
      */
-    public function call($name, array $arguments);
+    public function call($name, array $arguments = []);
 
     /**
      * Group items in the collection by a field and return them as associated array.
@@ -56,12 +105,14 @@ public function group($property);
      *
      * @param string $property
      * @return static[]
+     * @phpstan-return array<static<TKey,T>>
      */
     public function collectionGroup($property);
 
     /**
      * @param array $ordering
      * @return ObjectCollectionInterface
+     * @phpstan-return static<TKey,T>
      */
     public function orderBy(array $ordering);
 
@@ -69,6 +120,7 @@ public function orderBy(array $ordering);
      * @param int $start
      * @param int|null $limit
      * @return ObjectCollectionInterface
+     * @phpstan-return static<TKey,T>
      */
     public function limit($start, $limit = null);
 }
diff --git a/system/src/Grav/Framework/Object/Interfaces/ObjectInterface.php b/system/src/Grav/Framework/Object/Interfaces/ObjectInterface.php
index 88c80ab663..bc4d45df90 100644
--- a/system/src/Grav/Framework/Object/Interfaces/ObjectInterface.php
+++ b/system/src/Grav/Framework/Object/Interfaces/ObjectInterface.php
@@ -3,17 +3,20 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object\Interfaces;
 
+use JsonSerializable;
+use Serializable;
+
 /**
  * Object Interface
  * @package Grav\Framework\Object
  */
-interface ObjectInterface extends \Serializable, \JsonSerializable
+interface ObjectInterface extends Serializable, JsonSerializable
 {
     /**
      * @return string
@@ -27,14 +30,14 @@ public function getKey();
 
     /**
      * @param  string       $property   Object property name.
-     * @return bool|bool[]              True if property has been defined (can be null).
+     * @return bool                     True if property has been defined (property can be null).
      */
     public function hasProperty($property);
 
     /**
      * @param  string       $property   Object property to be fetched.
      * @param  mixed|null   $default    Default value if property has not been set.
-     * @return mixed|mixed[]            Property value.
+     * @return mixed                    Property value.
      */
     public function getProperty($property, $default = null);
 
diff --git a/system/src/Grav/Framework/Object/LazyObject.php b/system/src/Grav/Framework/Object/LazyObject.php
index 1c0d9a823d..6be255884e 100644
--- a/system/src/Grav/Framework/Object/LazyObject.php
+++ b/system/src/Grav/Framework/Object/LazyObject.php
@@ -3,12 +3,13 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object;
 
+use ArrayAccess;
 use Grav\Framework\Object\Access\NestedArrayAccessTrait;
 use Grav\Framework\Object\Access\NestedPropertyTrait;
 use Grav\Framework\Object\Access\OverloadedPropertyTrait;
@@ -21,8 +22,9 @@
  * not exist or is not initialized.
  *
  * @package Grav\Framework\Object
+ * @implements ArrayAccess<string,mixed>
  */
-class LazyObject implements NestedObjectInterface, \ArrayAccess
+class LazyObject implements NestedObjectInterface, ArrayAccess
 {
     use ObjectTrait;
     use LazyPropertyTrait;
diff --git a/system/src/Grav/Framework/Object/ObjectCollection.php b/system/src/Grav/Framework/Object/ObjectCollection.php
index a386727b50..94392af898 100644
--- a/system/src/Grav/Framework/Object/ObjectCollection.php
+++ b/system/src/Grav/Framework/Object/ObjectCollection.php
@@ -3,26 +3,32 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object;
 
-use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Grav\Framework\Collection\ArrayCollection;
 use Grav\Framework\Object\Access\NestedPropertyCollectionTrait;
 use Grav\Framework\Object\Base\ObjectCollectionTrait;
 use Grav\Framework\Object\Collection\ObjectExpressionVisitor;
-use Grav\Framework\Object\Interfaces\NestedObjectInterface;
-use Grav\Framework\Object\Interfaces\ObjectCollectionInterface;
+use Grav\Framework\Object\Interfaces\NestedObjectCollectionInterface;
+use InvalidArgumentException;
+use function array_slice;
 
 /**
  * Class contains a collection of objects.
+ *
+ * @template TKey of array-key
+ * @template T of \Grav\Framework\Object\Interfaces\ObjectInterface
+ * @extends ArrayCollection<TKey,T>
+ * @implements NestedObjectCollectionInterface<TKey,T>
  */
-class ObjectCollection extends ArrayCollection implements ObjectCollectionInterface, NestedObjectInterface
+class ObjectCollection extends ArrayCollection implements NestedObjectCollectionInterface
 {
+    /** @phpstan-use ObjectCollectionTrait<TKey,T> */
     use ObjectCollectionTrait;
     use NestedPropertyCollectionTrait {
         NestedPropertyCollectionTrait::group insteadof ObjectCollectionTrait;
@@ -30,8 +36,8 @@ class ObjectCollection extends ArrayCollection implements ObjectCollectionInterf
 
     /**
      * @param array $elements
-     * @param string $key
-     * @throws \InvalidArgumentException
+     * @param string|null $key
+     * @throws InvalidArgumentException
      */
     public function __construct(array $elements = [], $key = null)
     {
@@ -42,7 +48,8 @@ public function __construct(array $elements = [], $key = null)
 
     /**
      * @param array $ordering
-     * @return Collection|static
+     * @return static
+     * @phpstan-return static<TKey,T>
      */
     public function orderBy(array $ordering)
     {
@@ -55,14 +62,18 @@ public function orderBy(array $ordering)
      * @param int $start
      * @param int|null $limit
      * @return static
+     * @phpstan-return static<TKey,T>
      */
     public function limit($start, $limit = null)
     {
+        /** @phpstan-var static<TKey,T> */
         return $this->createFrom($this->slice($start, $limit));
     }
 
     /**
-     * {@inheritDoc}
+     * @param Criteria $criteria
+     * @return static
+     * @phpstan-return static<TKey,T>
      */
     public function matching(Criteria $criteria)
     {
@@ -77,14 +88,11 @@ public function matching(Criteria $criteria)
 
         if ($orderings = $criteria->getOrderings()) {
             $next = null;
-            /**
-             * @var string $field
-             * @var string $ordering
-             */
             foreach (array_reverse($orderings) as $field => $ordering) {
                 $next = ObjectExpressionVisitor::sortByField($field, $ordering === Criteria::DESC ? -1 : 1, $next);
             }
 
+            /** @phpstan-ignore-next-line */
             if ($next) {
                 uasort($filtered, $next);
             }
@@ -94,19 +102,30 @@ public function matching(Criteria $criteria)
         $length = $criteria->getMaxResults();
 
         if ($offset || $length) {
-            $filtered = \array_slice($filtered, (int)$offset, $length);
+            $filtered = array_slice($filtered, (int)$offset, $length);
         }
 
+        /** @phpstan-var static<TKey,T> */
         return $this->createFrom($filtered);
     }
 
+    /**
+     * @return array
+     * @phpstan-return array<TKey,T>
+     */
     protected function getElements()
     {
         return $this->toArray();
     }
 
+    /**
+     * @param array $elements
+     * @return array
+     * @phpstan-return array<TKey,T>
+     */
     protected function setElements(array $elements)
     {
+        /** @phpstan-var array<TKey,T> $elements */
         return $elements;
     }
 }
diff --git a/system/src/Grav/Framework/Object/ObjectIndex.php b/system/src/Grav/Framework/Object/ObjectIndex.php
index 4ba9b75e6f..ab495bd76f 100644
--- a/system/src/Grav/Framework/Object/ObjectIndex.php
+++ b/system/src/Grav/Framework/Object/ObjectIndex.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,8 +11,10 @@
 
 use Doctrine\Common\Collections\Criteria;
 use Grav\Framework\Collection\AbstractIndexCollection;
-use Grav\Framework\Object\Interfaces\NestedObjectInterface;
+use Grav\Framework\Object\Interfaces\NestedObjectCollectionInterface;
 use Grav\Framework\Object\Interfaces\ObjectCollectionInterface;
+use function get_class;
+use function is_object;
 
 /**
  * Keeps index of objects instead of collection of objects. This class allows you to keep a list of objects and load
@@ -20,16 +22,20 @@
  *
  * This is an abstract class and has some protected abstract methods to load objects which you need to implement in
  * order to use the class.
+ *
+ * @template TKey of array-key
+ * @template T of \Grav\Framework\Object\Interfaces\ObjectInterface
+ * @template C of ObjectCollectionInterface
+ * @extends AbstractIndexCollection<TKey,T,C>
+ * @implements NestedObjectCollectionInterface<TKey,T>
  */
-abstract class ObjectIndex extends AbstractIndexCollection implements ObjectCollectionInterface, NestedObjectInterface
+abstract class ObjectIndex extends AbstractIndexCollection implements NestedObjectCollectionInterface
 {
     /** @var string */
-    static protected $type;
+    protected static $type;
 
-    /**
-     * @var string
-     */
-    private $_key;
+    /** @var string */
+    protected $_key;
 
     /**
      * @param bool $prefix
@@ -43,7 +49,7 @@ public function getType($prefix = true)
             return $type . static::$type;
         }
 
-        $class = \get_class($this);
+        $class = get_class($this);
         return $type . strtolower(substr($class, strrpos($class, '\\') + 1));
     }
 
@@ -68,7 +74,7 @@ public function setKey($key)
 
     /**
      * @param string $property      Object property name.
-     * @return array                True if property has been defined (can be null).
+     * @return bool[]               True if property has been defined (can be null).
      */
     public function hasProperty($property)
     {
@@ -78,7 +84,7 @@ public function hasProperty($property)
     /**
      * @param string $property      Object property to be fetched.
      * @param mixed $default        Default value if property has not been set.
-     * @return array                Property values.
+     * @return mixed[]             Property values.
      */
     public function getProperty($property, $default = null)
     {
@@ -89,6 +95,7 @@ public function getProperty($property, $default = null)
      * @param string $property      Object property to be updated.
      * @param string $value         New value.
      * @return ObjectCollectionInterface
+     * @phpstan-return C
      */
     public function setProperty($property, $value)
     {
@@ -99,6 +106,7 @@ public function setProperty($property, $value)
      * @param string  $property     Object property to be defined.
      * @param mixed   $default      Default value.
      * @return ObjectCollectionInterface
+     * @phpstan-return C
      */
     public function defProperty($property, $default)
     {
@@ -108,6 +116,7 @@ public function defProperty($property, $default)
     /**
      * @param string  $property     Object property to be unset.
      * @return ObjectCollectionInterface
+     * @phpstan-return C
      */
     public function unsetProperty($property)
     {
@@ -116,8 +125,8 @@ public function unsetProperty($property)
 
     /**
      * @param string $property      Object property name.
-     * @param string $separator     Separator, defaults to '.'
-     * @return bool                 True if property has been defined (can be null).
+     * @param string|null $separator     Separator, defaults to '.'
+     * @return bool[]               True if property has been defined (can be null).
      */
     public function hasNestedProperty($property, $separator = null)
     {
@@ -127,8 +136,8 @@ public function hasNestedProperty($property, $separator = null)
     /**
      * @param string $property      Object property to be fetched.
      * @param mixed  $default       Default value if property has not been set.
-     * @param string $separator     Separator, defaults to '.'
-     * @return mixed                Property value.
+     * @param string|null $separator     Separator, defaults to '.'
+     * @return mixed[]              Property values.
      */
     public function getNestedProperty($property, $default = null, $separator = null)
     {
@@ -137,9 +146,10 @@ public function getNestedProperty($property, $default = null, $separator = null)
 
     /**
      * @param string $property      Object property to be updated.
-     * @param string $value         New value.
-     * @param string $separator     Separator, defaults to '.'
+     * @param mixed  $value         New value.
+     * @param string|null $separator     Separator, defaults to '.'
      * @return ObjectCollectionInterface
+     * @phpstan-return C
      */
     public function setNestedProperty($property, $value, $separator = null)
     {
@@ -149,8 +159,9 @@ public function setNestedProperty($property, $value, $separator = null)
     /**
      * @param string  $property     Object property to be defined.
      * @param mixed   $default      Default value.
-     * @param string  $separator    Separator, defaults to '.'
+     * @param string|null  $separator    Separator, defaults to '.'
      * @return ObjectCollectionInterface
+     * @phpstan-return C
      */
     public function defNestedProperty($property, $default, $separator = null)
     {
@@ -159,7 +170,9 @@ public function defNestedProperty($property, $default, $separator = null)
 
     /**
      * @param string  $property     Object property to be unset.
+     * @param string|null  $separator    Separator, defaults to '.'
      * @return ObjectCollectionInterface
+     * @phpstan-return C
      */
     public function unsetNestedProperty($property, $separator = null)
     {
@@ -170,14 +183,17 @@ public function unsetNestedProperty($property, $separator = null)
      * Create a copy from this collection by cloning all objects in the collection.
      *
      * @return static
+     * @return static<TKey,T,C>
      */
     public function copy()
     {
         $list = [];
         foreach ($this->getIterator() as $key => $value) {
-            $list[$key] = \is_object($value) ? clone $value : $value;
+            /** @phpstan-ignore-next-line */
+            $list[$key] = is_object($value) ? clone $value : $value;
         }
 
+        /** @phpstan-var static<TKey,T,C> */
         return $this->createFrom($list);
     }
 
@@ -192,6 +208,7 @@ public function getObjectKeys()
     /**
      * @param array $ordering
      * @return ObjectCollectionInterface
+     * @phpstan-return C
      */
     public function orderBy(array $ordering)
     {
@@ -199,7 +216,9 @@ public function orderBy(array $ordering)
     }
 
     /**
-     * {@inheritDoc}
+     * @param string $method
+     * @param array $arguments
+     * @return array|mixed
      */
     public function call($method, array $arguments = [])
     {
@@ -222,6 +241,7 @@ public function group($property)
      *
      * @param string $property
      * @return ObjectCollectionInterface[]
+     * @phpstan-return C[]
      */
     public function collectionGroup($property)
     {
@@ -229,16 +249,26 @@ public function collectionGroup($property)
     }
 
     /**
-     * {@inheritDoc}
+     * @param Criteria $criteria
+     * @return ObjectCollectionInterface
+     * @phpstan-return C
      */
     public function matching(Criteria $criteria)
     {
-        /** @var ObjectCollectionInterface $collection */
         $collection = $this->loadCollection($this->getEntries());
 
-        return $collection->matching($criteria);
+        /** @phpstan-var C $matching */
+        $matching = $collection->matching($criteria);
+
+        return $matching;
     }
 
+    /**
+     * @param string $name
+     * @param array $arguments
+     * @return mixed
+     */
+    #[\ReturnTypeWillChange]
     abstract public function __call($name, $arguments);
 
     /**
diff --git a/system/src/Grav/Framework/Object/Property/ArrayPropertyTrait.php b/system/src/Grav/Framework/Object/Property/ArrayPropertyTrait.php
index 7092e15d5d..8ab4c41e4e 100644
--- a/system/src/Grav/Framework/Object/Property/ArrayPropertyTrait.php
+++ b/system/src/Grav/Framework/Object/Property/ArrayPropertyTrait.php
@@ -3,12 +3,15 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object\Property;
 
+use InvalidArgumentException;
+use function array_key_exists;
+
 /**
  * Array Property Trait
  *
@@ -18,16 +21,13 @@
  */
 trait ArrayPropertyTrait
 {
-    /**
-     * Properties of the object.
-     * @var array
-     */
+    /** @var array Properties of the object. */
     private $_elements;
 
     /**
      * @param array $elements
-     * @param string $key
-     * @throws \InvalidArgumentException
+     * @param string|null $key
+     * @throws InvalidArgumentException
      */
     public function __construct(array $elements = [], $key = null)
     {
@@ -66,6 +66,7 @@ protected function &doGetProperty($property, $default = null, $doCreate = false)
     /**
      * @param string $property      Object property to be updated.
      * @param mixed  $value         New value.
+     * @return void
      */
     protected function doSetProperty($property, $value)
     {
@@ -74,6 +75,7 @@ protected function doSetProperty($property, $value)
 
     /**
      * @param string  $property     Object property to be unset.
+     * @return void
      */
     protected function doUnsetProperty($property)
     {
@@ -95,11 +97,14 @@ protected function getElement($property, $default = null)
      */
     protected function getElements()
     {
-        return array_filter($this->_elements, function ($val) { return $val !== null; });
+        return array_filter($this->_elements, static function ($val) {
+            return $val !== null;
+        });
     }
 
     /**
      * @param array $elements
+     * @return void
      */
     protected function setElements(array $elements)
     {
diff --git a/system/src/Grav/Framework/Object/Property/LazyPropertyTrait.php b/system/src/Grav/Framework/Object/Property/LazyPropertyTrait.php
index 1066b9933f..e6892596a9 100644
--- a/system/src/Grav/Framework/Object/Property/LazyPropertyTrait.php
+++ b/system/src/Grav/Framework/Object/Property/LazyPropertyTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -53,6 +53,7 @@ protected function doHasProperty($property)
     /**
      * @param string $property      Object property to be fetched.
      * @param mixed $default        Default value if property has not been set.
+     * @param bool $doCreate
      * @return mixed                Property value.
      */
     protected function &doGetProperty($property, $default = null, $doCreate = false)
@@ -69,7 +70,7 @@ protected function &doGetProperty($property, $default = null, $doCreate = false)
     /**
      * @param string $property      Object property to be updated.
      * @param mixed  $value         New value.
-     * @return $this
+     * @return void
      */
     protected function doSetProperty($property, $value)
     {
@@ -78,20 +79,15 @@ protected function doSetProperty($property, $value)
         } else {
             $this->setArrayProperty($property, $value);
         }
-
-        return $this;
     }
 
     /**
      * @param string  $property     Object property to be unset.
-     * @return $this
+     * @return void
      */
     protected function doUnsetProperty($property)
     {
-        $this->hasObjectProperty($property) ?
-            $this->unsetObjectProperty($property) : $this->unsetArrayProperty($property);
-
-        return $this;
+        $this->hasObjectProperty($property) ? $this->unsetObjectProperty($property) : $this->unsetArrayProperty($property);
     }
 
     /**
diff --git a/system/src/Grav/Framework/Object/Property/MixedPropertyTrait.php b/system/src/Grav/Framework/Object/Property/MixedPropertyTrait.php
index 149ac40b38..1b57aab054 100644
--- a/system/src/Grav/Framework/Object/Property/MixedPropertyTrait.php
+++ b/system/src/Grav/Framework/Object/Property/MixedPropertyTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -54,6 +54,7 @@ protected function doHasProperty($property)
     /**
      * @param string $property      Object property to be fetched.
      * @param mixed $default        Default value if property has not been set.
+     * @param bool $doCreate
      * @return mixed                Property value.
      */
     protected function &doGetProperty($property, $default = null, $doCreate = false)
@@ -68,26 +69,22 @@ protected function &doGetProperty($property, $default = null, $doCreate = false)
     /**
      * @param string $property      Object property to be updated.
      * @param mixed  $value         New value.
-     * @return $this
+     * @return void
      */
     protected function doSetProperty($property, $value)
     {
         $this->hasObjectProperty($property)
             ? $this->setObjectProperty($property, $value) : $this->setArrayProperty($property, $value);
-
-        return $this;
     }
 
     /**
      * @param string  $property     Object property to be unset.
-     * @return $this
+     * @return void
      */
     protected function doUnsetProperty($property)
     {
         $this->hasObjectProperty($property) ?
             $this->unsetObjectProperty($property) : $this->unsetArrayProperty($property);
-
-        return $this;
     }
 
     /**
@@ -114,6 +111,7 @@ protected function getElements()
 
     /**
      * @param array $elements
+     * @return void
      */
     protected function setElements(array $elements)
     {
diff --git a/system/src/Grav/Framework/Object/Property/ObjectPropertyTrait.php b/system/src/Grav/Framework/Object/Property/ObjectPropertyTrait.php
index 5f8fdf0ace..bb0195d660 100644
--- a/system/src/Grav/Framework/Object/Property/ObjectPropertyTrait.php
+++ b/system/src/Grav/Framework/Object/Property/ObjectPropertyTrait.php
@@ -3,12 +3,17 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object\Property;
 
+use InvalidArgumentException;
+use function array_key_exists;
+use function get_object_vars;
+use function is_callable;
+
 /**
  * Object Property Trait
  *
@@ -24,15 +29,13 @@
  */
 trait ObjectPropertyTrait
 {
-    /**
-     * @var array
-     */
+    /** @var array */
     private $_definedProperties;
 
     /**
      * @param array $elements
-     * @param string $key
-     * @throws \InvalidArgumentException
+     * @param string|null $key
+     * @throws InvalidArgumentException
      */
     public function __construct(array $elements = [], $key = null)
     {
@@ -104,14 +107,14 @@ protected function doHasProperty($property)
     protected function &doGetProperty($property, $default = null, $doCreate = false)
     {
         if (!array_key_exists($property, $this->_definedProperties)) {
-            throw new \InvalidArgumentException("Property '{$property}' does not exist in the object!");
+            throw new InvalidArgumentException("Property '{$property}' does not exist in the object!");
         }
 
         if (empty($this->_definedProperties[$property])) {
             if ($doCreate === true) {
                 $this->_definedProperties[$property] = true;
                 $this->{$property} = null;
-            } elseif (\is_callable($doCreate)) {
+            } elseif (is_callable($doCreate)) {
                 $this->_definedProperties[$property] = true;
                 $this->{$property} = $this->offsetLoad($property, $doCreate());
             } else {
@@ -125,12 +128,13 @@ protected function &doGetProperty($property, $default = null, $doCreate = false)
     /**
      * @param string $property      Object property to be updated.
      * @param mixed  $value         New value.
-     * @throws \InvalidArgumentException
+     * @return void
+     * @throws InvalidArgumentException
      */
     protected function doSetProperty($property, $value)
     {
         if (!array_key_exists($property, $this->_definedProperties)) {
-            throw new \InvalidArgumentException("Property '{$property}' does not exist in the object!");
+            throw new InvalidArgumentException("Property '{$property}' does not exist in the object!");
         }
 
         $this->_definedProperties[$property] = true;
@@ -139,6 +143,7 @@ protected function doSetProperty($property, $value)
 
     /**
      * @param string  $property     Object property to be unset.
+     * @return void
      */
     protected function doUnsetProperty($property)
     {
@@ -147,13 +152,16 @@ protected function doUnsetProperty($property)
         }
 
         $this->_definedProperties[$property] = false;
-        unset($this->{$property});
+        $this->{$property} = null;
     }
 
+    /**
+     * @return void
+     */
     protected function initObjectProperties()
     {
         $this->_definedProperties = [];
-        foreach (\get_object_vars($this) as $property => $value) {
+        foreach (get_object_vars($this) as $property => $value) {
             if ($property[0] !== '_') {
                 $this->_definedProperties[$property] = ($value !== null);
             }
@@ -194,6 +202,7 @@ protected function getElements()
 
     /**
      * @param array $elements
+     * @return void
      */
     protected function setElements(array $elements)
     {
@@ -201,7 +210,4 @@ protected function setElements(array $elements)
             $this->setProperty($property, $value);
         }
     }
-
-    abstract public function setProperty($property, $value);
-    abstract protected function setKey($key);
 }
diff --git a/system/src/Grav/Framework/Object/PropertyObject.php b/system/src/Grav/Framework/Object/PropertyObject.php
index f740fc62a4..d9cdde83a9 100644
--- a/system/src/Grav/Framework/Object/PropertyObject.php
+++ b/system/src/Grav/Framework/Object/PropertyObject.php
@@ -3,12 +3,13 @@
 /**
  * @package    Grav\Framework\Object
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Object;
 
+use ArrayAccess;
 use Grav\Framework\Object\Access\NestedArrayAccessTrait;
 use Grav\Framework\Object\Access\NestedPropertyTrait;
 use Grav\Framework\Object\Access\OverloadedPropertyTrait;
@@ -18,8 +19,10 @@
 
 /**
  * Property Objects keep their data in protected object properties.
+ *
+ * @implements ArrayAccess<string,mixed>
  */
-class PropertyObject implements NestedObjectInterface, \ArrayAccess
+class PropertyObject implements NestedObjectInterface, ArrayAccess
 {
     use ObjectTrait;
     use ObjectPropertyTrait;
diff --git a/system/src/Grav/Framework/Pagination/AbstractPagination.php b/system/src/Grav/Framework/Pagination/AbstractPagination.php
index acdad77bfc..a4d902a2f6 100644
--- a/system/src/Grav/Framework/Pagination/AbstractPagination.php
+++ b/system/src/Grav/Framework/Pagination/AbstractPagination.php
@@ -3,47 +3,43 @@
 /**
  * @package    Grav\Framework\Pagination
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Pagination;
 
+use ArrayIterator;
 use Grav\Framework\Pagination\Interfaces\PaginationInterface;
 use Grav\Framework\Route\Route;
+use function count;
 
+/**
+ * Class AbstractPagination
+ * @package Grav\Framework\Pagination
+ */
 class AbstractPagination implements PaginationInterface
 {
     /** @var Route Base rouse used for the pagination. */
     protected $route;
-
     /** @var int|null  Current page. */
     protected $page;
-
     /** @var int|null  The record number to start displaying from. */
     protected $start;
-
     /** @var int  Number of records to display per page. */
     protected $limit;
-
     /** @var int  Total number of records. */
     protected $total;
-
     /** @var array Pagination options */
     protected $options;
-
     /** @var bool View all flag. */
     protected $viewAll;
-
     /** @var int  Total number of pages. */
     protected $pages;
-
     /** @var int  Value pagination object begins at. */
     protected $pagesStart;
-
     /** @var int  Value pagination object ends at .*/
     protected $pagesStop;
-
     /** @var array */
     protected $defaultOptions = [
         'type' => 'page',
@@ -51,37 +47,57 @@ class AbstractPagination implements PaginationInterface
         'display' => 5,
         'opening' => 0,
         'ending' => 0,
-        'url' => null
+        'url' => null,
+        'param' => null,
+        'use_query_param' => false
     ];
-
     /** @var array */
     private $items;
 
+    /**
+     * @return bool
+     */
     public function isEnabled(): bool
     {
         return $this->count() > 1;
     }
 
+    /**
+     * @return array
+     */
     public function getOptions(): array
     {
         return $this->options;
     }
 
+    /**
+     * @return Route|null
+     */
     public function getRoute(): ?Route
     {
         return $this->route;
     }
 
+    /**
+     * @return int
+     */
     public function getTotalPages(): int
     {
         return $this->pages;
     }
 
+    /**
+     * @return int
+     */
     public function getPageNumber(): int
     {
-        return $this->page;
+        return $this->page ?? 1;
     }
 
+    /**
+     * @param int $count
+     * @return int|null
+     */
     public function getPrevNumber(int $count = 1): ?int
     {
         $page = $this->page - $count;
@@ -89,6 +105,10 @@ public function getPrevNumber(int $count = 1): ?int
         return $page >= 1 ? $page : null;
     }
 
+    /**
+     * @param int $count
+     * @return int|null
+     */
     public function getNextNumber(int $count = 1): ?int
     {
         $page = $this->page + $count;
@@ -96,6 +116,11 @@ public function getNextNumber(int $count = 1): ?int
         return $page <= $this->pages ? $page : null;
     }
 
+    /**
+     * @param int $page
+     * @param string|null $label
+     * @return PaginationPage|null
+     */
     public function getPage(int $page, string $label = null): ?PaginationPage
     {
         if ($page < 1 || $page > $this->pages) {
@@ -103,14 +128,23 @@ public function getPage(int $page, string $label = null): ?PaginationPage
         }
 
         $start = ($page - 1) * $this->limit;
-        if ($this->getOptions()['type'] === 'page') {
-            $name = 'page';
+        $type = $this->getOptions()['type'];
+        $param = $this->getOptions()['param'];
+        $useQuery = $this->getOptions()['use_query_param'];
+        if ($type === 'page') {
+            $param = $param ?? 'page';
             $offset = $page;
         } else {
-            $name = 'start';
+            $param = $param ?? 'start';
             $offset = $start;
         }
 
+        if ($useQuery) {
+            $route = $this->route->withQueryParam($param, $offset);
+        } else {
+            $route = $this->route->withGravParam($param, $offset);
+        }
+
         return new PaginationPage(
             [
                 'label' => $label ?? (string)$page,
@@ -119,60 +153,100 @@ public function getPage(int $page, string $label = null): ?PaginationPage
                 'offset_end' => min($start + $this->limit, $this->total) - 1,
                 'enabled' => $page !== $this->page || $this->viewAll,
                 'active' => $page === $this->page,
-                'route' => $this->route->withGravParam($name, $offset)
+                'route' => $route
             ]
         );
     }
 
+    /**
+     * @param string|null $label
+     * @param int $count
+     * @return PaginationPage|null
+     */
     public function getFirstPage(string $label = null, int $count = 0): ?PaginationPage
     {
         return $this->getPage(1 + $count, $label ?? $this->getOptions()['label_first'] ?? null);
     }
 
+    /**
+     * @param string|null $label
+     * @param int $count
+     * @return PaginationPage|null
+     */
     public function getPrevPage(string $label = null, int $count = 1): ?PaginationPage
     {
         return $this->getPage($this->page - $count, $label ?? $this->getOptions()['label_prev'] ?? null);
     }
 
+    /**
+     * @param string|null $label
+     * @param int $count
+     * @return PaginationPage|null
+     */
     public function getNextPage(string $label = null, int $count = 1): ?PaginationPage
     {
         return $this->getPage($this->page + $count, $label ?? $this->getOptions()['label_next'] ?? null);
     }
 
+    /**
+     * @param string|null $label
+     * @param int $count
+     * @return PaginationPage|null
+     */
     public function getLastPage(string $label = null, int $count = 0): ?PaginationPage
     {
         return $this->getPage($this->pages - $count, $label ?? $this->getOptions()['label_last'] ?? null);
     }
 
+    /**
+     * @return int
+     */
     public function getStart(): int
     {
-        return $this->start;
+        return $this->start ?? 0;
     }
 
+    /**
+     * @return int
+     */
     public function getLimit(): int
     {
         return $this->limit;
     }
 
+    /**
+     * @return int
+     */
     public function getTotal(): int
     {
         return $this->total;
     }
 
+    /**
+     * @return int
+     */
     public function count(): int
     {
         $this->loadItems();
 
-        return \count($this->items);
+        return count($this->items);
     }
 
+    /**
+     * @return ArrayIterator
+     * @phpstan-return ArrayIterator<int,PaginationPage>
+     */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         $this->loadItems();
 
-        return new \ArrayIterator($this->items);
+        return new ArrayIterator($this->items);
     }
 
+    /**
+     * @return array
+     */
     public function getPages(): array
     {
         $this->loadItems();
@@ -180,6 +254,9 @@ public function getPages(): array
         return $this->items;
     }
 
+    /**
+     * @return void
+     */
     protected function loadItems()
     {
         $this->calculateRange();
@@ -197,6 +274,10 @@ protected function loadItems()
         }
     }
 
+    /**
+     * @param Route $route
+     * @return $this
+     */
     protected function setRoute(Route $route)
     {
         $this->route = $route;
@@ -204,6 +285,10 @@ protected function setRoute(Route $route)
         return $this;
     }
 
+    /**
+     * @param array|null $options
+     * @return $this
+     */
     protected function setOptions(array $options = null)
     {
         $this->options = $options ? array_merge($this->defaultOptions, $options) : $this->defaultOptions;
@@ -211,6 +296,10 @@ protected function setOptions(array $options = null)
         return $this;
     }
 
+    /**
+     * @param int|null $page
+     * @return $this
+     */
     protected function setPage(int $page = null)
     {
         $this->page = (int)max($page, 1);
@@ -220,7 +309,7 @@ protected function setPage(int $page = null)
     }
 
     /**
-     * @param int $start
+     * @param int|null $start
      * @return $this
      */
     protected function setStart(int $start = null)
@@ -256,6 +345,14 @@ protected function setTotal(int $total)
         return $this;
     }
 
+    /**
+     * @param Route $route
+     * @param int $total
+     * @param int|null $pos
+     * @param int|null $limit
+     * @param array|null $options
+     * @return void
+     */
     protected function initialize(Route $route, int $total, int $pos = null, int $limit = null, array $options = null)
     {
         $this->setRoute($route);
@@ -270,6 +367,9 @@ protected function initialize(Route $route, int $total, int $pos = null, int $li
         $this->calculateLimits();
     }
 
+    /**
+     * @return void
+     */
     protected function calculateLimits()
     {
         $limit = $this->limit;
@@ -300,6 +400,9 @@ protected function calculateLimits()
         $this->pages = (int)ceil($total / $limit);
     }
 
+    /**
+     * @return void
+     */
     protected function calculateRange()
     {
         $options = $this->getOptions();
diff --git a/system/src/Grav/Framework/Pagination/AbstractPaginationPage.php b/system/src/Grav/Framework/Pagination/AbstractPaginationPage.php
index 04f536bc0a..072fea7672 100644
--- a/system/src/Grav/Framework/Pagination/AbstractPaginationPage.php
+++ b/system/src/Grav/Framework/Pagination/AbstractPaginationPage.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Pagination
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,41 +11,66 @@
 
 use Grav\Framework\Pagination\Interfaces\PaginationPageInterface;
 
+/**
+ * Class AbstractPaginationPage
+ * @package Grav\Framework\Pagination
+ */
 abstract class AbstractPaginationPage implements PaginationPageInterface
 {
     /** @var array */
     protected $options;
 
+    /**
+     * @return bool
+     */
     public function isActive(): bool
     {
         return $this->options['active'] ?? false;
     }
 
+    /**
+     * @return bool
+     */
     public function isEnabled(): bool
     {
         return $this->options['enabled'] ?? false;
     }
 
+    /**
+     * @return array
+     */
     public function getOptions(): array
     {
-        return $this->options ?? [];
+        return $this->options;
     }
 
+    /**
+     * @return int|null
+     */
     public function getNumber(): ?int
     {
         return $this->options['number'] ?? null;
     }
 
+    /**
+     * @return string
+     */
     public function getLabel(): string
     {
         return $this->options['label'] ?? (string)$this->getNumber();
     }
 
+    /**
+     * @return string|null
+     */
     public function getUrl(): ?string
     {
         return $this->options['route'] ? (string)$this->options['route']->getUri() : null;
     }
 
+    /**
+     * @param array $options
+     */
     protected function setOptions(array $options): void
     {
         $this->options = $options;
diff --git a/system/src/Grav/Framework/Pagination/Interfaces/PaginationInterface.php b/system/src/Grav/Framework/Pagination/Interfaces/PaginationInterface.php
index 0a145250fc..1a82147a11 100644
--- a/system/src/Grav/Framework/Pagination/Interfaces/PaginationInterface.php
+++ b/system/src/Grav/Framework/Pagination/Interfaces/PaginationInterface.php
@@ -3,41 +3,102 @@
 /**
  * @package    Grav\Framework\Pagination
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Pagination\Interfaces;
 
+use Countable;
 use Grav\Framework\Pagination\PaginationPage;
+use IteratorAggregate;
 
-interface PaginationInterface extends \Countable, \IteratorAggregate
+/**
+ * Interface PaginationInterface
+ * @package Grav\Framework\Pagination\Interfaces
+ * @extends IteratorAggregate<int,PaginationPage>
+ */
+interface PaginationInterface extends Countable, IteratorAggregate
 {
+    /**
+     * @return int
+     */
     public function getTotalPages(): int;
 
+    /**
+     * @return int
+     */
     public function getPageNumber(): int;
 
+    /**
+     * @param int $count
+     * @return int|null
+     */
     public function getPrevNumber(int $count = 1): ?int;
 
+    /**
+     * @param int $count
+     * @return int|null
+     */
     public function getNextNumber(int $count = 1): ?int;
 
+    /**
+     * @return int
+     */
     public function getStart(): int;
 
+    /**
+     * @return int
+     */
     public function getLimit(): int;
 
+    /**
+     * @return int
+     */
     public function getTotal(): int;
 
+    /**
+     * @return int
+     */
     public function count(): int;
 
+    /**
+     * @return array
+     */
     public function getOptions(): array;
 
+    /**
+     * @param int $page
+     * @param string|null $label
+     * @return PaginationPage|null
+     */
     public function getPage(int $page, string $label = null): ?PaginationPage;
 
+    /**
+     * @param string|null $label
+     * @param int $count
+     * @return PaginationPage|null
+     */
     public function getFirstPage(string $label = null, int $count = 0): ?PaginationPage;
 
+    /**
+     * @param string|null $label
+     * @param int $count
+     * @return PaginationPage|null
+     */
     public function getPrevPage(string $label = null, int $count = 1): ?PaginationPage;
 
+    /**
+     * @param string|null $label
+     * @param int $count
+     * @return PaginationPage|null
+     */
     public function getNextPage(string $label = null, int $count = 1): ?PaginationPage;
 
+    /**
+     * @param string|null $label
+     * @param int $count
+     * @return PaginationPage|null
+     */
     public function getLastPage(string $label = null, int $count = 0): ?PaginationPage;
 }
diff --git a/system/src/Grav/Framework/Pagination/Interfaces/PaginationPageInterface.php b/system/src/Grav/Framework/Pagination/Interfaces/PaginationPageInterface.php
index 12d1eccb1f..26c069262a 100644
--- a/system/src/Grav/Framework/Pagination/Interfaces/PaginationPageInterface.php
+++ b/system/src/Grav/Framework/Pagination/Interfaces/PaginationPageInterface.php
@@ -3,23 +3,45 @@
 /**
  * @package    Grav\Framework\Pagination
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Pagination\Interfaces;
 
+/**
+ * Interface PaginationPageInterface
+ * @package Grav\Framework\Pagination\Interfaces
+ */
 interface PaginationPageInterface
 {
+    /**
+     * @return bool
+     */
     public function isActive(): bool;
 
+    /**
+     * @return bool
+     */
     public function isEnabled(): bool;
 
+    /**
+     * @return array
+     */
     public function getOptions(): array;
 
+    /**
+     * @return int|null
+     */
     public function getNumber(): ?int;
 
+    /**
+     * @return string
+     */
     public function getLabel(): string;
 
+    /**
+     * @return string|null
+     */
     public function getUrl(): ?string;
 }
diff --git a/system/src/Grav/Framework/Pagination/Pagination.php b/system/src/Grav/Framework/Pagination/Pagination.php
index 6e4ad67138..8f2fa203ca 100644
--- a/system/src/Grav/Framework/Pagination/Pagination.php
+++ b/system/src/Grav/Framework/Pagination/Pagination.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Pagination
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,8 +11,20 @@
 
 use Grav\Framework\Route\Route;
 
+/**
+ * Class Pagination
+ * @package Grav\Framework\Pagination
+ */
 class Pagination extends AbstractPagination
 {
+    /**
+     * Pagination constructor.
+     * @param Route $route
+     * @param int $total
+     * @param int|null $pos
+     * @param int|null $limit
+     * @param array|null $options
+     */
     public function __construct(Route $route, int $total, int $pos = null, int $limit = null, array $options = null)
     {
         $this->initialize($route, $total, $pos, $limit, $options);
diff --git a/system/src/Grav/Framework/Pagination/PaginationPage.php b/system/src/Grav/Framework/Pagination/PaginationPage.php
index ca35a8d1a3..e64abe9c02 100644
--- a/system/src/Grav/Framework/Pagination/PaginationPage.php
+++ b/system/src/Grav/Framework/Pagination/PaginationPage.php
@@ -3,14 +3,22 @@
 /**
  * @package    Grav\Framework\Pagination
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Pagination;
 
+/**
+ * Class PaginationPage
+ * @package Grav\Framework\Pagination
+ */
 class PaginationPage extends AbstractPaginationPage
 {
+    /**
+     * PaginationPage constructor.
+     * @param array $options
+     */
     public function __construct(array $options = [])
     {
         $this->setOptions($options);
diff --git a/system/src/Grav/Framework/Psr7/AbstractUri.php b/system/src/Grav/Framework/Psr7/AbstractUri.php
index e0d46b6601..145437a587 100644
--- a/system/src/Grav/Framework/Psr7/AbstractUri.php
+++ b/system/src/Grav/Framework/Psr7/AbstractUri.php
@@ -3,13 +3,14 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Psr7;
 
 use Grav\Framework\Uri\UriPartsFilter;
+use InvalidArgumentException;
 use Psr\Http\Message\UriInterface;
 
 /**
@@ -20,6 +21,7 @@
  */
 abstract class AbstractUri implements UriInterface
 {
+    /** @var array */
     protected static $defaultPorts = [
         'http'  => 80,
         'https' => 443
@@ -27,25 +29,18 @@ abstract class AbstractUri implements UriInterface
 
     /** @var string Uri scheme. */
     private $scheme = '';
-
     /** @var string Uri user. */
     private $user = '';
-
     /** @var string Uri password. */
     private $password = '';
-
     /** @var string Uri host. */
     private $host = '';
-
     /** @var int|null Uri port. */
     private $port;
-
     /** @var string Uri path. */
     private $path = '';
-
     /** @var string Uri query string (without ?). */
     private $query = '';
-
     /** @var string Uri fragment (without #). */
     private $fragment = '';
 
@@ -156,7 +151,7 @@ public function withScheme($scheme)
 
     /**
      * @inheritdoc
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function withUserInfo($user, $password = null)
     {
@@ -249,7 +244,7 @@ public function withQuery($query)
 
     /**
      * @inheritdoc
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function withFragment($fragment)
     {
@@ -268,6 +263,7 @@ public function withFragment($fragment)
     /**
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function __toString()
     {
         return $this->getUrl();
@@ -352,7 +348,8 @@ protected function getPassword()
 
     /**
      * @param array $parts
-     * @throws \InvalidArgumentException
+     * @return void
+     * @throws InvalidArgumentException
      */
     protected function initParts(array $parts)
     {
@@ -370,26 +367,30 @@ protected function initParts(array $parts)
     }
 
     /**
-     * @throws \InvalidArgumentException
+     * @return void
+     * @throws InvalidArgumentException
      */
     private function validate()
     {
         if ($this->host === '' && ($this->scheme === 'http' || $this->scheme === 'https')) {
-            throw new \InvalidArgumentException('Uri with a scheme must have a host');
+            throw new InvalidArgumentException('Uri with a scheme must have a host');
         }
 
         if ($this->getAuthority() === '') {
             if (0 === strpos($this->path, '//')) {
-                throw new \InvalidArgumentException('The path of a URI without an authority must not start with two slashes \'//\'');
+                throw new InvalidArgumentException('The path of a URI without an authority must not start with two slashes \'//\'');
             }
             if ($this->scheme === '' && false !== strpos(explode('/', $this->path, 2)[0], ':')) {
-                throw new \InvalidArgumentException('A relative URI must not have a path beginning with a segment containing a colon');
+                throw new InvalidArgumentException('A relative URI must not have a path beginning with a segment containing a colon');
             }
         } elseif (isset($this->path[0]) && $this->path[0] !== '/') {
-            throw new \InvalidArgumentException('The path of a URI with an authority must start with a slash \'/\' or be empty');
+            throw new InvalidArgumentException('The path of a URI with an authority must start with a slash \'/\' or be empty');
         }
     }
 
+    /**
+     * @return bool
+     */
     protected function isDefaultPort()
     {
         $scheme = $this->scheme;
@@ -399,6 +400,9 @@ protected function isDefaultPort()
             || (isset(static::$defaultPorts[$scheme]) && $port === static::$defaultPorts[$scheme]);
     }
 
+    /**
+     * @return void
+     */
     private function unsetDefaultPort()
     {
         if ($this->isDefaultPort()) {
diff --git a/system/src/Grav/Framework/Psr7/Request.php b/system/src/Grav/Framework/Psr7/Request.php
index 24ea3b6d42..795a1a46e7 100644
--- a/system/src/Grav/Framework/Psr7/Request.php
+++ b/system/src/Grav/Framework/Psr7/Request.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
diff --git a/system/src/Grav/Framework/Psr7/Response.php b/system/src/Grav/Framework/Psr7/Response.php
index 960621dbf1..6189c4a6f9 100644
--- a/system/src/Grav/Framework/Psr7/Response.php
+++ b/system/src/Grav/Framework/Psr7/Response.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,6 +15,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use RuntimeException;
+use function in_array;
 
 /**
  * Class Response
@@ -24,9 +25,7 @@ class Response implements ResponseInterface
 {
     use ResponseDecoratorTrait;
 
-    /**
-     * @var string EOL characters used for HTTP response.
-     */
+    /** @var string EOL characters used for HTTP response. */
     private const EOL = "\r\n";
 
     /**
@@ -50,10 +49,11 @@ public function __construct(int $status = 200, array $headers = [], $body = null
      * response to the client.
      *
      * @param  mixed  $data   The data
-     * @param  int    $status The HTTP status code.
+     * @param  int|null $status The HTTP status code.
      * @param  int    $options Json encoding options
      * @param  int    $depth Json encoding max depth
      * @return static
+     * @phpstan-param positive-int $depth
      */
     public function withJson($data, int $status = null, int $options = 0, int $depth = 512): ResponseInterface
     {
@@ -112,7 +112,7 @@ public function withRedirect(string $url, $status = null): ResponseInterface
      */
     public function isEmpty(): bool
     {
-        return \in_array($this->getResponse()->getStatusCode(), [204, 205, 304], true);
+        return in_array($this->getResponse()->getStatusCode(), [204, 205, 304], true);
     }
 
 
@@ -137,7 +137,7 @@ public function isOk(): bool
      */
     public function isRedirect(): bool
     {
-        return \in_array($this->getResponse()->getStatusCode(), [301, 302, 303, 307, 308], true);
+        return in_array($this->getResponse()->getStatusCode(), [301, 302, 303, 307, 308], true);
     }
 
     /**
@@ -258,7 +258,7 @@ public function __toString(): string
         }
 
         $output .= self::EOL;
-        $output .= (string) $response->getBody();
+        $output .= $response->getBody();
 
         return $output;
     }
diff --git a/system/src/Grav/Framework/Psr7/ServerRequest.php b/system/src/Grav/Framework/Psr7/ServerRequest.php
index bb6b8b8b5e..cb5bcbbd3b 100644
--- a/system/src/Grav/Framework/Psr7/ServerRequest.php
+++ b/system/src/Grav/Framework/Psr7/ServerRequest.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,6 +15,8 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
+use function is_array;
+use function is_object;
 
 /**
  * Class ServerRequest
@@ -96,13 +98,8 @@ public function getContentLength(): ?int
     public function getCookieParam($key, $default = null)
     {
         $cookies = $this->getRequest()->getCookieParams();
-        $result = $default;
-
-        if (isset($cookies[$key])) {
-            $result = $cookies[$key];
-        }
 
-        return $result;
+        return $cookies[$key] ?? $default;
     }
 
     /**
@@ -159,7 +156,7 @@ public function getMediaTypeParams(): array
      * Note: This method is not part of the PSR-7 standard.
      *
      * @param  string $key The parameter key.
-     * @param  string $default The default value.
+     * @param  string|null $default The default value.
      *
      * @return mixed The parameter value.
      */
@@ -236,13 +233,8 @@ public function getParsedBodyParam($key, $default = null)
     public function getQueryParam($key, $default = null)
     {
         $getParams = $this->getQueryParams();
-        $result = $default;
 
-        if (isset($getParams[$key])) {
-            $result = $getParams[$key];
-        }
-
-        return $result;
+        return $getParams[$key] ?? $default;
     }
 
     /**
diff --git a/system/src/Grav/Framework/Psr7/Stream.php b/system/src/Grav/Framework/Psr7/Stream.php
index 9431052798..6546bdc3e9 100644
--- a/system/src/Grav/Framework/Psr7/Stream.php
+++ b/system/src/Grav/Framework/Psr7/Stream.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,10 +14,28 @@
 use Grav\Framework\Psr7\Traits\StreamDecoratorTrait;
 use Psr\Http\Message\StreamInterface;
 
+/**
+ * Class Stream
+ * @package Grav\Framework\Psr7
+ */
 class Stream implements StreamInterface
 {
     use StreamDecoratorTrait;
 
+    /**
+     * @param string|resource|StreamInterface $body
+     * @return static
+     */
+    public static function create($body = '')
+    {
+        return new static($body);
+    }
+
+    /**
+     * Stream constructor.
+     *
+     * @param string|resource|StreamInterface $body
+     */
     public function __construct($body = '')
     {
         $this->stream = \Nyholm\Psr7\Stream::create($body);
diff --git a/system/src/Grav/Framework/Psr7/Traits/MessageDecoratorTrait.php b/system/src/Grav/Framework/Psr7/Traits/MessageDecoratorTrait.php
index 28ed1f5722..c09a03c285 100644
--- a/system/src/Grav/Framework/Psr7/Traits/MessageDecoratorTrait.php
+++ b/system/src/Grav/Framework/Psr7/Traits/MessageDecoratorTrait.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
diff --git a/system/src/Grav/Framework/Psr7/Traits/RequestDecoratorTrait.php b/system/src/Grav/Framework/Psr7/Traits/RequestDecoratorTrait.php
index ab1ffadcfe..49f2a928ad 100644
--- a/system/src/Grav/Framework/Psr7/Traits/RequestDecoratorTrait.php
+++ b/system/src/Grav/Framework/Psr7/Traits/RequestDecoratorTrait.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
diff --git a/system/src/Grav/Framework/Psr7/Traits/ResponseDecoratorTrait.php b/system/src/Grav/Framework/Psr7/Traits/ResponseDecoratorTrait.php
index 32a1bfb9cc..4bbc73614a 100644
--- a/system/src/Grav/Framework/Psr7/Traits/ResponseDecoratorTrait.php
+++ b/system/src/Grav/Framework/Psr7/Traits/ResponseDecoratorTrait.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
diff --git a/system/src/Grav/Framework/Psr7/Traits/ServerRequestDecoratorTrait.php b/system/src/Grav/Framework/Psr7/Traits/ServerRequestDecoratorTrait.php
index f9297ddb43..9222219e7f 100644
--- a/system/src/Grav/Framework/Psr7/Traits/ServerRequestDecoratorTrait.php
+++ b/system/src/Grav/Framework/Psr7/Traits/ServerRequestDecoratorTrait.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,6 +13,10 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 
+/**
+ * Trait ServerRequestDecoratorTrait
+ * @package Grav\Framework\Psr7\Traits
+ */
 trait ServerRequestDecoratorTrait
 {
     use RequestDecoratorTrait;
@@ -101,6 +105,10 @@ public function withAttribute($name, $value)
         return $new;
     }
 
+    /**
+     * @param array $attributes
+     * @return ServerRequestInterface
+     */
     public function withAttributes(array $attributes)
     {
         $new = clone $this;
diff --git a/system/src/Grav/Framework/Psr7/Traits/StreamDecoratorTrait.php b/system/src/Grav/Framework/Psr7/Traits/StreamDecoratorTrait.php
index f61ea4ba7c..448323fdbf 100644
--- a/system/src/Grav/Framework/Psr7/Traits/StreamDecoratorTrait.php
+++ b/system/src/Grav/Framework/Psr7/Traits/StreamDecoratorTrait.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,6 +13,10 @@
 
 use Psr\Http\Message\StreamInterface;
 
+/**
+ * Trait StreamDecoratorTrait
+ * @package Grav\Framework\Psr7\Traits
+ */
 trait StreamDecoratorTrait
 {
     /** @var StreamInterface */
@@ -26,6 +30,10 @@ public function __toString(): string
         return $this->stream->__toString();
     }
 
+    /**
+     * @return void
+     */
+    #[\ReturnTypeWillChange]
     public function __destruct()
     {
         $this->stream->close();
diff --git a/system/src/Grav/Framework/Psr7/Traits/UploadedFileDecoratorTrait.php b/system/src/Grav/Framework/Psr7/Traits/UploadedFileDecoratorTrait.php
index 677c4d27e4..eec3add23c 100644
--- a/system/src/Grav/Framework/Psr7/Traits/UploadedFileDecoratorTrait.php
+++ b/system/src/Grav/Framework/Psr7/Traits/UploadedFileDecoratorTrait.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,36 +14,58 @@
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
 
+/**
+ * Trait UploadedFileDecoratorTrait
+ * @package Grav\Framework\Psr7\Traits
+ */
 trait UploadedFileDecoratorTrait
 {
     /** @var UploadedFileInterface */
     protected $uploadedFile;
 
+    /**
+     * @return StreamInterface
+     */
     public function getStream(): StreamInterface
     {
         return $this->uploadedFile->getStream();
     }
 
+    /**
+     * @param string $targetPath
+     */
     public function moveTo($targetPath): void
     {
         $this->uploadedFile->moveTo($targetPath);
     }
 
+    /**
+     * @return int|null
+     */
     public function getSize(): ?int
     {
         return $this->uploadedFile->getSize();
     }
 
+    /**
+     * @return int
+     */
     public function getError(): int
     {
         return $this->uploadedFile->getError();
     }
 
+    /**
+     * @return string|null
+     */
     public function getClientFilename(): ?string
     {
         return $this->uploadedFile->getClientFilename();
     }
 
+    /**
+     * @return string|null
+     */
     public function getClientMediaType(): ?string
     {
         return $this->uploadedFile->getClientMediaType();
diff --git a/system/src/Grav/Framework/Psr7/Traits/UriDecorationTrait.php b/system/src/Grav/Framework/Psr7/Traits/UriDecorationTrait.php
index 9e7946a2a4..73adb6470a 100644
--- a/system/src/Grav/Framework/Psr7/Traits/UriDecorationTrait.php
+++ b/system/src/Grav/Framework/Psr7/Traits/UriDecorationTrait.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,116 +13,176 @@
 
 use Psr\Http\Message\UriInterface;
 
+/**
+ * Trait UriDecorationTrait
+ * @package Grav\Framework\Psr7\Traits
+ */
 trait UriDecorationTrait
 {
     /** @var UriInterface */
     protected $uri;
 
+    /**
+     * @return string
+     */
     public function __toString(): string
     {
         return $this->uri->__toString();
     }
 
+    /**
+     * @return string
+     */
     public function getScheme(): string
     {
         return $this->uri->getScheme();
     }
 
+    /**
+     * @return string
+     */
     public function getAuthority(): string
     {
         return $this->uri->getAuthority();
     }
 
+    /**
+     * @return string
+     */
     public function getUserInfo(): string
     {
         return $this->uri->getUserInfo();
     }
 
+    /**
+     * @return string
+     */
     public function getHost(): string
     {
         return $this->uri->getHost();
     }
 
+    /**
+     * @return int|null
+     */
     public function getPort(): ?int
     {
         return $this->uri->getPort();
     }
 
+    /**
+     * @return string
+     */
     public function getPath(): string
     {
         return $this->uri->getPath();
     }
 
+    /**
+     * @return string
+     */
     public function getQuery(): string
     {
         return $this->uri->getQuery();
     }
 
+    /**
+     * @return string
+     */
     public function getFragment(): string
     {
         return $this->uri->getFragment();
     }
 
+    /**
+     * @param string $scheme
+     * @return UriInterface
+     */
     public function withScheme($scheme): UriInterface
     {
-        /** @var UriInterface|UriDecorationTrait $new */
         $new = clone $this;
         $new->uri = $this->uri->withScheme($scheme);
 
+        /** @var UriInterface $new */
         return $new;
     }
 
+    /**
+     * @param string $user
+     * @param string|null $password
+     * @return UriInterface
+     */
     public function withUserInfo($user, $password = null): UriInterface
     {
-        /** @var UriInterface|UriDecorationTrait $new */
         $new = clone $this;
         $new->uri = $this->uri->withUserInfo($user, $password);
 
+        /** @var UriInterface $new */
         return $new;
     }
 
+    /**
+     * @param string $host
+     * @return UriInterface
+     */
     public function withHost($host): UriInterface
     {
-        /** @var UriInterface|UriDecorationTrait $new */
         $new = clone $this;
         $new->uri = $this->uri->withHost($host);
 
+        /** @var UriInterface $new */
         return $new;
     }
 
+    /**
+     * @param int|null $port
+     * @return UriInterface
+     */
     public function withPort($port): UriInterface
     {
-        /** @var UriInterface|UriDecorationTrait $new */
         $new = clone $this;
         $new->uri = $this->uri->withPort($port);
 
+        /** @var UriInterface $new */
         return $new;
     }
 
+    /**
+     * @param string $path
+     * @return UriInterface
+     */
     public function withPath($path): UriInterface
     {
-        /** @var UriInterface|UriDecorationTrait $new */
         $new = clone $this;
         $new->uri = $this->uri->withPath($path);
 
+        /** @var UriInterface $new */
         return $new;
     }
 
+    /**
+     * @param string $query
+     * @return UriInterface
+     */
     public function withQuery($query): UriInterface
     {
-        /** @var UriInterface|UriDecorationTrait $new */
         $new = clone $this;
         $new->uri = $this->uri->withQuery($query);
 
+        /** @var UriInterface $new */
         return $new;
     }
 
+    /**
+     * @param string $fragment
+     * @return UriInterface
+     */
     public function withFragment($fragment): UriInterface
     {
-        /** @var UriInterface|UriDecorationTrait $new */
         $new = clone $this;
         $new->uri = $this->uri->withFragment($fragment);
 
+        /** @var UriInterface $new */
         return $new;
     }
 }
diff --git a/system/src/Grav/Framework/Psr7/UploadedFile.php b/system/src/Grav/Framework/Psr7/UploadedFile.php
index d6b062fd7e..c3ed62e69e 100644
--- a/system/src/Grav/Framework/Psr7/UploadedFile.php
+++ b/system/src/Grav/Framework/Psr7/UploadedFile.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -15,10 +15,17 @@
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
 
+/**
+ * Class UploadedFile
+ * @package Grav\Framework\Psr7
+ */
 class UploadedFile implements UploadedFileInterface
 {
     use UploadedFileDecoratorTrait;
 
+    /** @var array */
+    private $meta = [];
+
     /**
      * @param StreamInterface|string|resource $streamOrFile
      * @param int                             $size
@@ -30,4 +37,34 @@ public function __construct($streamOrFile, $size, $errorStatus, $clientFilename
     {
         $this->uploadedFile = new \Nyholm\Psr7\UploadedFile($streamOrFile, $size, $errorStatus, $clientFilename, $clientMediaType);
     }
+
+    /**
+     * @param array $meta
+     * @return $this
+     */
+    public function setMeta(array $meta)
+    {
+        $this->meta = $meta;
+
+        return $this;
+    }
+
+    /**
+     * @param array $meta
+     * @return $this
+     */
+    public function addMeta(array $meta)
+    {
+        $this->meta = array_merge($this->meta, $meta);
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMeta(): array
+    {
+        return $this->meta;
+    }
 }
diff --git a/system/src/Grav/Framework/Psr7/Uri.php b/system/src/Grav/Framework/Psr7/Uri.php
index 28614ca8ae..63fe04eff1 100644
--- a/system/src/Grav/Framework/Psr7/Uri.php
+++ b/system/src/Grav/Framework/Psr7/Uri.php
@@ -5,7 +5,7 @@
 /**
  * @package    Grav\Framework\Psr7
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -16,13 +16,14 @@
 use GuzzleHttp\Psr7\Uri as GuzzleUri;
 use Psr\Http\Message\UriInterface;
 
+/**
+ * Class Uri
+ * @package Grav\Framework\Psr7
+ */
 class Uri implements UriInterface
 {
     use UriDecorationTrait;
 
-    /** @var array Array of Uri query. */
-    private $queryParams;
-
     public function __construct(string $uri = '')
     {
         $this->uri = new \Nyholm\Psr7\Uri($uri);
diff --git a/system/src/Grav/Framework/Relationships/Relationships.php b/system/src/Grav/Framework/Relationships/Relationships.php
new file mode 100644
index 0000000000..6485682048
--- /dev/null
+++ b/system/src/Grav/Framework/Relationships/Relationships.php
@@ -0,0 +1,217 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Relationships;
+
+use Grav\Framework\Contracts\Object\IdentifierInterface;
+use Grav\Framework\Contracts\Relationships\RelationshipInterface;
+use Grav\Framework\Contracts\Relationships\RelationshipsInterface;
+use Grav\Framework\Flex\FlexIdentifier;
+use RuntimeException;
+use function count;
+
+/**
+ * Class Relationships
+ *
+ * @template T of \Grav\Framework\Contracts\Object\IdentifierInterface
+ * @template P of \Grav\Framework\Contracts\Object\IdentifierInterface
+ * @implements RelationshipsInterface<T,P>
+ */
+class Relationships implements RelationshipsInterface
+{
+    /** @var P */
+    protected $parent;
+    /** @var array */
+    protected $options;
+
+    /** @var RelationshipInterface<T,P>[] */
+    protected $relationships;
+
+    /**
+     * Relationships constructor.
+     * @param P $parent
+     * @param array $options
+     */
+    public function __construct(IdentifierInterface $parent, array $options)
+    {
+        $this->parent = $parent;
+        $this->options = $options;
+        $this->relationships = [];
+    }
+
+    /**
+     * @return bool
+     * @phpstan-pure
+     */
+    public function isModified(): bool
+    {
+        return !empty($this->getModified());
+    }
+
+    /**
+     * @return RelationshipInterface<T,P>[]
+     * @phpstan-pure
+     */
+    public function getModified(): array
+    {
+        $list = [];
+        foreach ($this->relationships as $name => $relationship) {
+            if ($relationship->isModified()) {
+                $list[$name] = $relationship;
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * @return int
+     * @phpstan-pure
+     */
+    public function count(): int
+    {
+        return count($this->options);
+    }
+
+    /**
+     * @param string $offset
+     * @return bool
+     * @phpstan-pure
+     */
+    public function offsetExists($offset): bool
+    {
+        return isset($this->options[$offset]);
+    }
+
+    /**
+     * @param string $offset
+     * @return RelationshipInterface<T,P>|null
+     */
+    public function offsetGet($offset): ?RelationshipInterface
+    {
+        if (!isset($this->relationships[$offset])) {
+            $options = $this->options[$offset] ?? null;
+            if (null === $options) {
+                return null;
+            }
+
+            $this->relationships[$offset] = $this->createRelationship($offset, $options);
+        }
+
+        return $this->relationships[$offset];
+    }
+
+    /**
+     * @param string $offset
+     * @param mixed $value
+     * @return never-return
+     */
+    public function offsetSet($offset, $value)
+    {
+        throw new RuntimeException('Setting relationship is not supported', 500);
+    }
+
+    /**
+     * @param string $offset
+     * @return never-return
+     */
+    public function offsetUnset($offset)
+    {
+        throw new RuntimeException('Removing relationship is not allowed', 500);
+    }
+
+    /**
+     * @return RelationshipInterface<T,P>|null
+     */
+    public function current(): ?RelationshipInterface
+    {
+        $name = key($this->options);
+        if ($name === null) {
+            return null;
+        }
+
+        return $this->offsetGet($name);
+    }
+
+    /**
+     * @return string
+     * @phpstan-pure
+     */
+    public function key(): string
+    {
+        return key($this->options);
+    }
+
+    /**
+     * @return void
+     * @phpstan-pure
+     */
+    public function next(): void
+    {
+        next($this->options);
+    }
+
+    /**
+     * @return void
+     * @phpstan-pure
+     */
+    public function rewind(): void
+    {
+        reset($this->options);
+    }
+
+    /**
+     * @return bool
+     * @phpstan-pure
+     */
+    public function valid(): bool
+    {
+        return key($this->options) !== null;
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize(): array
+    {
+        $list = [];
+        foreach ($this as $name => $relationship) {
+            $list[$name] = $relationship->jsonSerialize();
+        }
+
+        return $list;
+    }
+
+    /**
+     * @param string $name
+     * @param array $options
+     * @return ToOneRelationship|ToManyRelationship
+     */
+    private function createRelationship(string $name, array $options): RelationshipInterface
+    {
+        $data = null;
+
+        $parent = $this->parent;
+        if ($parent instanceof FlexIdentifier) {
+            $object = $parent->getObject();
+            if (!method_exists($object, 'initRelationship')) {
+                throw new RuntimeException(sprintf('Bad relationship %s', $name), 500);
+            }
+
+            $data = $object->initRelationship($name);
+        }
+
+        $cardinality = $options['cardinality'] ?? '';
+        switch ($cardinality) {
+            case 'to-one':
+                $relationship = new ToOneRelationship($parent, $name, $options, $data);
+                break;
+            case 'to-many':
+                $relationship = new ToManyRelationship($parent, $name, $options, $data ?? []);
+                break;
+            default:
+                throw new RuntimeException(sprintf('Bad relationship cardinality %s', $cardinality), 500);
+        }
+
+        return $relationship;
+    }
+}
diff --git a/system/src/Grav/Framework/Relationships/ToManyRelationship.php b/system/src/Grav/Framework/Relationships/ToManyRelationship.php
new file mode 100644
index 0000000000..3ea501b29c
--- /dev/null
+++ b/system/src/Grav/Framework/Relationships/ToManyRelationship.php
@@ -0,0 +1,259 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Relationships;
+
+use ArrayIterator;
+use Grav\Framework\Compat\Serializable;
+use Grav\Framework\Contracts\Object\IdentifierInterface;
+use Grav\Framework\Contracts\Relationships\ToManyRelationshipInterface;
+use Grav\Framework\Relationships\Traits\RelationshipTrait;
+use function count;
+use function is_callable;
+
+/**
+ * Class ToManyRelationship
+ *
+ * @template T of IdentifierInterface
+ * @template P of IdentifierInterface
+ * @template-implements ToManyRelationshipInterface<T,P>
+ */
+class ToManyRelationship implements ToManyRelationshipInterface
+{
+    /** @template-use RelationshipTrait<T> */
+    use RelationshipTrait;
+    use Serializable;
+
+    /** @var IdentifierInterface[] */
+    protected $identifiers = [];
+
+    /**
+     * ToManyRelationship constructor.
+     * @param string $name
+     * @param IdentifierInterface $parent
+     * @param iterable<IdentifierInterface> $identifiers
+     */
+    public function __construct(IdentifierInterface $parent, string $name, array $options, iterable $identifiers = [])
+    {
+        $this->parent = $parent;
+        $this->name = $name;
+
+        $this->parseOptions($options);
+        $this->addIdentifiers($identifiers);
+
+        $this->modified = false;
+    }
+
+    /**
+     * @return string
+     * @phpstan-pure
+     */
+    public function getCardinality(): string
+    {
+        return 'to-many';
+    }
+
+    /**
+     * @return int
+     * @phpstan-pure
+     */
+    public function count(): int
+    {
+        return count($this->identifiers);
+    }
+
+    /**
+     * @return array
+     */
+    public function fetch(): array
+    {
+        $list = [];
+        foreach ($this->identifiers as $identifier) {
+            if (is_callable([$identifier, 'getObject'])) {
+                $identifier = $identifier->getObject();
+            }
+            $list[] = $identifier;
+        }
+
+        return $list;
+    }
+
+    /**
+     * @param string $id
+     * @param string|null $type
+     * @return bool
+     * @phpstan-pure
+     */
+    public function has(string $id, string $type = null): bool
+    {
+        return $this->getIdentifier($id, $type) !== null;
+    }
+
+    /**
+     * @param positive-int $pos
+     * @return IdentifierInterface|null
+     */
+    public function getNthIdentifier(int $pos): ?IdentifierInterface
+    {
+        $items = array_keys($this->identifiers);
+        $key = $items[$pos - 1] ?? null;
+        if (null === $key) {
+            return null;
+        }
+
+        return $this->identifiers[$key] ?? null;
+    }
+
+    /**
+     * @param string $id
+     * @param string|null $type
+     * @return IdentifierInterface|null
+     * @phpstan-pure
+     */
+    public function getIdentifier(string $id, string $type = null): ?IdentifierInterface
+    {
+        if (null === $type) {
+            $type = $this->getType();
+        }
+
+        if ($type === 'media' && !str_contains($id, '/')) {
+            $name = $this->name;
+            $id = $this->parent->getType() . '/' . $this->parent->getId() . '/'. $name . '/' . $id;
+        }
+
+        $key = "{$type}/{$id}";
+
+        return $this->identifiers[$key] ?? null;
+    }
+
+    /**
+     * @param string $id
+     * @param string|null $type
+     * @return T|null
+     */
+    public function getObject(string $id, string $type = null): ?object
+    {
+        $identifier = $this->getIdentifier($id, $type);
+        if ($identifier && is_callable([$identifier, 'getObject'])) {
+            $identifier = $identifier->getObject();
+        }
+
+        return $identifier;
+    }
+
+    /**
+     * @param IdentifierInterface $identifier
+     * @return bool
+     */
+    public function addIdentifier(IdentifierInterface $identifier): bool
+    {
+        return $this->addIdentifiers([$identifier]);
+    }
+
+    /**
+     * @param IdentifierInterface|null $identifier
+     * @return bool
+     */
+    public function removeIdentifier(IdentifierInterface $identifier = null): bool
+    {
+        return !$identifier || $this->removeIdentifiers([$identifier]);
+    }
+
+    /**
+     * @param iterable<IdentifierInterface> $identifiers
+     * @return bool
+     */
+    public function addIdentifiers(iterable $identifiers): bool
+    {
+        foreach ($identifiers as $identifier) {
+            $type = $identifier->getType();
+            $id = $identifier->getId();
+            $key = "{$type}/{$id}";
+
+            $this->identifiers[$key] = $this->checkIdentifier($identifier);
+            $this->modified = true;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param iterable<IdentifierInterface> $identifiers
+     * @return bool
+     */
+    public function replaceIdentifiers(iterable $identifiers): bool
+    {
+        $this->identifiers = [];
+        $this->modified = true;
+
+        return $this->addIdentifiers($identifiers);
+    }
+
+    /**
+     * @param iterable<IdentifierInterface> $identifiers
+     * @return bool
+     */
+    public function removeIdentifiers(iterable $identifiers): bool
+    {
+        foreach ($identifiers as $identifier) {
+            $type = $identifier->getType();
+            $id = $identifier->getId();
+            $key = "{$type}/{$id}";
+
+            unset($this->identifiers[$key]);
+            $this->modified = true;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return iterable<IdentifierInterface>
+     * @phpstan-pure
+     */
+    public function getIterator(): iterable
+    {
+        return new ArrayIterator($this->identifiers);
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize(): array
+    {
+        $list = [];
+        foreach ($this->getIterator() as $item) {
+            $list[] = $item->jsonSerialize();
+        }
+
+        return $list;
+    }
+
+    /**
+     * @return array
+     */
+    public function __serialize(): array
+    {
+        return [
+            'parent' => $this->parent,
+            'name' => $this->name,
+            'type' => $this->type,
+            'options' => $this->options,
+            'modified' => $this->modified,
+            'identifiers' => $this->identifiers,
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    public function __unserialize(array $data): void
+    {
+        $this->parent = $data['parent'];
+        $this->name = $data['name'];
+        $this->type = $data['type'];
+        $this->options = $data['options'];
+        $this->modified = $data['modified'];
+        $this->identifiers = $data['identifiers'];
+    }
+}
diff --git a/system/src/Grav/Framework/Relationships/ToOneRelationship.php b/system/src/Grav/Framework/Relationships/ToOneRelationship.php
new file mode 100644
index 0000000000..9b09651430
--- /dev/null
+++ b/system/src/Grav/Framework/Relationships/ToOneRelationship.php
@@ -0,0 +1,207 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Relationships;
+
+use ArrayIterator;
+use Grav\Framework\Compat\Serializable;
+use Grav\Framework\Contracts\Object\IdentifierInterface;
+use Grav\Framework\Contracts\Relationships\ToOneRelationshipInterface;
+use Grav\Framework\Relationships\Traits\RelationshipTrait;
+use function is_callable;
+
+/**
+ * Class ToOneRelationship
+ *
+ * @template T of IdentifierInterface
+ * @template P of IdentifierInterface
+ * @template-implements ToOneRelationshipInterface<T,P>
+ */
+class ToOneRelationship implements ToOneRelationshipInterface
+{
+    /** @template-use RelationshipTrait<T> */
+    use RelationshipTrait;
+    use Serializable;
+
+    /** @var IdentifierInterface|null */
+    protected $identifier = null;
+
+    public function __construct(IdentifierInterface $parent, string $name, array $options, IdentifierInterface $identifier = null)
+    {
+        $this->parent = $parent;
+        $this->name = $name;
+
+        $this->parseOptions($options);
+        $this->replaceIdentifier($identifier);
+
+        $this->modified = false;
+    }
+
+    /**
+     * @return string
+     * @phpstan-pure
+     */
+    public function getCardinality(): string
+    {
+        return 'to-one';
+    }
+
+    /**
+     * @return int
+     * @phpstan-pure
+     */
+    public function count(): int
+    {
+        return $this->identifier ? 1 : 0;
+    }
+
+    /**
+     * @return object|null
+     */
+    public function fetch(): ?object
+    {
+        $identifier = $this->identifier;
+        if (is_callable([$identifier, 'getObject'])) {
+            $identifier = $identifier->getObject();
+        }
+
+        return $identifier;
+    }
+
+
+    /**
+     * @param string|null $id
+     * @param string|null $type
+     * @return bool
+     * @phpstan-pure
+     */
+    public function has(string $id = null, string $type = null): bool
+    {
+        return $this->getIdentifier($id, $type) !== null;
+    }
+
+    /**
+     * @param string|null $id
+     * @param string|null $type
+     * @return IdentifierInterface|null
+     * @phpstan-pure
+     */
+    public function getIdentifier(string $id = null, string $type = null): ?IdentifierInterface
+    {
+        if ($id && $this->getType() === 'media' && !str_contains($id, '/')) {
+            $name = $this->name;
+            $id = $this->parent->getType() . '/' . $this->parent->getId() . '/'. $name . '/' . $id;
+        }
+
+        $identifier = $this->identifier ?? null;
+        if (null === $identifier || ($type && $type !== $identifier->getType()) || ($id && $id !== $identifier->getId())) {
+            return null;
+        }
+
+        return $identifier;
+    }
+
+    /**
+     * @param string|null $id
+     * @param string|null $type
+     * @return T|null
+     */
+    public function getObject(string $id = null, string $type = null): ?object
+    {
+        $identifier = $this->getIdentifier($id, $type);
+        if ($identifier && is_callable([$identifier, 'getObject'])) {
+            $identifier = $identifier->getObject();
+        }
+
+        return $identifier;
+    }
+
+    /**
+     * @param IdentifierInterface $identifier
+     * @return bool
+     */
+    public function addIdentifier(IdentifierInterface $identifier): bool
+    {
+        $this->identifier = $this->checkIdentifier($identifier);
+        $this->modified = true;
+
+        return true;
+    }
+
+    /**
+     * @param IdentifierInterface|null $identifier
+     * @return bool
+     */
+    public function replaceIdentifier(IdentifierInterface $identifier = null): bool
+    {
+        if ($identifier === null) {
+            $this->identifier = null;
+            $this->modified = true;
+
+            return true;
+        }
+
+        return $this->addIdentifier($identifier);
+    }
+
+    /**
+     * @param IdentifierInterface|null $identifier
+     * @return bool
+     */
+    public function removeIdentifier(IdentifierInterface $identifier = null): bool
+    {
+        if (null === $identifier || $this->has($identifier->getId(), $identifier->getType())) {
+            $this->identifier = null;
+            $this->modified = true;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return iterable<IdentifierInterface>
+     * @phpstan-pure
+     */
+    public function getIterator(): iterable
+    {
+        return new ArrayIterator((array)$this->identifier);
+    }
+
+    /**
+     * @return array|null
+     */
+    public function jsonSerialize(): ?array
+    {
+        return $this->identifier ? $this->identifier->jsonSerialize() : null;
+    }
+
+    /**
+     * @return array
+     */
+    public function __serialize(): array
+    {
+        return [
+            'parent' => $this->parent,
+            'name' => $this->name,
+            'type' => $this->type,
+            'options' => $this->options,
+            'modified' => $this->modified,
+            'identifier' => $this->identifier,
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    public function __unserialize(array $data): void
+    {
+        $this->parent = $data['parent'];
+        $this->name = $data['name'];
+        $this->type = $data['type'];
+        $this->options = $data['options'];
+        $this->modified = $data['modified'];
+        $this->identifier = $data['identifier'];
+    }
+}
diff --git a/system/src/Grav/Framework/Relationships/Traits/RelationshipTrait.php b/system/src/Grav/Framework/Relationships/Traits/RelationshipTrait.php
new file mode 100644
index 0000000000..dbe146fcc3
--- /dev/null
+++ b/system/src/Grav/Framework/Relationships/Traits/RelationshipTrait.php
@@ -0,0 +1,128 @@
+<?php declare(strict_types=1);
+
+namespace Grav\Framework\Relationships\Traits;
+
+use Grav\Framework\Contracts\Object\IdentifierInterface;
+use Grav\Framework\Flex\FlexIdentifier;
+use Grav\Framework\Media\MediaIdentifier;
+use Grav\Framework\Object\Identifiers\Identifier;
+use RuntimeException;
+use function get_class;
+
+/**
+ * Trait RelationshipTrait
+ *
+ * @template T of object
+ */
+trait RelationshipTrait
+{
+    /** @var IdentifierInterface */
+    protected $parent;
+    /** @var string */
+    protected $name;
+    /** @var string */
+    protected $type;
+    /** @var array */
+    protected $options;
+    /** @var bool */
+    protected $modified = false;
+
+    /**
+     * @return string
+     * @phpstan-pure
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     * @phpstan-pure
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return bool
+     * @phpstan-pure
+     */
+    public function isModified(): bool
+    {
+        return $this->modified;
+    }
+
+    /**
+     * @return IdentifierInterface
+     * @phpstan-pure
+     */
+    public function getParent(): IdentifierInterface
+    {
+        return $this->parent;
+    }
+
+    /**
+     * @param IdentifierInterface $identifier
+     * @return bool
+     * @phpstan-pure
+     */
+    public function hasIdentifier(IdentifierInterface $identifier): bool
+    {
+        return $this->getIdentifier($identifier->getId(), $identifier->getType()) !== null;
+    }
+
+    /**
+     * @return int
+     * @phpstan-pure
+     */
+    abstract public function count(): int;
+
+    /**
+     * @return void
+     * @phpstan-pure
+     */
+    public function check(): void
+    {
+        $min = $this->options['min'] ?? 0;
+        $max = $this->options['max'] ?? 0;
+
+        if ($min || $max) {
+            $count = $this->count();
+            if ($min && $count < $min) {
+                throw new RuntimeException(sprintf('%s relationship has too few objects in it', $this->name));
+            }
+            if ($max && $count > $max) {
+                throw new RuntimeException(sprintf('%s relationship has too many objects in it', $this->name));
+            }
+        }
+    }
+
+    /**
+     * @param IdentifierInterface $identifier
+     * @return IdentifierInterface
+     */
+    private function checkIdentifier(IdentifierInterface $identifier): IdentifierInterface
+    {
+        if ($this->type !== $identifier->getType()) {
+            throw new RuntimeException(sprintf('Bad identifier type %s', $identifier->getType()));
+        }
+
+        if (get_class($identifier) !== Identifier::class) {
+            return $identifier;
+        }
+
+        if ($this->type === 'media') {
+            return new MediaIdentifier($identifier->getId());
+        }
+
+        return new FlexIdentifier($identifier->getId(), $identifier->getType());
+    }
+
+    private function parseOptions(array $options): void
+    {
+        $this->type = $options['type'];
+        $this->options = $options;
+    }
+}
diff --git a/system/src/Grav/Framework/RequestHandler/Exception/InvalidArgumentException.php b/system/src/Grav/Framework/RequestHandler/Exception/InvalidArgumentException.php
index 4cacd711dc..2456ea1f59 100644
--- a/system/src/Grav/Framework/RequestHandler/Exception/InvalidArgumentException.php
+++ b/system/src/Grav/Framework/RequestHandler/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\RequestHandler
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,11 +13,13 @@
 
 use Throwable;
 
+/**
+ * Class InvalidArgumentException
+ * @package Grav\Framework\RequestHandler\Exception
+ */
 class InvalidArgumentException extends \InvalidArgumentException
 {
-    /**
-     * @var mixed|null
-     */
+    /** @var mixed|null */
     private $invalidMiddleware;
 
     /**
diff --git a/system/src/Grav/Framework/RequestHandler/Exception/NotFoundException.php b/system/src/Grav/Framework/RequestHandler/Exception/NotFoundException.php
index 5e8d22a0ed..ce79ab2ac8 100644
--- a/system/src/Grav/Framework/RequestHandler/Exception/NotFoundException.php
+++ b/system/src/Grav/Framework/RequestHandler/Exception/NotFoundException.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\RequestHandler
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,28 +12,26 @@
 namespace Grav\Framework\RequestHandler\Exception;
 
 use Psr\Http\Message\ServerRequestInterface;
+use Throwable;
+use function in_array;
 
+/**
+ * Class NotFoundException
+ * @package Grav\Framework\RequestHandler\Exception
+ */
 class NotFoundException extends RequestException
 {
-    /** @var ServerRequestInterface */
-    private $request;
-
     /**
      * NotFoundException constructor.
      * @param ServerRequestInterface $request
-     * @param \Throwable|null $previous
+     * @param Throwable|null $previous
      */
-    public function __construct(ServerRequestInterface $request, \Throwable $previous = null)
+    public function __construct(ServerRequestInterface $request, Throwable $previous = null)
     {
-        if (\in_array(strtoupper($request->getMethod()), ['PUT', 'PATCH', 'DELETE'])) {
+        if (in_array(strtoupper($request->getMethod()), ['PUT', 'PATCH', 'DELETE'])) {
             parent::__construct($request, 'Method Not Allowed', 405, $previous);
         } else {
             parent::__construct($request, 'Not Found', 404, $previous);
         }
     }
-
-    public function getRequest(): ServerRequestInterface
-    {
-        return $this->request;
-    }
 }
diff --git a/system/src/Grav/Framework/RequestHandler/Exception/NotHandledException.php b/system/src/Grav/Framework/RequestHandler/Exception/NotHandledException.php
index 6696013964..7b4a0e7d37 100644
--- a/system/src/Grav/Framework/RequestHandler/Exception/NotHandledException.php
+++ b/system/src/Grav/Framework/RequestHandler/Exception/NotHandledException.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\RequestHandler
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,6 +11,10 @@
 
 namespace Grav\Framework\RequestHandler\Exception;
 
+/**
+ * Class NotHandledException
+ * @package Grav\Framework\RequestHandler\Exception
+ */
 class NotHandledException extends NotFoundException
 {
 }
diff --git a/system/src/Grav/Framework/RequestHandler/Exception/PageExpiredException.php b/system/src/Grav/Framework/RequestHandler/Exception/PageExpiredException.php
index 897e78a899..f75216722d 100644
--- a/system/src/Grav/Framework/RequestHandler/Exception/PageExpiredException.php
+++ b/system/src/Grav/Framework/RequestHandler/Exception/PageExpiredException.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\RequestHandler
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,15 +12,20 @@
 namespace Grav\Framework\RequestHandler\Exception;
 
 use Psr\Http\Message\ServerRequestInterface;
+use Throwable;
 
+/**
+ * Class PageExpiredException
+ * @package Grav\Framework\RequestHandler\Exception
+ */
 class PageExpiredException extends RequestException
 {
     /**
      * PageExpiredException constructor.
      * @param ServerRequestInterface $request
-     * @param \Throwable|null $previous
+     * @param Throwable|null $previous
      */
-    public function __construct(ServerRequestInterface $request, \Throwable $previous = null)
+    public function __construct(ServerRequestInterface $request, Throwable $previous = null)
     {
         parent::__construct($request, 'Page Expired', 400, $previous); // 419
     }
diff --git a/system/src/Grav/Framework/RequestHandler/Exception/RequestException.php b/system/src/Grav/Framework/RequestHandler/Exception/RequestException.php
index 02c613e084..678b26786f 100644
--- a/system/src/Grav/Framework/RequestHandler/Exception/RequestException.php
+++ b/system/src/Grav/Framework/RequestHandler/Exception/RequestException.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\RequestHandler
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,7 +12,12 @@
 namespace Grav\Framework\RequestHandler\Exception;
 
 use Psr\Http\Message\ServerRequestInterface;
+use Throwable;
 
+/**
+ * Class RequestException
+ * @package Grav\Framework\RequestHandler\Exception
+ */
 class RequestException extends \RuntimeException
 {
     /** @var array Map of standard HTTP status code/reason phrases */
@@ -66,9 +71,9 @@ class RequestException extends \RuntimeException
      * @param ServerRequestInterface $request
      * @param string $message
      * @param int $code
-     * @param \Throwable|null $previous
+     * @param Throwable|null $previous
      */
-    public function __construct(ServerRequestInterface $request, string $message, int $code = 500, \Throwable $previous = null)
+    public function __construct(ServerRequestInterface $request, string $message, int $code = 500, Throwable $previous = null)
     {
         $this->request = $request;
 
@@ -78,19 +83,19 @@ public function __construct(ServerRequestInterface $request, string $message, in
     /**
      * @return ServerRequestInterface
      */
-    public function getRequest() : ServerRequestInterface
+    public function getRequest(): ServerRequestInterface
     {
         return $this->request;
     }
 
-    public function getHttpCode() : int
+    public function getHttpCode(): int
     {
         $code = $this->getCode();
 
         return isset(self::$phrases[$code]) ? $code : 500;
     }
 
-    public function getHttpReason() : ?string
+    public function getHttpReason(): ?string
     {
         return self::$phrases[$this->getCode()] ?? self::$phrases[500];
     }
diff --git a/system/src/Grav/Framework/RequestHandler/Middlewares/Exceptions.php b/system/src/Grav/Framework/RequestHandler/Middlewares/Exceptions.php
index ec1de6d016..6c961d2167 100644
--- a/system/src/Grav/Framework/RequestHandler/Middlewares/Exceptions.php
+++ b/system/src/Grav/Framework/RequestHandler/Middlewares/Exceptions.php
@@ -1,44 +1,78 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * @package    Grav\Framework\RequestHandler
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
-declare(strict_types=1);
-
 namespace Grav\Framework\RequestHandler\Middlewares;
 
+use Grav\Common\Data\ValidationException;
+use Grav\Common\Debugger;
+use Grav\Common\Grav;
 use Grav\Framework\Psr7\Response;
+use JsonException;
+use JsonSerializable;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Throwable;
+use function get_class;
 
+/**
+ * Class Exceptions
+ * @package Grav\Framework\RequestHandler\Middlewares
+ */
 class Exceptions implements MiddlewareInterface
 {
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     * @throws JsonException
+     */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         try {
             return $handler->handle($request);
-        } catch (\Throwable $exception) {
+        } catch (Throwable $exception) {
+            $code = $exception->getCode();
+            if ($exception instanceof ValidationException) {
+                $message = $exception->getMessage();
+            } else {
+                $message = htmlspecialchars($exception->getMessage(), ENT_QUOTES | ENT_HTML5, 'UTF-8');
+            }
+
+            $extra = $exception instanceof JsonSerializable ? $exception->jsonSerialize() : [];
+
             $response = [
+                'code' => $code,
+                'status' => 'error',
+                'message' => $message,
                 'error' => [
-                    'type' => \get_class($exception),
-                    'code' => $exception->getCode(),
-                    'message' => $exception->getMessage(),
+                    'code' => $code,
+                    'message' => $message,
+                ] + $extra
+            ];
+
+            /** @var Debugger $debugger */
+            $debugger = Grav::instance()['debugger'];
+            if ($debugger->enabled()) {
+                $response['error'] += [
+                    'type' => get_class($exception),
                     'file' => $exception->getFile(),
                     'line' => $exception->getLine(),
                     'trace' => explode("\n", $exception->getTraceAsString()),
-                ]
-            ];
+                ];
+            }
 
             /** @var string $json */
-            $json = json_encode($response);
+            $json = json_encode($response, JSON_THROW_ON_ERROR);
 
-            return new Response($exception->getCode() ?: 500, ['Content-Type' => 'application/json'], $json);
+            return new Response($code ?: 500, ['Content-Type' => 'application/json'], $json);
         }
     }
 }
diff --git a/system/src/Grav/Framework/RequestHandler/Middlewares/MultipartRequestSupport.php b/system/src/Grav/Framework/RequestHandler/Middlewares/MultipartRequestSupport.php
new file mode 100644
index 0000000000..e59bc76135
--- /dev/null
+++ b/system/src/Grav/Framework/RequestHandler/Middlewares/MultipartRequestSupport.php
@@ -0,0 +1,123 @@
+<?php declare(strict_types=1);
+
+/**
+ * @package    Grav\Framework\RequestHandler
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\RequestHandler\Middlewares;
+
+use Grav\Framework\Psr7\UploadedFile;
+use Nyholm\Psr7\Stream;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\UploadedFileInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use function array_slice;
+use function count;
+use function in_array;
+use function is_array;
+use function strlen;
+
+/**
+ * Multipart request support for PUT and PATCH.
+ */
+class MultipartRequestSupport implements MiddlewareInterface
+{
+    /**
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $contentType = $request->getHeaderLine('content-type');
+        $method = $request->getMethod();
+        if (!str_starts_with($contentType, 'multipart/form-data') || !in_array($method, ['PUT', 'PATH'], true)) {
+            return $handler->handle($request);
+        }
+
+        $boundary = explode('; boundary=', $contentType, 2)[1] ?? '';
+        $parts = explode("--{$boundary}", $request->getBody()->getContents());
+        $parts = array_slice($parts, 1, count($parts) - 2);
+
+        $params = [];
+        $files = [];
+        foreach ($parts as $part) {
+            $this->processPart($params, $files, $part);
+        }
+
+        return $handler->handle($request->withParsedBody($params)->withUploadedFiles($files));
+    }
+
+    /**
+     * @param array $params
+     * @param array $files
+     * @param string $part
+     * @return void
+     */
+    protected function processPart(array &$params, array &$files, string $part): void
+    {
+        $part = ltrim($part, "\r\n");
+        [$rawHeaders, $body] = explode("\r\n\r\n", $part, 2);
+
+        // Parse headers.
+        $rawHeaders = explode("\r\n", $rawHeaders);
+        $headers = array_reduce(
+            $rawHeaders,
+            static function (array $headers, $header) {
+                [$name, $value] = explode(':', $header);
+                $headers[strtolower($name)] = ltrim($value, ' ');
+
+                return $headers;
+            },
+            []
+        );
+
+        if (!isset($headers['content-disposition'])) {
+            return;
+        }
+
+        // Parse content disposition header.
+        $contentDisposition = $headers['content-disposition'];
+        preg_match('/^(.+); *name="([^"]+)"(; *filename="([^"]+)")?/', $contentDisposition, $matches);
+        $name = $matches[2];
+        $filename = $matches[4] ?? null;
+
+        if ($filename !== null) {
+            $stream = Stream::create($body);
+            $this->addFile($files, $name, new UploadedFile($stream, strlen($body), UPLOAD_ERR_OK, $filename, $headers['content-type'] ?? null));
+        } elseif (strpos($contentDisposition, 'filename') !== false) {
+            // Not uploaded file.
+             $stream = Stream::create('');
+            $this->addFile($files, $name, new UploadedFile($stream, 0, UPLOAD_ERR_NO_FILE));
+        } else {
+            // Regular field.
+            $params[$name] = substr($body, 0, -2);
+        }
+    }
+
+    /**
+     * @param array $files
+     * @param string $name
+     * @param UploadedFileInterface $file
+     * @return void
+     */
+    protected function addFile(array &$files, string $name, UploadedFileInterface $file): void
+    {
+        if (strpos($name, '[]') === strlen($name) - 2) {
+            $name = substr($name, 0, -2);
+
+            if (isset($files[$name]) && is_array($files[$name])) {
+                $files[$name][] = $file;
+            } else {
+                $files[$name] = [$file];
+            }
+        } else {
+            $files[$name] = $file;
+        }
+    }
+}
diff --git a/system/src/Grav/Framework/RequestHandler/RequestHandler.php b/system/src/Grav/Framework/RequestHandler/RequestHandler.php
index c4d53873b9..2ce2427f45 100644
--- a/system/src/Grav/Framework/RequestHandler/RequestHandler.php
+++ b/system/src/Grav/Framework/RequestHandler/RequestHandler.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\RequestHandler
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,10 +12,16 @@
 namespace Grav\Framework\RequestHandler;
 
 use Grav\Framework\RequestHandler\Traits\RequestHandlerTrait;
+use Pimple\Container;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use function assert;
 
+/**
+ * Class RequestHandler
+ * @package Grav\Framework\RequestHandler
+ */
 class RequestHandler implements RequestHandlerInterface
 {
     use RequestHandlerTrait;
@@ -43,7 +49,11 @@ public function __construct(array $middleware, callable $default, ContainerInter
      */
     public function addCallable(string $name, callable $callable): self
     {
-        $this->container[$name] = $callable;
+        if (null !== $this->container) {
+            assert($this->container instanceof Container);
+            $this->container[$name] = $callable;
+        }
+
         array_unshift($this->middleware, $name);
 
         return $this;
@@ -58,9 +68,13 @@ public function addCallable(string $name, callable $callable): self
      */
     public function addMiddleware(string $name, MiddlewareInterface $middleware): self
     {
-        $this->container[$name] = $middleware;
+        if (null !== $this->container) {
+            assert($this->container instanceof Container);
+            $this->container[$name] = $middleware;
+        }
+
         array_unshift($this->middleware, $name);
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/system/src/Grav/Framework/RequestHandler/Traits/RequestHandlerTrait.php b/system/src/Grav/Framework/RequestHandler/Traits/RequestHandlerTrait.php
index 153d1a1607..6b4e5c768f 100644
--- a/system/src/Grav/Framework/RequestHandler/Traits/RequestHandlerTrait.php
+++ b/system/src/Grav/Framework/RequestHandler/Traits/RequestHandlerTrait.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\RequestHandler
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -16,17 +16,22 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
+use function call_user_func;
 
+/**
+ * Trait RequestHandlerTrait
+ * @package Grav\Framework\RequestHandler\Traits
+ */
 trait RequestHandlerTrait
 {
-    /** @var array<string|MiddlewareInterface> */
+    /** @var array<int,string|MiddlewareInterface> */
     protected $middleware;
 
     /** @var callable */
-    private $handler;
+    protected $handler;
 
     /** @var ContainerInterface|null */
-    private $container;
+    protected $container;
 
     /**
      * {@inheritdoc}
@@ -38,7 +43,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         // Use default callable if there is no middleware.
         if ($middleware === null) {
-            return \call_user_func($this->handler, $request);
+            return call_user_func($this->handler, $request);
         }
 
         if ($middleware instanceof MiddlewareInterface) {
@@ -56,4 +61,4 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
         return $this->handle($request);
     }
-}
\ No newline at end of file
+}
diff --git a/system/src/Grav/Framework/Route/Route.php b/system/src/Grav/Framework/Route/Route.php
index 58224fee74..d4d90780fa 100644
--- a/system/src/Grav/Framework/Route/Route.php
+++ b/system/src/Grav/Framework/Route/Route.php
@@ -3,13 +3,16 @@
 /**
  * @package    Grav\Framework\Route
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Route;
 
+use Grav\Framework\Uri\Uri;
 use Grav\Framework\Uri\UriFactory;
+use InvalidArgumentException;
+use function array_slice;
 
 /**
  * Implements Grav Route.
@@ -20,19 +23,14 @@ class Route
 {
     /** @var string */
     private $root = '';
-
     /** @var string */
     private $language = '';
-
     /** @var string */
     private $route = '';
-
     /** @var string */
     private $extension = '';
-
     /** @var array */
     private $gravParams = [];
-
     /** @var array */
     private $queryParams = [];
 
@@ -40,7 +38,7 @@ class Route
      * You can use `RouteFactory` functions to create new `Route` objects.
      *
      * @param array $parts
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function __construct(array $parts = [])
     {
@@ -74,6 +72,14 @@ public function getRootPrefix()
         return $this->root;
     }
 
+    /**
+     * @return string
+     */
+    public function getLanguage()
+    {
+        return $this->language;
+    }
+
     /**
      * @return string
      */
@@ -82,6 +88,25 @@ public function getLanguagePrefix()
         return $this->language !== '' ? '/' . $this->language : '';
     }
 
+    /**
+     * @param string|null $language
+     * @return string
+     */
+    public function getBase(string $language = null): string
+    {
+        $parts = [$this->root];
+
+        if (null === $language) {
+            $language = $this->language;
+        }
+
+        if ($language !== '') {
+            $parts[] = $language;
+        }
+
+        return implode('/', $parts);
+    }
+
     /**
      * @param int $offset
      * @param int|null $length
@@ -114,7 +139,7 @@ public function getRouteParts($offset = 0, $length = null)
         $parts = explode('/', $this->route);
 
         if ($offset !== 0 || $length !== null) {
-            $parts = \array_slice($parts, $offset, $length);
+            $parts = array_slice($parts, $offset, $length);
         }
 
         return $parts;
@@ -183,26 +208,40 @@ public function getQueryParam($param)
      * Allow the ability to set the route to something else
      *
      * @param string $route
-     * @return $this
+     * @return Route
      */
     public function withRoute($route)
     {
-        $this->route = $route;
+        $new = $this->copy();
+        $new->route = $route;
 
-        return $this;
+        return $new;
     }
 
     /**
      * Allow the ability to set the root to something else
      *
      * @param string $root
-     * @return $this
+     * @return Route
      */
     public function withRoot($root)
     {
-        $this->root = $root;
+        $new = $this->copy();
+        $new->root = $root;
+
+        return $new;
+    }
+
+    /**
+     * @param string|null $language
+     * @return Route
+     */
+    public function withLanguage($language)
+    {
+        $new = $this->copy();
+        $new->language = $language ?? '';
 
-        return $this;
+        return $new;
     }
 
     /**
@@ -211,9 +250,10 @@ public function withRoot($root)
      */
     public function withAddedPath($path)
     {
-        $this->route .= '/' . ltrim($path, '/');
+        $new = $this->copy();
+        $new->route .= '/' . ltrim($path, '/');
 
-        return $this;
+        return $new;
     }
 
     /**
@@ -222,9 +262,10 @@ public function withAddedPath($path)
      */
     public function withExtension($extension)
     {
-        $this->extension = $extension;
+        $new = $this->copy();
+        $new->extension = $extension;
 
-        return $this;
+        return $new;
     }
 
     /**
@@ -247,27 +288,38 @@ public function withQueryParam($param, $value)
         return $this->withParam('queryParams', $param, $value);
     }
 
+    /**
+     * @return Route
+     */
     public function withoutParams()
     {
         return $this->withoutGravParams()->withoutQueryParams();
     }
 
+    /**
+     * @return Route
+     */
     public function withoutGravParams()
     {
-        $this->gravParams = [];
+        $new = $this->copy();
+        $new->gravParams = [];
 
-        return $this;
+        return $new;
     }
 
+    /**
+     * @return Route
+     */
     public function withoutQueryParams()
     {
-        $this->queryParams = [];
+        $new = $this->copy();
+        $new->queryParams = [];
 
-        return $this;
+        return $new;
     }
 
     /**
-     * @return \Grav\Framework\Uri\Uri
+     * @return Uri
      */
     public function getUri()
     {
@@ -286,13 +338,14 @@ public function toString(bool $includeRoot = false)
             $url .= '?' . $this->getUriQuery();
         }
 
-        return $url;
+        return rtrim($url,'/');
     }
 
     /**
      * @return string
      * @deprecated 1.6 Use ->toString(true) or ->getUri() instead.
      */
+    #[\ReturnTypeWillChange]
     public function __toString()
     {
         user_error(__CLASS__ . '::' . __FUNCTION__ . '() will change in the future to return route, not relative url: use ->toString(true) or ->getUri() instead.', E_USER_DEPRECATED);
@@ -304,7 +357,7 @@ public function __toString()
      * @param string $type
      * @param string $param
      * @param mixed $value
-     * @return static
+     * @return Route
      */
     protected function withParam($type, $param, $value)
     {
@@ -327,6 +380,9 @@ protected function withParam($type, $param, $value)
         return $new;
     }
 
+    /**
+     * @return Route
+     */
     protected function copy()
     {
         return clone $this;
@@ -344,9 +400,8 @@ protected function getUriPath($includeRoot = false)
             $parts[] = $this->language;
         }
 
-        if ($this->route !== '') {
-            $parts[] = $this->extension ? $this->route . '.' . $this->extension : $this->route;
-        }
+        $parts[] = $this->extension ? $this->route . '.' . $this->extension : $this->route;
+
 
         if ($this->gravParams) {
             $parts[] = RouteFactory::buildParams($this->gravParams);
@@ -365,6 +420,7 @@ protected function getUriQuery()
 
     /**
      * @param array $parts
+     * @return void
      */
     protected function initParts(array $parts)
     {
@@ -374,9 +430,8 @@ protected function initParts(array $parts)
             $this->language = $gravParts['language'];
             $this->route = $gravParts['route'];
             $this->extension = $gravParts['extension'] ?? '';
-            $this->gravParams = $gravParts['params'] ?: [];
-            $this->queryParams = $parts['query_params'] ?: [];
-
+            $this->gravParams = $gravParts['params'] ?? [];
+            $this->queryParams = $parts['query_params'] ?? [];
         } else {
             $this->root = RouteFactory::getRoot();
             $this->language = RouteFactory::getLanguage();
diff --git a/system/src/Grav/Framework/Route/RouteFactory.php b/system/src/Grav/Framework/Route/RouteFactory.php
index 6b3414a484..fa1a76c303 100644
--- a/system/src/Grav/Framework/Route/RouteFactory.php
+++ b/system/src/Grav/Framework/Route/RouteFactory.php
@@ -3,12 +3,16 @@
 /**
  * @package    Grav\Framework\Route
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Route;
 
+use Grav\Common\Uri;
+use function dirname;
+use function strlen;
+
 /**
  * Class RouteFactory
  * @package Grav\Framework\Route
@@ -17,21 +21,52 @@ class RouteFactory
 {
     /** @var string */
     private static $root = '';
-
     /** @var string */
     private static $language = '';
-
     /** @var string */
     private static $delimiter = ':';
 
-    public static function createFromParts($parts)
+    /**
+     * @param array $parts
+     * @return Route
+     */
+    public static function createFromParts(array $parts): Route
     {
         return new Route($parts);
     }
 
-    public static function createFromString($path)
+    /**
+     * @param Uri $uri
+     * @return Route
+     */
+    public static function createFromLegacyUri(Uri $uri): Route
+    {
+        $parts = $uri->toArray();
+        $parts += [
+            'grav' => []
+        ];
+        $path = $parts['path'] ?? '';
+        $parts['grav'] += [
+            'root' => self::$root,
+            'language' => self::$language,
+            'route' => trim($path, '/'),
+            'params' => $parts['params'] ?? [],
+        ];
+
+        return static::createFromParts($parts);
+    }
+
+    /**
+     * @param string $path
+     * @return Route
+     */
+    public static function createFromString(string $path): Route
     {
         $path = ltrim($path, '/');
+        if (self::$language && mb_strpos($path, self::$language) === 0) {
+            $path = ltrim(mb_substr($path, mb_strlen(self::$language)), '/');
+        }
+
         $parts = [
             'path' => $path,
             'query' => '',
@@ -39,39 +74,58 @@ public static function createFromString($path)
             'grav' => [
                 'root' => self::$root,
                 'language' => self::$language,
-                'route' => $path,
-                'params' => ''
+                'route' => static::trimParams($path),
+                'params' => static::getParams($path)
             ],
         ];
+
         return new Route($parts);
     }
 
-    public static function getRoot()
+    /**
+     * @return string
+     */
+    public static function getRoot(): string
     {
         return self::$root;
     }
 
-    public static function setRoot($root)
+    /**
+     * @param string $root
+     */
+    public static function setRoot($root): void
     {
         self::$root = rtrim($root, '/');
     }
 
-    public static function getLanguage()
+    /**
+     * @return string
+     */
+    public static function getLanguage(): string
     {
         return self::$language;
     }
 
-    public static function setLanguage($language)
+    /**
+     * @param string $language
+     */
+    public static function setLanguage(string $language): void
     {
         self::$language = trim($language, '/');
     }
 
-    public static function getParamValueDelimiter()
+    /**
+     * @return string
+     */
+    public static function getParamValueDelimiter(): string
     {
         return self::$delimiter;
     }
 
-    public static function setParamValueDelimiter($delimiter)
+    /**
+     * @param string $delimiter
+     */
+    public static function setParamValueDelimiter(string $delimiter): void
     {
         self::$delimiter = $delimiter ?: ':';
     }
@@ -80,7 +134,7 @@ public static function setParamValueDelimiter($delimiter)
      * @param array $params
      * @return string
      */
-    public static function buildParams(array $params)
+    public static function buildParams(array $params): string
     {
         if (!$params) {
             return '';
@@ -101,7 +155,7 @@ public static function buildParams(array $params)
      * @param bool $decode
      * @return string
      */
-    public static function stripParams($path, $decode = false)
+    public static function stripParams(string $path, bool $decode = false): string
     {
         $pos = strpos($path, self::$delimiter);
 
@@ -109,7 +163,7 @@ public static function stripParams($path, $decode = false)
             return $path;
         }
 
-        $path = \dirname(substr($path, 0, $pos));
+        $path = dirname(substr($path, 0, $pos));
         if ($path === '.') {
             return '';
         }
@@ -121,18 +175,42 @@ public static function stripParams($path, $decode = false)
      * @param string $path
      * @return array
      */
-    public static function getParams($path)
+    public static function getParams(string $path): array
     {
-        $params = ltrim(substr($path, \strlen(static::stripParams($path))), '/');
+        $params = ltrim(substr($path, strlen(static::stripParams($path))), '/');
 
         return $params !== '' ? static::parseParams($params) : [];
     }
 
+    /**
+     * @param string $str
+     * @return string
+     */
+    public static function trimParams(string $str): string
+    {
+        if ($str === '') {
+            return $str;
+        }
+
+        $delimiter = self::$delimiter;
+
+        /** @var array $params */
+        $params = explode('/', $str);
+        $list = [];
+        foreach ($params as $param) {
+            if (mb_strpos($param, $delimiter) === false) {
+                $list[] = $param;
+            }
+        }
+
+        return implode('/', $list);
+    }
+
     /**
      * @param string $str
      * @return array
      */
-    public static function parseParams($str)
+    public static function parseParams(string $str): array
     {
         if ($str === '') {
             return [];
@@ -142,16 +220,17 @@ public static function parseParams($str)
 
         /** @var array $params */
         $params = explode('/', $str);
+        $list = [];
         foreach ($params as &$param) {
             /** @var array $parts */
             $parts = explode($delimiter, $param, 2);
             if (isset($parts[1])) {
                 $var = rawurldecode($parts[0]);
                 $val = rawurldecode($parts[1]);
-                $param = [$var => $val];
+                $list[$var] = $val;
             }
         }
 
-        return $params;
+        return $list;
     }
 }
diff --git a/system/src/Grav/Framework/Session/Exceptions/SessionException.php b/system/src/Grav/Framework/Session/Exceptions/SessionException.php
index 4caab82f6c..a07e87dc90 100644
--- a/system/src/Grav/Framework/Session/Exceptions/SessionException.php
+++ b/system/src/Grav/Framework/Session/Exceptions/SessionException.php
@@ -3,12 +3,18 @@
 /**
  * @package    Grav\Framework\Session
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
+
 namespace Grav\Framework\Session\Exceptions;
 
-class SessionException extends \RuntimeException
-{
+use RuntimeException;
 
+/**
+ * Class SessionException
+ * @package Grav\Framework\Session\Exceptions
+ */
+class SessionException extends RuntimeException
+{
 }
diff --git a/system/src/Grav/Framework/Session/Messages.php b/system/src/Grav/Framework/Session/Messages.php
new file mode 100644
index 0000000000..37c62a9af5
--- /dev/null
+++ b/system/src/Grav/Framework/Session/Messages.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * @package    Grav\Framework\Session
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Framework\Session;
+
+use Grav\Framework\Compat\Serializable;
+use function array_key_exists;
+
+/**
+ * Implements session messages.
+ */
+class Messages implements \Serializable
+{
+    use Serializable;
+
+    /** @var array */
+    protected $messages = [];
+    /** @var bool */
+    protected $isCleared = false;
+
+    /**
+     * Add message to the queue.
+     *
+     * @param string $message
+     * @param string $scope
+     * @return $this
+     */
+    public function add(string $message, string $scope = 'default'): Messages
+    {
+        $key = md5($scope . '~' . $message);
+        $item = ['message' => $message, 'scope' => $scope];
+
+        // don't add duplicates
+        if (!array_key_exists($key, $this->messages)) {
+            $this->messages[$key] = $item;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Clear message queue.
+     *
+     * @param string|null $scope
+     * @return $this
+     */
+    public function clear(string $scope = null): Messages
+    {
+        if ($scope === null) {
+            if ($this->messages !== []) {
+                $this->isCleared = true;
+                $this->messages = [];
+            }
+        } else {
+            foreach ($this->messages as $key => $message) {
+                if ($message['scope'] === $scope) {
+                    $this->isCleared = true;
+                    unset($this->messages[$key]);
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isCleared(): bool
+    {
+        return $this->isCleared;
+    }
+
+    /**
+     * Fetch all messages.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function all(string $scope = null): array
+    {
+        if ($scope === null) {
+            return array_values($this->messages);
+        }
+
+        $messages = [];
+        foreach ($this->messages as $message) {
+            if ($message['scope'] === $scope) {
+                $messages[] = $message;
+            }
+        }
+
+        return $messages;
+    }
+
+    /**
+     * Fetch and clear message queue.
+     *
+     * @param string|null $scope
+     * @return array
+     */
+    public function fetch(string $scope = null): array
+    {
+        $messages = $this->all($scope);
+        $this->clear($scope);
+
+        return $messages;
+    }
+
+    /**
+     * @return array
+     */
+    public function __serialize(): array
+    {
+        return [
+          'messages' => $this->messages
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    public function __unserialize(array $data): void
+    {
+        $this->messages = $data['messages'];
+    }
+}
diff --git a/system/src/Grav/Framework/Session/Session.php b/system/src/Grav/Framework/Session/Session.php
index fb676d4331..108563e37c 100644
--- a/system/src/Grav/Framework/Session/Session.php
+++ b/system/src/Grav/Framework/Session/Session.php
@@ -3,13 +3,22 @@
 /**
  * @package    Grav\Framework\Session
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Session;
 
+use ArrayIterator;
+use Exception;
+use Grav\Common\Debugger;
+use Grav\Common\Grav;
+use Grav\Common\User\Interfaces\UserInterface;
 use Grav\Framework\Session\Exceptions\SessionException;
+use RuntimeException;
+use function is_array;
+use function is_bool;
+use function is_string;
 
 /**
  * Class Session
@@ -17,16 +26,12 @@
  */
 class Session implements SessionInterface
 {
-    protected $options;
-
-    /**
-     * @var bool
-     */
+    /** @var array */
+    protected $options = [];
+    /** @var bool */
     protected $started = false;
 
-    /**
-     * @var Session
-     */
+    /** @var Session */
     protected static $instance;
 
     /**
@@ -35,12 +40,17 @@ class Session implements SessionInterface
     public static function getInstance()
     {
         if (null === self::$instance) {
-            throw new \RuntimeException("Session hasn't been initialized.", 500);
+            throw new RuntimeException("Session hasn't been initialized.", 500);
         }
 
         return self::$instance;
     }
 
+    /**
+     * Session constructor.
+     *
+     * @param array $options
+     */
     public function __construct(array $options = [])
     {
         // Session is a singleton.
@@ -51,7 +61,7 @@ public function __construct(array $options = [])
         }
 
         if (null !== self::$instance) {
-            throw new \RuntimeException('Session has already been initialized.', 500);
+            throw new RuntimeException('Session has already been initialized.', 500);
         }
 
         // Destroy any existing sessions started with session.auto_start
@@ -81,7 +91,7 @@ public function __construct(array $options = [])
      */
     public function getId()
     {
-        return session_id();
+        return session_id() ?: null;
     }
 
     /**
@@ -99,7 +109,7 @@ public function setId($id)
      */
     public function getName()
     {
-        return session_name();
+        return session_name() ?: null;
     }
 
     /**
@@ -137,6 +147,7 @@ public function setOptions(array $options)
             'use_strict_mode' => true,
             'use_cookies' => true,
             'use_only_cookies' => true,
+            'cookie_samesite' => true,
             'referer_check' => true,
             'cache_limiter' => true,
             'cache_expire' => true,
@@ -155,7 +166,7 @@ public function setOptions(array $options)
         ];
 
         foreach ($options as $key => $value) {
-            if (\is_array($value)) {
+            if (is_array($value)) {
                 // Allow nested options.
                 foreach ($value as $key2 => $value2) {
                     $ckey = "{$key}.{$key2}";
@@ -178,9 +189,17 @@ public function start($readonly = false)
             return $this;
         }
 
+        $sessionName = $this->getName();
+        if (null === $sessionName) {
+            return $this;
+        }
+
+        $sessionExists = isset($_COOKIE[$sessionName]);
+
         // Protection against invalid session cookie names throwing exception: http://php.net/manual/en/function.session-id.php#116836
-        if (isset($_COOKIE[session_name()]) && !preg_match('/^[-,a-zA-Z0-9]{1,128}$/', $_COOKIE[session_name()])) {
-            unset($_COOKIE[session_name()]);
+        if ($sessionExists && !preg_match('/^[-,a-zA-Z0-9]{1,128}$/', $_COOKIE[$sessionName])) {
+            unset($_COOKIE[$sessionName]);
+            $sessionExists = false;
         }
 
         $options = $this->options;
@@ -188,33 +207,130 @@ public function start($readonly = false)
             $options['read_and_close'] = '1';
         }
 
-        $success = @session_start($options);
-        $user = $success ? $this->__get('user') : null;
-        if (!$success) {
-            $last = error_get_last();
-            $error = $last ? $last['message'] : 'Unknown error';
+        try {
+            $success = @session_start($options);
+            if (!$success) {
+                $last = error_get_last();
+                $error = $last ? $last['message'] : 'Unknown error';
+
+                throw new RuntimeException($error);
+            }
+
+            // Handle changing session id.
+            if ($this->__isset('session_destroyed')) {
+                $newId = $this->__get('session_new_id');
+                if (!$newId || $this->__get('session_destroyed') < time() - 300) {
+                    // Should not happen usually. This could be attack or due to unstable network. Destroy this session.
+                    $this->invalidate();
+
+                    throw new RuntimeException('Obsolete session access.', 500);
+                }
+
+                // Not fully expired yet. Could be lost cookie by unstable network. Start session with new session id.
+                session_write_close();
+
+                // Start session with new session id.
+                $useStrictMode = $options['use_strict_mode'] ?? 0;
+                if ($useStrictMode) {
+                    ini_set('session.use_strict_mode', '0');
+                }
+                session_id($newId);
+                if ($useStrictMode) {
+                    ini_set('session.use_strict_mode', '1');
+                }
+
+                $success = @session_start($options);
+                if (!$success) {
+                    $last = error_get_last();
+                    $error = $last ? $last['message'] : 'Unknown error';
+
+                    throw new RuntimeException($error);
+                }
+            }
+        } catch (Exception $e) {
+            throw new SessionException('Failed to start session: ' . $e->getMessage(), 500);
+        }
+
+        $this->started = true;
+        $this->onSessionStart();
+
+        $user = $this->__get('user');
+        if ($user && (!$user instanceof UserInterface || (method_exists($user, 'isValid') && !$user->isValid()))) {
+            $this->invalidate();
 
-            throw new SessionException('Failed to start session: ' . $error, 500);
+            throw new SessionException('Invalid User object, session destroyed.', 500);
         }
 
-        if ($user && !$user->isValid()) {
-            $this->clear();
-            throw new SessionException('User Invalid', 500);
+        // Extend the lifetime of the session.
+        if ($sessionExists) {
+            $this->setCookie();
         }
 
-        $params = session_get_cookie_params();
+        return $this;
+    }
 
-        setcookie(
-            session_name(),
-            session_id(),
-            time() + $params['lifetime'],
-            $params['path'],
-            $params['domain'],
-            $params['secure'],
-            $params['httponly']
-        );
+    /**
+     * Regenerate session id but keep the current session information.
+     *
+     * Session id must be regenerated on login, logout or after long time has been passed.
+     *
+     * @return $this
+     * @since 1.7
+     */
+    public function regenerateId()
+    {
+        if (!$this->isSessionStarted()) {
+            return $this;
+        }
 
-        $this->started = true;
+        // TODO: session_create_id() segfaults in PHP 7.3 (PHP bug #73461), remove phpstan rule when removing this one.
+        if (PHP_VERSION_ID < 70400) {
+            $newId = 0;
+        } else {
+            // Session id creation may fail with some session storages.
+            $newId = @session_create_id() ?: 0;
+        }
+
+        // Set destroyed timestamp for the old session as well as pointer to the new id.
+        $this->__set('session_destroyed', time());
+        $this->__set('session_new_id', $newId);
+
+        // Keep the old session alive to avoid lost sessions by unstable network.
+        if (!$newId) {
+            /** @var Debugger $debugger */
+            $debugger = Grav::instance()['debugger'];
+            $debugger->addMessage('Session fixation lost session detection is turned of due to server limitations.', 'warning');
+
+            session_regenerate_id(false);
+        } else {
+            session_write_close();
+
+            // Start session with new session id.
+            $useStrictMode = $this->options['use_strict_mode'] ?? 0;
+            if ($useStrictMode) {
+                ini_set('session.use_strict_mode', '0');
+            }
+            session_id($newId);
+            if ($useStrictMode) {
+                ini_set('session.use_strict_mode', '1');
+            }
+
+            $this->removeCookie();
+
+            $success = @session_start($this->options);
+            if (!$success) {
+                $last = error_get_last();
+                $error = $last ? $last['message'] : 'Unknown error';
+
+                throw new RuntimeException($error);
+            }
+
+            $this->onSessionStart();
+        }
+
+        // New session does not have these.
+        $this->__unset('session_destroyed');
+        $this->__unset('session_new_id');
 
         return $this;
     }
@@ -224,16 +340,16 @@ public function start($readonly = false)
      */
     public function invalidate()
     {
-        $params = session_get_cookie_params();
-        setcookie(
-            session_name(),
-            '',
-            time() - 42000,
-            $params['path'],
-            $params['domain'],
-            $params['secure'],
-            $params['httponly']
-        );
+        $name = $this->getName();
+        if (null !== $name) {
+            $this->removeCookie();
+
+            setcookie(
+                $name,
+                '',
+                $this->getCookieOptions(-42000)
+            );
+        }
 
         if ($this->isSessionStarted()) {
             session_unset();
@@ -280,9 +396,10 @@ public function getAll()
     /**
      * @inheritdoc
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
-        return new \ArrayIterator($_SESSION);
+        return new ArrayIterator($_SESSION);
     }
 
     /**
@@ -296,6 +413,7 @@ public function isStarted()
     /**
      * @inheritdoc
      */
+    #[\ReturnTypeWillChange]
     public function __isset($name)
     {
         return isset($_SESSION[$name]);
@@ -304,6 +422,7 @@ public function __isset($name)
     /**
      * @inheritdoc
      */
+    #[\ReturnTypeWillChange]
     public function __get($name)
     {
         return $_SESSION[$name] ?? null;
@@ -312,6 +431,7 @@ public function __get($name)
     /**
      * @inheritdoc
      */
+    #[\ReturnTypeWillChange]
     public function __set($name, $value)
     {
         $_SESSION[$name] = $value;
@@ -320,6 +440,7 @@ public function __set($name, $value)
     /**
      * @inheritdoc
      */
+    #[\ReturnTypeWillChange]
     public function __unset($name)
     {
         unset($_SESSION[$name]);
@@ -335,14 +456,89 @@ protected function isSessionStarted()
         return \PHP_SAPI !== 'cli' ? \PHP_SESSION_ACTIVE === session_status() : false;
     }
 
+    protected function onSessionStart(): void
+    {
+    }
+
+    /**
+     * Store something in cookie temporarily.
+     *
+     * @param int|null $lifetime
+     * @return array
+     */
+    public function getCookieOptions(int $lifetime = null): array
+    {
+        $params = session_get_cookie_params();
+
+        return [
+            'expires'  => time() + ($lifetime ?? $params['lifetime']),
+            'path'     => $params['path'],
+            'domain'   => $params['domain'],
+            'secure'   => $params['secure'],
+            'httponly' => $params['httponly'],
+            'samesite' => $params['samesite']
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    protected function setCookie(): void
+    {
+        $this->removeCookie();
+
+        $sessionName = $this->getName();
+        $sessionId = $this->getId();
+        if (null === $sessionName || null === $sessionId) {
+            return;
+        }
+
+        setcookie(
+            $sessionName,
+            $sessionId,
+            $this->getCookieOptions()
+        );
+    }
+
+    protected function removeCookie(): void
+    {
+        $search = " {$this->getName()}=";
+        $cookies = [];
+        $found = false;
+
+        foreach (headers_list() as $header) {
+            // Identify cookie headers
+            if (strpos($header, 'Set-Cookie:') === 0) {
+                // Add all but session cookie(s).
+                if (!str_contains($header, $search)) {
+                    $cookies[] = $header;
+                } else {
+                    $found = true;
+                }
+            }
+        }
+
+        // Nothing to do.
+        if (false === $found) {
+            return;
+        }
+
+        // Remove all cookies and put back all but session cookie.
+        header_remove('Set-Cookie');
+        foreach($cookies as $cookie) {
+            header($cookie, false);
+        }
+    }
+
     /**
      * @param string $key
      * @param mixed $value
+     * @return void
      */
     protected function setOption($key, $value)
     {
-        if (!\is_string($value)) {
-            if (\is_bool($value)) {
+        if (!is_string($value)) {
+            if (is_bool($value)) {
                 $value = $value ? '1' : '0';
             } else {
                 $value = (string)$value;
diff --git a/system/src/Grav/Framework/Session/SessionInterface.php b/system/src/Grav/Framework/Session/SessionInterface.php
index 75df0e93e0..fa2873d9af 100644
--- a/system/src/Grav/Framework/Session/SessionInterface.php
+++ b/system/src/Grav/Framework/Session/SessionInterface.php
@@ -3,23 +3,28 @@
 /**
  * @package    Grav\Framework\Session
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Session;
 
+use ArrayIterator;
+use IteratorAggregate;
+use RuntimeException;
+
 /**
  * Class Session
  * @package Grav\Framework\Session
+ * @extends IteratorAggregate<array-key,mixed>
  */
-interface SessionInterface extends \IteratorAggregate
+interface SessionInterface extends IteratorAggregate
 {
     /**
      * Get current session instance.
      *
      * @return Session
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public static function getInstance();
 
@@ -34,7 +39,6 @@ public function getId();
      * Set session ID
      *
      * @param string $id Session ID
-     *
      * @return $this
      */
     public function setId($id);
@@ -50,7 +54,6 @@ public function getName();
      * Set session name
      *
      * @param string $name
-     *
      * @return $this
      */
     public function setName($name);
@@ -59,7 +62,7 @@ public function setName($name);
      * Sets session.* ini variables.
      *
      * @param array $options
-     *
+     * @return void
      * @see http://php.net/session.configuration
      */
     public function setOptions(array $options);
@@ -69,7 +72,7 @@ public function setOptions(array $options);
      *
      * @param bool $readonly
      * @return $this
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function start($readonly = false);
 
@@ -104,8 +107,10 @@ public function getAll();
     /**
      * Retrieve an external iterator
      *
-     * @return \ArrayIterator Return an ArrayIterator of $_SESSION
+     * @return ArrayIterator Return an ArrayIterator of $_SESSION
+     * @phpstan-return ArrayIterator<array-key,mixed>
      */
+    #[\ReturnTypeWillChange]
     public function getIterator();
 
     /**
@@ -121,6 +126,7 @@ public function isStarted();
      * @param string $name
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function __isset($name);
 
     /**
@@ -129,6 +135,7 @@ public function __isset($name);
      * @param string $name
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function __get($name);
 
     /**
@@ -136,13 +143,17 @@ public function __get($name);
      *
      * @param string $name
      * @param mixed  $value
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function __set($name, $value);
 
     /**
      * Removes session variable.
      *
      * @param string $name
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function __unset($name);
 }
diff --git a/system/src/Grav/Framework/Uri/Uri.php b/system/src/Grav/Framework/Uri/Uri.php
index 124de6c233..6355a1fc93 100644
--- a/system/src/Grav/Framework/Uri/Uri.php
+++ b/system/src/Grav/Framework/Uri/Uri.php
@@ -3,7 +3,7 @@
 /**
  * @package    Grav\Framework\Uri
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,6 +11,7 @@
 
 use Grav\Framework\Psr7\AbstractUri;
 use GuzzleHttp\Psr7\Uri as GuzzleUri;
+use InvalidArgumentException;
 use Psr\Http\Message\UriInterface;
 
 /**
@@ -27,7 +28,8 @@ class Uri extends AbstractUri
      * You can use `UriFactory` functions to create new `Uri` objects.
      *
      * @param array $parts
-     * @throws \InvalidArgumentException
+     * @return void
+     * @throws InvalidArgumentException
      */
     public function __construct(array $parts = [])
     {
diff --git a/system/src/Grav/Framework/Uri/UriFactory.php b/system/src/Grav/Framework/Uri/UriFactory.php
index e5cb1d319d..ebfec0356a 100644
--- a/system/src/Grav/Framework/Uri/UriFactory.php
+++ b/system/src/Grav/Framework/Uri/UriFactory.php
@@ -3,12 +3,15 @@
 /**
  * @package    Grav\Framework\Uri
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Uri;
 
+use InvalidArgumentException;
+use function is_string;
+
 /**
  * Class Uri
  * @package Grav\Framework\Uri
@@ -18,7 +21,7 @@ class UriFactory
     /**
      * @param array $env
      * @return Uri
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function createFromEnvironment(array $env)
     {
@@ -28,7 +31,7 @@ public static function createFromEnvironment(array $env)
     /**
      * @param string $uri
      * @return Uri
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function createFromString($uri)
     {
@@ -40,7 +43,7 @@ public static function createFromString($uri)
      *
      * @param array $parts
      * @return Uri
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function createFromParts(array $parts)
     {
@@ -50,7 +53,7 @@ public static function createFromParts(array $parts)
     /**
      * @param array $env
      * @return array
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function parseUrlFromEnvironment(array $env)
     {
@@ -112,23 +115,25 @@ public static function parseUrlFromEnvironment(array $env)
      *
      * @param string $url
      * @return array
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function parseUrl($url)
     {
-        if (!\is_string($url)) {
-            throw new \InvalidArgumentException('URL must be a string');
+        if (!is_string($url)) {
+            throw new InvalidArgumentException('URL must be a string');
         }
 
         $encodedUrl = preg_replace_callback(
             '%[^:/@?&=#]+%u',
-            function ($matches) { return rawurlencode($matches[0]); },
+            static function ($matches) {
+                return rawurlencode($matches[0]);
+            },
             $url
         );
 
-        $parts = \is_string($encodedUrl) ? parse_url($encodedUrl) : false;
+        $parts = is_string($encodedUrl) ? parse_url($encodedUrl) : false;
         if ($parts === false) {
-            throw new \InvalidArgumentException("Malformed URL: {$url}");
+            throw new InvalidArgumentException("Malformed URL: {$url}");
         }
 
         return $parts;
diff --git a/system/src/Grav/Framework/Uri/UriPartsFilter.php b/system/src/Grav/Framework/Uri/UriPartsFilter.php
index 51a971ab4b..260711bf49 100644
--- a/system/src/Grav/Framework/Uri/UriPartsFilter.php
+++ b/system/src/Grav/Framework/Uri/UriPartsFilter.php
@@ -3,12 +3,16 @@
 /**
  * @package    Grav\Framework\Uri
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Framework\Uri;
 
+use InvalidArgumentException;
+use function is_int;
+use function is_string;
+
 /**
  * Class Uri
  * @package Grav\Framework\Uri
@@ -20,12 +24,12 @@ class UriPartsFilter
     /**
      * @param string $scheme
      * @return string
-     * @throws \InvalidArgumentException If the scheme is invalid.
+     * @throws InvalidArgumentException If the scheme is invalid.
      */
     public static function filterScheme($scheme)
     {
-        if (!\is_string($scheme)) {
-            throw new \InvalidArgumentException('Uri scheme must be a string');
+        if (!is_string($scheme)) {
+            throw new InvalidArgumentException('Uri scheme must be a string');
         }
 
         return strtolower($scheme);
@@ -36,12 +40,12 @@ public static function filterScheme($scheme)
      *
      * @param string $info The raw user or password.
      * @return string The percent-encoded user or password string.
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function filterUserInfo($info)
     {
-        if (!\is_string($info)) {
-            throw new \InvalidArgumentException('Uri user info must be a string');
+        if (!is_string($info)) {
+            throw new InvalidArgumentException('Uri user info must be a string');
         }
 
         return preg_replace_callback(
@@ -56,18 +60,18 @@ function ($match) {
     /**
      * @param string $host
      * @return string
-     * @throws \InvalidArgumentException If the host is invalid.
+     * @throws InvalidArgumentException If the host is invalid.
      */
     public static function filterHost($host)
     {
-        if (!\is_string($host)) {
-            throw new \InvalidArgumentException('Uri host must be a string');
+        if (!is_string($host)) {
+            throw new InvalidArgumentException('Uri host must be a string');
         }
 
         if (filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
             $host = '[' . $host . ']';
         } elseif ($host && preg_match(static::HOSTNAME_REGEX, $host) !== 1) {
-            throw new \InvalidArgumentException('Uri host name validation failed');
+            throw new InvalidArgumentException('Uri host name validation failed');
         }
 
         return strtolower($host);
@@ -80,15 +84,15 @@ public static function filterHost($host)
      *
      * @param int|null $port
      * @return int|null
-     * @throws \InvalidArgumentException If the port is invalid.
+     * @throws InvalidArgumentException If the port is invalid.
      */
     public static function filterPort($port = null)
     {
-        if (null === $port || (\is_int($port) && ($port >= 0 && $port <= 65535))) {
+        if (null === $port || (is_int($port) && ($port >= 0 && $port <= 65535))) {
             return $port;
         }
 
-        throw new \InvalidArgumentException('Uri port must be null or an integer between 0 and 65535');
+        throw new InvalidArgumentException('Uri port must be null or an integer between 0 and 65535');
     }
 
     /**
@@ -99,13 +103,13 @@ public static function filterPort($port = null)
      *
      * @param  string $path The raw uri path.
      * @return string       The RFC 3986 percent-encoded uri path.
-     * @throws \InvalidArgumentException If the path is invalid.
+     * @throws InvalidArgumentException If the path is invalid.
      * @link   http://www.faqs.org/rfcs/rfc3986.html
      */
     public static function filterPath($path)
     {
-        if (!\is_string($path)) {
-            throw new \InvalidArgumentException('Uri path must be a string');
+        if (!is_string($path)) {
+            throw new InvalidArgumentException('Uri path must be a string');
         }
 
         return preg_replace_callback(
@@ -122,12 +126,12 @@ function ($match) {
      *
      * @param string $query The raw uri query string.
      * @return string The percent-encoded query string.
-     * @throws \InvalidArgumentException If the query is invalid.
+     * @throws InvalidArgumentException If the query is invalid.
      */
     public static function filterQueryOrFragment($query)
     {
-        if (!\is_string($query)) {
-            throw new \InvalidArgumentException('Uri query string and fragment must be a string');
+        if (!is_string($query)) {
+            throw new InvalidArgumentException('Uri query string and fragment must be a string');
         }
 
         return preg_replace_callback(
diff --git a/system/src/Grav/Installer/Install.php b/system/src/Grav/Installer/Install.php
index 5345ce3a0a..0f23e8963a 100644
--- a/system/src/Grav/Installer/Install.php
+++ b/system/src/Grav/Installer/Install.php
@@ -3,40 +3,51 @@
 /**
  * @package    Grav\Installer
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Installer;
 
 use Composer\Autoload\ClassLoader;
+use Exception;
 use Grav\Common\Cache;
 use Grav\Common\GPM\Installer;
 use Grav\Common\Grav;
 use Grav\Common\Plugins;
+use RuntimeException;
+use function class_exists;
+use function dirname;
+use function function_exists;
+use function is_string;
 
 /**
  * Grav installer.
  *
  * NOTE: This class can be initialized during upgrade from an older version of Grav. Make sure it runs there!
  */
-class Install
+final class Install
 {
-    private $requires = [
+    /** @var int Installer version. */
+    public $version = 1;
+
+    /** @var array */
+    public $requires = [
         'php' => [
             'name' => 'PHP',
             'versions' => [
-                '7.3' => '7.3.1',
-                '7.2' => '7.2.0',
-                '7.1' => '7.1.3',
-                '' => '7.2.14'
+                '8.1' => '8.1.0',
+                '8.0' => '8.0.0',
+                '7.4' => '7.4.1',
+                '7.3' => '7.3.6',
+                '' => '8.0.13'
             ]
         ],
         'grav' => [
             'name' => 'Grav',
             'versions' => [
-                '1.5' => '1.5.0',
-                '' => '1.5.7'
+                '1.6' => '1.6.0',
+                '' => '1.6.28'
             ]
         ],
         'plugins' => [
@@ -44,38 +55,42 @@ class Install
                 'name' => 'Admin',
                 'optional' => true,
                 'versions' => [
-                    '1.8' => '1.8.0',
-                    '' => '1.8.16'
+                    '1.9' => '1.9.0',
+                    '' => '1.9.13'
                 ]
             ],
             'email' => [
                 'name' => 'Email',
                 'optional' => true,
                 'versions' => [
-                    '2.7' => '2.7.0',
-                    '' => '2.7.2'
+                    '3.0' => '3.0.0',
+                    '' => '3.0.10'
                 ]
             ],
             'form' => [
                 'name' => 'Form',
                 'optional' => true,
                 'versions' => [
-                    '2.16' => '2.16.0',
-                    '' => '2.16.4'
+                    '4.1' => '4.1.0',
+                    '4.0' => '4.0.0',
+                    '3.0' => '3.0.0',
+                    '' => '4.1.2'
                 ]
             ],
             'login' => [
                 'name' => 'Login',
                 'optional' => true,
                 'versions' => [
-                    '2.8' => '2.8.0',
-                    '' => '2.8.3'
+                    '3.3' => '3.3.0',
+                    '3.0' => '3.0.0',
+                    '' => '3.3.6'
                 ]
             ],
         ]
     ];
 
-    private $ignores = [
+    /** @var array */
+    public $ignores = [
         'backup',
         'cache',
         'images',
@@ -86,15 +101,30 @@ class Install
         'robots.txt'
     ];
 
+    /** @var array */
     private $classMap = [
-        // 'Grav\\Installer\\Test' => __DIR__ . '/Test.php',
+        InstallException::class => __DIR__ . '/InstallException.php',
+        Versions::class => __DIR__ . '/Versions.php',
+        VersionUpdate::class => __DIR__ . '/VersionUpdate.php',
+        VersionUpdater::class => __DIR__ . '/VersionUpdater.php',
+        YamlUpdater::class => __DIR__ . '/YamlUpdater.php',
     ];
 
+    /** @var string|null */
     private $zip;
+
+    /** @var string|null */
     private $location;
 
+    /** @var VersionUpdater|null */
+    private $updater;
+
+    /** @var static */
     private static $instance;
 
+    /**
+     * @return static
+     */
     public static function instance()
     {
         if (null === self::$instance) {
@@ -108,13 +138,22 @@ private function __construct()
     {
     }
 
-    public function setZip(string $zip)
+    /**
+     * @param string|null $zip
+     * @return $this
+     */
+    public function setZip(?string $zip)
     {
         $this->zip = $zip;
 
         return $this;
     }
 
+    /**
+     * @param string|null $zip
+     * @return void
+     */
+    #[\ReturnTypeWillChange]
     public function __invoke(?string $zip)
     {
         $this->zip = $zip;
@@ -127,7 +166,19 @@ public function __invoke(?string $zip)
                 $error[] = "{$req['title']} >= <strong>v{$req['minimum']}</strong> required, you have <strong>v{$req['installed']}</strong>";
             }
 
-            throw new \RuntimeException(implode("<br />\n", $error));
+            $errors = implode("<br />\n", $error);
+            if (\defined('GRAV_CLI') && GRAV_CLI) {
+                $errors = "\n\n" . strip_tags($errors) . "\n\n";
+                $errors .= <<<ERR
+Please install Grav 1.6.31 first by running following commands:
+
+wget -q https://getgrav.org/download/core/grav-update/1.6.31 -O tmp/grav-update-v1.6.31.zip
+bin/gpm direct-install -y tmp/grav-update-v1.6.31.zip
+rm tmp/grav-update.zip
+ERR;
+            }
+
+            throw new RuntimeException($errors);
         }
 
         $this->prepare();
@@ -144,7 +195,7 @@ public function checkRequirements(): array
     {
         $results = [];
 
-        $this->checkVersion($results, 'php','php', $this->requires['php'], PHP_VERSION);
+        $this->checkVersion($results, 'php', 'php', $this->requires['php'], PHP_VERSION);
         $this->checkVersion($results, 'grav', 'grav', $this->requires['grav'], GRAV_VERSION);
         $this->checkPlugins($results, $this->requires['plugins']);
 
@@ -152,54 +203,71 @@ public function checkRequirements(): array
     }
 
     /**
-     * @throws \RuntimeException
+     * @return void
+     * @throws RuntimeException
      */
     public function prepare(): void
     {
         // Locate the new Grav update and the target site from the filesystem.
-        $location = dirname(realpath(__DIR__), 4);
-        $target = dirname(realpath(GRAV_ROOT . '/index.php'));
-        if ($location === $target) {
+        $location = realpath(__DIR__);
+        $target = realpath(GRAV_ROOT . '/index.php');
+
+        if (!$location) {
+            throw new RuntimeException('Internal Error', 500);
+        }
+
+        if ($target && dirname($location, 4) === dirname($target)) {
             // We cannot copy files into themselves, abort!
-            throw new \RuntimeException('Grav has already been installed here!', 400);
+            throw new RuntimeException('Grav has already been installed here!', 400);
         }
 
-        // Make sure that none of the Grav\Installer classes have been loaded, otherwise installation may fail!
+        // Load the installer classes.
         foreach ($this->classMap as $class_name => $path) {
-            if (\class_exists($class_name, false)) {
-                throw new \RuntimeException(sprintf('Cannot update Grav, class %s has already been loaded!', $class_name), 500);
+            // Make sure that none of the Grav\Installer classes have been loaded, otherwise installation may fail!
+            if (class_exists($class_name, false)) {
+                throw new RuntimeException(sprintf('Cannot update Grav, class %s has already been loaded!', $class_name), 500);
             }
+
+            require $path;
         }
 
-        $grav = Grav::instance();
+        $this->legacySupport();
 
-        /** @var ClassLoader $loader */
-        $loader = $grav['loader'];
+        $this->location = dirname($location, 4);
 
-        // Override Grav\Installer classes by using this version of Grav.
-        $loader->addClassMap($this->classMap);
+        $versions = Versions::instance(USER_DIR . 'config/versions.yaml');
+        $this->updater = new VersionUpdater('core/grav', __DIR__ . '/updates', $this->getVersion(), $versions);
 
-        $this->location = $location;
+        $this->updater->preflight();
     }
 
     /**
-     * @throws \RuntimeException
+     * @return void
+     * @throws RuntimeException
      */
     public function install(): void
     {
         if (!$this->location) {
-            throw new \RuntimeException('Oops, installer was run without prepare()!', 500);
+            throw new RuntimeException('Oops, installer was run without prepare()!', 500);
         }
 
         try {
+            if (null === $this->updater) {
+                $versions = Versions::instance(USER_DIR . 'config/versions.yaml');
+                $this->updater = new VersionUpdater('core/grav', __DIR__ . '/updates', $this->getVersion(), $versions);
+            }
+
+            // Update user/config/version.yaml before copying the files to avoid frontend from setting the version schema.
+            $this->updater->install();
+
             Installer::install(
-                $this->zip,
+                $this->zip ?? '',
                 GRAV_ROOT,
                 ['sophisticated' => true, 'overwrite' => true, 'ignore_symlinks' => true, 'ignores' => $this->ignores],
                 $this->location,
                 !($this->zip && is_file($this->zip))
             );
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Installer::setError($e->getMessage());
         }
 
@@ -208,16 +276,26 @@ public function install(): void
         $success = !(is_string($errorCode) || ($errorCode & (Installer::ZIP_OPEN_ERROR | Installer::ZIP_EXTRACT_ERROR)));
 
         if (!$success) {
-            throw new \RuntimeException(Installer::lastErrorMsg());
+            throw new RuntimeException(Installer::lastErrorMsg());
         }
     }
 
     /**
-     * @throws \RuntimeException
+     * @return void
+     * @throws RuntimeException
      */
     public function finalize(): void
     {
-        Cache::clearCache();
+        // Finalize can be run without installing Grav first.
+        if (null === $this->updater) {
+            $versions = Versions::instance(USER_DIR . 'config/versions.yaml');
+            $this->updater = new VersionUpdater('core/grav', __DIR__ . '/updates', GRAV_VERSION, $versions);
+            $this->updater->install();
+        }
+
+        $this->updater->postflight();
+
+        Cache::clearCache('all');
 
         clearstatcache();
         if (function_exists('opcache_reset')) {
@@ -225,6 +303,14 @@ public function finalize(): void
         }
     }
 
+    /**
+     * @param array $results
+     * @param string $type
+     * @param string $name
+     * @param array $check
+     * @param string|null $version
+     * @return void
+     */
     protected function checkVersion(array &$results, $type, $name, array $check, $version): void
     {
         if (null === $version && !empty($check['optional'])) {
@@ -234,11 +320,11 @@ protected function checkVersion(array &$results, $type, $name, array $check, $ve
         $major = $minor = 0;
         $versions = $check['versions'] ?? [];
         foreach ($versions as $major => $minor) {
-            if (!$major || version_compare($version, $major, '<')) {
+            if (!$major || version_compare($version ?? '0', $major, '<')) {
                 continue;
             }
 
-            if (version_compare($version, $minor, '>=')) {
+            if (version_compare($version ?? '0', $minor, '>=')) {
                 return;
             }
 
@@ -265,9 +351,14 @@ protected function checkVersion(array &$results, $type, $name, array $check, $ve
         ];
     }
 
+    /**
+     * @param array $results
+     * @param array $plugins
+     * @return void
+     */
     protected function checkPlugins(array &$results, array $plugins): void
     {
-        if (!\class_exists('Plugins')) {
+        if (!class_exists('Plugins')) {
             return;
         }
 
@@ -284,4 +375,26 @@ protected function checkPlugins(array &$results, array $plugins): void
             $this->checkVersion($results, 'plugin', $name, $check, $version);
         }
     }
-}
\ No newline at end of file
+
+    /**
+     * @return string
+     */
+    protected function getVersion(): string
+    {
+        $definesFile = "{$this->location}/system/defines.php";
+        $content = file_get_contents($definesFile);
+        if (false === $content) {
+            return '';
+        }
+
+        preg_match("/define\('GRAV_VERSION', '([^']+)'\);/mu", $content, $matches);
+
+        return $matches[1] ?? '';
+    }
+
+    protected function legacySupport(): void
+    {
+        // Support install for Grav 1.6.0 - 1.6.20 by loading the original class from the older version of Grav.
+        class_exists(\Grav\Console\Cli\CacheCommand::class, true);
+    }
+}
diff --git a/system/src/Grav/Installer/InstallException.php b/system/src/Grav/Installer/InstallException.php
new file mode 100644
index 0000000000..cdd5b7afa1
--- /dev/null
+++ b/system/src/Grav/Installer/InstallException.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @package    Grav\Installer
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Installer;
+
+use Throwable;
+
+/**
+ * Class InstallException
+ * @package Grav\Installer
+ */
+class InstallException extends \RuntimeException
+{
+    /**
+     * InstallException constructor.
+     * @param string $message
+     * @param Throwable $previous
+     */
+    public function __construct(string $message, Throwable $previous)
+    {
+        parent::__construct($message, $previous->getCode(), $previous);
+    }
+}
diff --git a/system/src/Grav/Installer/VersionUpdate.php b/system/src/Grav/Installer/VersionUpdate.php
new file mode 100644
index 0000000000..1fde78307b
--- /dev/null
+++ b/system/src/Grav/Installer/VersionUpdate.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Grav\Installer;
+
+use Closure;
+use Grav\Common\Utils;
+
+/**
+ * Class VersionUpdate
+ * @package Grav\Installer
+ */
+final class VersionUpdate
+{
+    /** @var string */
+    private $revision;
+    /** @var string */
+    private $version;
+    /** @var string */
+    private $date;
+    /** @var string */
+    private $patch;
+    /** @var VersionUpdater */
+    private $updater;
+    /** @var callable[] */
+    private $methods;
+
+    public function __construct(string $file, VersionUpdater $updater)
+    {
+        $name = basename($file, '.php');
+
+        $this->revision = $name;
+        [$this->version, $this->date, $this->patch] = explode('_', $name);
+        $this->updater = $updater;
+        $this->methods = require $file;
+    }
+
+    public function getRevision(): string
+    {
+        return $this->revision;
+    }
+
+    public function getVersion(): string
+    {
+        return $this->version;
+    }
+
+    public function getDate(): string
+    {
+        return $this->date;
+    }
+
+    public function getPatch(): string
+    {
+        return $this->patch;
+    }
+
+    public function getUpdater(): VersionUpdater
+    {
+        return $this->updater;
+    }
+
+    /**
+     * Run right before installation.
+     */
+    public function preflight(VersionUpdater $updater): void
+    {
+        $method = $this->methods['preflight'] ?? null;
+        if ($method instanceof Closure) {
+            $method->call($this);
+        }
+    }
+
+    /**
+     * Runs right after installation.
+     */
+    public function postflight(VersionUpdater $updater): void
+    {
+        $method = $this->methods['postflight'] ?? null;
+        if ($method instanceof Closure) {
+            $method->call($this);
+        }
+    }
+}
diff --git a/system/src/Grav/Installer/VersionUpdater.php b/system/src/Grav/Installer/VersionUpdater.php
new file mode 100644
index 0000000000..75a3b042fa
--- /dev/null
+++ b/system/src/Grav/Installer/VersionUpdater.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace Grav\Installer;
+
+use DirectoryIterator;
+
+/**
+ * Class VersionUpdater
+ * @package Grav\Installer
+ */
+final class VersionUpdater
+{
+    /** @var string */
+    private $name;
+    /** @var string */
+    private $path;
+    /** @var string */
+    private $version;
+    /** @var Versions */
+    private $versions;
+    /** @var VersionUpdate[] */
+    private $updates;
+
+    /**
+     * VersionUpdater constructor.
+     * @param string $name
+     * @param string $path
+     * @param string $version
+     * @param Versions $versions
+     */
+    public function __construct(string $name, string $path, string $version, Versions $versions)
+    {
+        $this->name = $name;
+        $this->path = $path;
+        $this->version = $version;
+        $this->versions = $versions;
+
+        $this->loadUpdates();
+    }
+
+    /**
+     * Pre-installation method.
+     */
+    public function preflight(): void
+    {
+        foreach ($this->updates as $revision => $update) {
+            $update->preflight($this);
+        }
+    }
+
+    /**
+     * Install method.
+     */
+    public function install(): void
+    {
+        $versions = $this->getVersions();
+        $versions->updateVersion($this->name, $this->version);
+        $versions->save();
+    }
+
+    /**
+     * Post-installation method.
+     */
+    public function postflight(): void
+    {
+        $versions = $this->getVersions();
+
+        foreach ($this->updates as $revision => $update) {
+            $update->postflight($this);
+
+            $versions->setSchema($this->name, $revision);
+            $versions->save();
+        }
+    }
+
+    /**
+     * @return Versions
+     */
+    public function getVersions(): Versions
+    {
+        return $this->versions;
+    }
+
+    /**
+     * @param string|null $name
+     * @return string|null
+     */
+    public function getExtensionVersion(string $name = null): ?string
+    {
+        return $this->versions->getVersion($name ?? $this->name);
+    }
+
+    /**
+     * @param string|null $name
+     * @return string|null
+     */
+    public function getExtensionSchema(string $name = null): ?string
+    {
+        return $this->versions->getSchema($name ?? $this->name);
+    }
+
+    /**
+     * @param string|null $name
+     * @return array
+     */
+    public function getExtensionHistory(string $name = null): array
+    {
+        return $this->versions->getHistory($name ?? $this->name);
+    }
+
+    protected function loadUpdates(): void
+    {
+        $this->updates = [];
+
+        $schema = $this->getExtensionSchema();
+        $iterator = new DirectoryIterator($this->path);
+        foreach ($iterator as $item) {
+            if (!$item->isFile() || $item->getExtension() !== 'php') {
+                continue;
+            }
+
+            $revision = $item->getBasename('.php');
+            if (!$schema || version_compare($revision, $schema, '>')) {
+                $realPath = $item->getRealPath();
+                if ($realPath) {
+                    $this->updates[$revision] = new VersionUpdate($realPath, $this);
+                }
+            }
+        }
+
+        uksort($this->updates, 'version_compare');
+    }
+}
diff --git a/system/src/Grav/Installer/Versions.php b/system/src/Grav/Installer/Versions.php
new file mode 100644
index 0000000000..92a64ced78
--- /dev/null
+++ b/system/src/Grav/Installer/Versions.php
@@ -0,0 +1,329 @@
+<?php
+
+/**
+ * @package    Grav\Installer
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Installer;
+
+use Symfony\Component\Yaml\Yaml;
+use function is_array;
+use function is_string;
+
+/**
+ * Grav Versions
+ *
+ * NOTE: This class can be initialized during upgrade from an older version of Grav. Make sure it runs there!
+ */
+final class Versions
+{
+    /** @var string */
+    protected $filename;
+    /** @var array */
+    protected $items;
+    /** @var bool */
+    protected $updated = false;
+
+    /** @var self[] */
+    protected static $instance;
+
+    /**
+     * @param string|null $filename
+     * @return self
+     */
+    public static function instance(string $filename = null): self
+    {
+        $filename = $filename ?? USER_DIR . 'config/versions.yaml';
+
+        if (!isset(self::$instance[$filename])) {
+            self::$instance[$filename] = new self($filename);
+        }
+
+        return self::$instance[$filename];
+    }
+
+    /**
+     * @return bool True if the file was updated.
+     */
+    public function save(): bool
+    {
+        if (!$this->updated) {
+            return false;
+        }
+
+        file_put_contents($this->filename, Yaml::dump($this->items, 4, 2));
+
+        $this->updated = false;
+
+        return true;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAll(): array
+    {
+        return $this->items;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getGrav(): ?array
+    {
+        return $this->get('core/grav');
+    }
+
+    /**
+     * @return array
+     */
+    public function getPlugins(): array
+    {
+        return $this->get('plugins', []);
+    }
+
+    /**
+     * @param string $name
+     * @return array|null
+     */
+    public function getPlugin(string $name): ?array
+    {
+        return $this->get("plugins/{$name}");
+    }
+
+    /**
+     * @return array
+     */
+    public function getThemes(): array
+    {
+        return $this->get('themes', []);
+    }
+
+    /**
+     * @param string $name
+     * @return array|null
+     */
+    public function getTheme(string $name): ?array
+    {
+        return $this->get("themes/{$name}");
+    }
+
+    /**
+     * @param string $extension
+     * @return array|null
+     */
+    public function getExtension(string $extension): ?array
+    {
+        return $this->get($extension);
+    }
+
+    /**
+     * @param string $extension
+     * @param array|null $value
+     */
+    public function setExtension(string $extension, ?array $value): void
+    {
+        if (null !== $value) {
+            $this->set($extension, $value);
+        } else {
+            $this->undef($extension);
+        }
+    }
+
+    /**
+     * @param string $extension
+     * @return string|null
+     */
+    public function getVersion(string $extension): ?string
+    {
+        $version = $this->get("{$extension}/version", null);
+
+        return is_string($version) ? $version : null;
+    }
+
+    /**
+     * @param string $extension
+     * @param string|null $version
+     */
+    public function setVersion(string $extension, ?string $version): void
+    {
+        $this->updateHistory($extension, $version);
+    }
+
+    /**
+     * NOTE: Updates also history.
+     *
+     * @param string $extension
+     * @param string|null $version
+     */
+    public function updateVersion(string $extension, ?string $version): void
+    {
+        $this->set("{$extension}/version", $version);
+        $this->updateHistory($extension, $version);
+    }
+
+    /**
+     * @param string $extension
+     * @return string|null
+     */
+    public function getSchema(string $extension): ?string
+    {
+        $version = $this->get("{$extension}/schema", null);
+
+        return is_string($version) ? $version : null;
+    }
+
+    /**
+     * @param string $extension
+     * @param string|null $schema
+     */
+    public function setSchema(string $extension, ?string $schema): void
+    {
+        if (null !== $schema) {
+            $this->set("{$extension}/schema", $schema);
+        } else {
+            $this->undef("{$extension}/schema");
+        }
+    }
+
+    /**
+     * @param string $extension
+     * @return array
+     */
+    public function getHistory(string $extension): array
+    {
+        $name = "{$extension}/history";
+        $history = $this->get($name, []);
+
+        // Fix for broken Grav 1.6 history
+        if ($extension === 'grav') {
+            $history = $this->fixHistory($history);
+        }
+
+        return $history;
+    }
+
+    /**
+     * @param string $extension
+     * @param string|null $version
+     */
+    public function updateHistory(string $extension, ?string $version): void
+    {
+        $name = "{$extension}/history";
+        $history = $this->getHistory($extension);
+        $history[] = ['version' => $version, 'date' => gmdate('Y-m-d H:i:s')];
+        $this->set($name, $history);
+    }
+
+    /**
+     * Clears extension history. Useful when creating skeletons.
+     *
+     * @param string $extension
+     */
+    public function removeHistory(string $extension): void
+    {
+        $this->undef("{$extension}/history");
+    }
+
+    /**
+     * @param array $history
+     * @return array
+     */
+    private function fixHistory(array $history): array
+    {
+        if (isset($history['version'], $history['date'])) {
+            $fix = [['version' => $history['version'], 'date' => $history['date']]];
+            unset($history['version'], $history['date']);
+            $history = array_merge($fix, $history);
+        }
+
+        return $history;
+    }
+
+    /**
+     * Get value by using dot notation for nested arrays/objects.
+     *
+     * @param string $name Slash separated path to the requested value.
+     * @param mixed $default Default value (or null).
+     * @return mixed Value.
+     */
+    private function get(string $name, $default = null)
+    {
+        $path = explode('/', $name);
+        $current = $this->items;
+
+        foreach ($path as $field) {
+            if (is_array($current) && isset($current[$field])) {
+                $current = $current[$field];
+            } else {
+                return $default;
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * Set value by using dot notation for nested arrays/objects.
+     *
+     * @param string $name Slash separated path to the requested value.
+     * @param mixed $value New value.
+     */
+    private function set(string $name, $value): void
+    {
+        $path = explode('/', $name);
+        $current = &$this->items;
+
+        foreach ($path as $field) {
+            // Handle arrays and scalars.
+            if (!is_array($current)) {
+                $current = [$field => []];
+            } elseif (!isset($current[$field])) {
+                $current[$field] = [];
+            }
+            $current = &$current[$field];
+        }
+
+        $current = $value;
+        $this->updated = true;
+    }
+
+    /**
+     * Unset value by using dot notation for nested arrays/objects.
+     *
+     * @param string $name Dot separated path to the requested value.
+     */
+    private function undef(string $name): void
+    {
+        $path = $name !== '' ? explode('/', $name) : [];
+        if (!$path) {
+            return;
+        }
+
+        $var = array_pop($path);
+        $current = &$this->items;
+
+        foreach ($path as $field) {
+            if (!is_array($current) || !isset($current[$field])) {
+                return;
+            }
+            $current = &$current[$field];
+        }
+
+        unset($current[$var]);
+        $this->updated = true;
+    }
+
+    private function __construct(string $filename)
+    {
+        $this->filename = $filename;
+        $content = is_file($filename) ? file_get_contents($filename) : null;
+        if (false === $content) {
+            throw new \RuntimeException('Versions file cannot be read');
+        }
+        $this->items = $content ? Yaml::parse($content) : [];
+    }
+}
diff --git a/system/src/Grav/Installer/YamlUpdater.php b/system/src/Grav/Installer/YamlUpdater.php
new file mode 100644
index 0000000000..fe1c7f1acf
--- /dev/null
+++ b/system/src/Grav/Installer/YamlUpdater.php
@@ -0,0 +1,431 @@
+<?php
+
+/**
+ * @package    Grav\Installer
+ *
+ * @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Installer;
+
+use Grav\Common\Utils;
+use Symfony\Component\Yaml\Yaml;
+use function assert;
+use function count;
+use function is_array;
+use function strlen;
+
+/**
+ * Grav YAML updater.
+ *
+ * NOTE: This class can be initialized during upgrade from an older version of Grav. Make sure it runs there!
+ */
+final class YamlUpdater
+{
+    /** @var string */
+    protected $filename;
+    /** @var string[]  */
+    protected $lines;
+    /** @var array */
+    protected $comments;
+    /** @var array */
+    protected $items;
+    /** @var bool */
+    protected $updated = false;
+
+    /** @var self[] */
+    protected static $instance;
+
+    public static function instance(string $filename): self
+    {
+        if (!isset(self::$instance[$filename])) {
+            self::$instance[$filename] = new self($filename);
+        }
+
+        return self::$instance[$filename];
+    }
+
+    /**
+     * @return bool
+     */
+    public function save(): bool
+    {
+        if (!$this->updated) {
+            return false;
+        }
+
+        try {
+            if (!$this->isHandWritten()) {
+                $yaml = Yaml::dump($this->items, 5, 2);
+            } else {
+                $yaml = implode("\n", $this->lines);
+
+                $items = Yaml::parse($yaml);
+                if ($items !== $this->items) {
+                    throw new \RuntimeException('Failed saving the content');
+                }
+            }
+
+            file_put_contents($this->filename, $yaml);
+
+        } catch (\Exception $e) {
+            throw new \RuntimeException('Failed to update ' . basename($this->filename) . ': ' . $e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isHandWritten(): bool
+    {
+        return !empty($this->comments);
+    }
+
+    /**
+     * @return array
+     */
+    public function getComments(): array
+    {
+        $comments = [];
+        foreach ($this->lines as $i => $line) {
+            if ($this->isLineEmpty($line)) {
+                $comments[$i+1] = $line;
+            } elseif ($comment = $this->getInlineComment($line)) {
+                $comments[$i+1] = $comment;
+            }
+        }
+
+        return $comments;
+    }
+
+    /**
+     * @param string $variable
+     * @param mixed $value
+     */
+    public function define(string $variable, $value): void
+    {
+        // If variable has already value, we're good.
+        if ($this->get($variable) !== null) {
+            return;
+        }
+
+        // If one of the parents isn't array, we're good, too.
+        if (!$this->canDefine($variable)) {
+            return;
+        }
+
+        $this->set($variable, $value);
+        if (!$this->isHandWritten()) {
+            return;
+        }
+
+        $parts = explode('.', $variable);
+
+        $lineNos = $this->findPath($this->lines, $parts);
+        $count = count($lineNos);
+        $last = array_key_last($lineNos);
+
+        $value = explode("\n", trim(Yaml::dump([$last => $this->get(implode('.', array_keys($lineNos)))], max(0, 5-$count), 2)));
+        $currentLine = array_pop($lineNos) ?: 0;
+        $parentLine = array_pop($lineNos);
+
+        if ($parentLine !== null) {
+            $c = $this->getLineIndentation($this->lines[$parentLine] ?? '');
+            $n = $this->getLineIndentation($this->lines[$parentLine+1] ?? $this->lines[$parentLine] ?? '');
+            $indent = $n > $c ? $n : $c + 2;
+        } else {
+            $indent = 0;
+            array_unshift($value, '');
+        }
+        $spaces = str_repeat(' ', $indent);
+        foreach ($value as &$line) {
+            $line = $spaces . $line;
+        }
+        unset($line);
+
+        array_splice($this->lines, abs($currentLine)+1, 0, $value);
+    }
+
+    public function undefine(string $variable): void
+    {
+        // If variable does not have value, we're good.
+        if ($this->get($variable) === null) {
+            return;
+        }
+
+        // If one of the parents isn't array, we're good, too.
+        if (!$this->canDefine($variable)) {
+            return;
+        }
+
+        $this->undef($variable);
+        if (!$this->isHandWritten()) {
+            return;
+        }
+
+        // TODO: support also removing property from handwritten configuration file.
+    }
+
+    private function __construct(string $filename)
+    {
+        $content = is_file($filename) ? (string)file_get_contents($filename) : '';
+        $content = rtrim(str_replace(["\r\n", "\r"], "\n", $content));
+
+        $this->filename = $filename;
+        $this->lines = explode("\n", $content);
+        $this->comments = $this->getComments();
+        $this->items = $content ? Yaml::parse($content) : [];
+    }
+
+    /**
+     * Return array of offsets for the parent nodes. Negative value means position, but not found.
+     *
+     * @param array $lines
+     * @param array $parts
+     * @return int[]
+     */
+    private function findPath(array $lines, array $parts)
+    {
+        $test = true;
+        $indent = -1;
+        $current = array_shift($parts);
+
+        $j = 1;
+        $found = [];
+        $space = '';
+        foreach ($lines as $i => $line) {
+            if ($this->isLineEmpty($line)) {
+                if ($this->isLineComment($line) && $this->getLineIndentation($line) > $indent) {
+                    $j = $i;
+                }
+                continue;
+            }
+
+            if ($test === true) {
+                $test = false;
+                $spaces = strlen($line) - strlen(ltrim($line, ' '));
+                if ($spaces <= $indent) {
+                    $found[$current] = -$j;
+
+                    return $found;
+                }
+
+                $indent = $spaces;
+                $space = $indent ? str_repeat(' ', $indent) : '';
+            }
+
+
+            if (0 === \strncmp($line, $space, strlen($space))) {
+                $pattern = "/^{$space}(['\"]?){$current}\\1\:/";
+
+                if (preg_match($pattern, $line)) {
+                    $found[$current] = $i;
+                    $current = array_shift($parts);
+                    if ($current === null) {
+                        return $found;
+                    }
+                    $test = true;
+                }
+            } else {
+                $found[$current] = -$j;
+
+                return $found;
+            }
+
+            $j = $i;
+        }
+
+        $found[$current] = -$j;
+
+        return $found;
+    }
+
+    /**
+     * Returns true if the current line is blank or if it is a comment line.
+     *
+     * @param string $line Contents of the line
+     * @return bool Returns true if the current line is empty or if it is a comment line, false otherwise
+     */
+    private function isLineEmpty(string $line): bool
+    {
+        return $this->isLineBlank($line) || $this->isLineComment($line);
+    }
+
+    /**
+     * Returns true if the current line is blank.
+     *
+     * @param string $line Contents of the line
+     * @return bool Returns true if the current line is blank, false otherwise
+     */
+    private function isLineBlank(string $line): bool
+    {
+        return '' === trim($line, ' ');
+    }
+
+    /**
+     * Returns true if the current line is a comment line.
+     *
+     * @param string $line Contents of the line
+     * @return bool Returns true if the current line is a comment line, false otherwise
+     */
+    private function isLineComment(string $line): bool
+    {
+        //checking explicitly the first char of the trim is faster than loops or strpos
+        $ltrimmedLine = ltrim($line, ' ');
+
+        return '' !== $ltrimmedLine && '#' === $ltrimmedLine[0];
+    }
+
+    /**
+     * @param string $line
+     * @return bool
+     */
+    private function isInlineComment(string $line): bool
+    {
+        return $this->getInlineComment($line) !== null;
+    }
+
+    /**
+     * @param string $line
+     * @return string|null
+     */
+    private function getInlineComment(string $line): ?string
+    {
+        $pos = strpos($line, ' #');
+        if (false === $pos) {
+            return null;
+        }
+
+        $parts = explode(' #', $line);
+        $part = '';
+        while ($part .= array_shift($parts)) {
+            // Remove quoted values.
+            $part = preg_replace('/(([\'"])[^\2]*\2)/', '', $part);
+            assert(null !== $part);
+            $part = preg_split('/[\'"]/', $part, 2);
+            assert(false !== $part);
+            if (!isset($part[1])) {
+                $part = $part[0];
+                array_unshift($parts, str_repeat(' ', strlen($part) - strlen(trim($part, ' '))));
+                break;
+            }
+            $part = $part[1];
+        }
+
+
+        return implode(' #', $parts);
+    }
+
+    /**
+     * Returns the current line indentation.
+     *
+     * @param string $line
+     * @return int The current line indentation
+     */
+    private function getLineIndentation(string $line): int
+    {
+        return \strlen($line) - \strlen(ltrim($line, ' '));
+    }
+
+    /**
+     * Get value by using dot notation for nested arrays/objects.
+     *
+     * @param string $name Dot separated path to the requested value.
+     * @param mixed $default Default value (or null).
+     * @return mixed Value.
+     */
+    private function get(string $name, $default = null)
+    {
+        $path = explode('.', $name);
+        $current = $this->items;
+
+        foreach ($path as $field) {
+            if (is_array($current) && isset($current[$field])) {
+                $current = $current[$field];
+            } else {
+                return $default;
+            }
+        }
+
+        return $current;
+    }
+
+    /**
+     * Set value by using dot notation for nested arrays/objects.
+     *
+     * @param string $name Dot separated path to the requested value.
+     * @param mixed $value New value.
+     */
+    private function set(string $name, $value): void
+    {
+        $path = explode('.', $name);
+        $current = &$this->items;
+
+        foreach ($path as $field) {
+            // Handle arrays and scalars.
+            if (!is_array($current)) {
+                $current = [$field => []];
+            } elseif (!isset($current[$field])) {
+                $current[$field] = [];
+            }
+            $current = &$current[$field];
+        }
+
+        $current = $value;
+        $this->updated = true;
+    }
+
+    /**
+     * Unset value by using dot notation for nested arrays/objects.
+     *
+     * @param string $name Dot separated path to the requested value.
+     */
+    private function undef(string $name): void
+    {
+        $path = $name !== '' ? explode('.', $name) : [];
+        if (!$path) {
+            return;
+        }
+
+        $var = array_pop($path);
+        $current = &$this->items;
+
+        foreach ($path as $field) {
+            if (!is_array($current) || !isset($current[$field])) {
+                return;
+            }
+            $current = &$current[$field];
+        }
+
+        unset($current[$var]);
+        $this->updated = true;
+    }
+
+    /**
+     * Get value by using dot notation for nested arrays/objects.
+     *
+     * @param string $name Dot separated path to the requested value.
+     * @return bool
+     */
+    private function canDefine(string $name): bool
+    {
+        $path = explode('.', $name);
+        $current = $this->items;
+
+        foreach ($path as $field) {
+            if (is_array($current)) {
+                if (!isset($current[$field])) {
+                    return true;
+                }
+                $current = $current[$field];
+            } else {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/system/src/Grav/Installer/updates/1.7.0_2020-11-20_1.php b/system/src/Grav/Installer/updates/1.7.0_2020-11-20_1.php
new file mode 100644
index 0000000000..61206652b9
--- /dev/null
+++ b/system/src/Grav/Installer/updates/1.7.0_2020-11-20_1.php
@@ -0,0 +1,24 @@
+<?php
+
+use Grav\Installer\InstallException;
+use Grav\Installer\VersionUpdate;
+use Grav\Installer\YamlUpdater;
+
+return [
+    'preflight' => null,
+    'postflight' =>
+        function () {
+            /** @var VersionUpdate $this */
+            try {
+                // Keep old defaults for backwards compatibility.
+                $yaml = YamlUpdater::instance(GRAV_ROOT . '/user/config/system.yaml');
+                $yaml->define('twig.autoescape', false);
+                $yaml->define('strict_mode.yaml_compat', true);
+                $yaml->define('strict_mode.twig_compat', true);
+                $yaml->define('strict_mode.blueprint_compat', true);
+                $yaml->save();
+            } catch (\Exception $e) {
+                throw new InstallException('Could not update system configuration to maintain backwards compatibility', $e);
+            }
+        }
+];
diff --git a/system/src/Twig/DeferredExtension/DeferredBlockNode.php b/system/src/Twig/DeferredExtension/DeferredBlockNode.php
new file mode 100755
index 0000000000..6ae974f88e
--- /dev/null
+++ b/system/src/Twig/DeferredExtension/DeferredBlockNode.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This file is part of the rybakit/twig-deferred-extension package.
+ *
+ * (c) Eugene Leonovich <gen.work@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Twig\DeferredExtension;
+
+use Twig\Compiler;
+use Twig\Node\BlockNode;
+
+final class DeferredBlockNode extends BlockNode
+{
+    public function compile(Compiler $compiler) : void
+    {
+        $name = $this->getAttribute('name');
+
+        $compiler
+            ->write("public function block_$name(\$context, array \$blocks = [])\n", "{\n")
+            ->indent()
+            ->write("\$this->deferred->defer(\$this, '$name');\n")
+            ->outdent()
+            ->write("}\n\n")
+        ;
+
+        $compiler
+            ->addDebugInfo($this)
+            ->write("public function block_{$name}_deferred(\$context, array \$blocks = [])\n", "{\n")
+            ->indent()
+            ->subcompile($this->getNode('body'))
+            ->write("\$this->deferred->resolve(\$this, \$context, \$blocks);\n")
+            ->outdent()
+            ->write("}\n\n")
+        ;
+    }
+}
diff --git a/system/src/Twig/DeferredExtension/DeferredExtension.php b/system/src/Twig/DeferredExtension/DeferredExtension.php
new file mode 100644
index 0000000000..f27c2a36f0
--- /dev/null
+++ b/system/src/Twig/DeferredExtension/DeferredExtension.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * This file is part of the rybakit/twig-deferred-extension package.
+ *
+ * (c) Eugene Leonovich <gen.work@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Twig\DeferredExtension;
+
+use Twig\Environment;
+use Twig\Extension\AbstractExtension;
+use Twig\Template;
+
+final class DeferredExtension extends AbstractExtension
+{
+    private $blocks = [];
+
+    public function getTokenParsers() : array
+    {
+        return [new DeferredTokenParser()];
+    }
+
+    public function getNodeVisitors() : array
+    {
+        if (Environment::VERSION_ID < 20000) {
+            // Twig 1.x support
+            return [new DeferredNodeVisitorCompat()];
+        }
+
+        return [new DeferredNodeVisitor()];
+    }
+
+    public function defer(Template $template, string $blockName) : void
+    {
+        $templateName = $template->getTemplateName();
+        $this->blocks[$templateName][] = $blockName;
+        $index = \count($this->blocks[$templateName]) - 1;
+
+        \ob_start(function (string $buffer) use ($index, $templateName) {
+            unset($this->blocks[$templateName][$index]);
+
+            return $buffer;
+        });
+    }
+
+    public function resolve(Template $template, array $context, array $blocks) : void
+    {
+        $templateName = $template->getTemplateName();
+        if (empty($this->blocks[$templateName])) {
+            return;
+        }
+
+        while ($blockName = \array_pop($this->blocks[$templateName])) {
+            $buffer = \ob_get_clean();
+
+            $blocks[$blockName] = [$template, 'block_'.$blockName.'_deferred'];
+            $template->displayBlock($blockName, $context, $blocks);
+
+            echo $buffer;
+        }
+
+        if ($parent = $template->getParent($context)) {
+            $this->resolve($parent, $context, $blocks);
+        }
+    }
+}
diff --git a/system/src/Twig/DeferredExtension/DeferredExtensionNode.php b/system/src/Twig/DeferredExtension/DeferredExtensionNode.php
new file mode 100644
index 0000000000..1b851b4c24
--- /dev/null
+++ b/system/src/Twig/DeferredExtension/DeferredExtensionNode.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of the rybakit/twig-deferred-extension package.
+ *
+ * (c) Eugene Leonovich <gen.work@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Twig\DeferredExtension;
+
+use Twig\Compiler;
+use Twig\Node\Node;
+
+final class DeferredExtensionNode extends Node
+{
+    public function compile(Compiler $compiler) : void
+    {
+        $compiler
+            ->write("\$this->deferred = \$this->env->getExtension('".DeferredExtension::class."');\n")
+        ;
+    }
+}
diff --git a/system/src/Twig/DeferredExtension/DeferredNode.php b/system/src/Twig/DeferredExtension/DeferredNode.php
new file mode 100755
index 0000000000..2ac73bd1f6
--- /dev/null
+++ b/system/src/Twig/DeferredExtension/DeferredNode.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of the rybakit/twig-deferred-extension package.
+ *
+ * (c) Eugene Leonovich <gen.work@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Twig\DeferredExtension;
+
+use Twig\Compiler;
+use Twig\Node\Node;
+
+final class DeferredNode extends Node
+{
+    public function compile(Compiler $compiler) : void
+    {
+        $compiler
+            ->write("\$this->deferred->resolve(\$this, \$context, \$blocks);\n")
+        ;
+    }
+}
diff --git a/system/src/Twig/DeferredExtension/DeferredNodeVisitor.php b/system/src/Twig/DeferredExtension/DeferredNodeVisitor.php
new file mode 100644
index 0000000000..aef7399439
--- /dev/null
+++ b/system/src/Twig/DeferredExtension/DeferredNodeVisitor.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * This file is part of the rybakit/twig-deferred-extension package.
+ *
+ * (c) Eugene Leonovich <gen.work@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Twig\DeferredExtension;
+
+use Twig\Environment;
+use Twig\Node\ModuleNode;
+use Twig\Node\Node;
+use Twig\NodeVisitor\NodeVisitorInterface;
+
+final class DeferredNodeVisitor implements NodeVisitorInterface
+{
+    private $hasDeferred = false;
+
+    public function enterNode(Node $node, Environment $env) : Node
+    {
+        if (!$this->hasDeferred && $node instanceof DeferredBlockNode) {
+            $this->hasDeferred = true;
+        }
+
+        return $node;
+    }
+
+    public function leaveNode(Node $node, Environment $env) : ?Node
+    {
+        if ($this->hasDeferred && $node instanceof ModuleNode) {
+            $node->setNode('constructor_end', new Node([new DeferredExtensionNode(), $node->getNode('constructor_end')]));
+            $node->setNode('display_end', new Node([new DeferredNode(), $node->getNode('display_end')]));
+            $this->hasDeferred = false;
+        }
+
+        return $node;
+    }
+
+    public function getPriority() : int
+    {
+        return 0;
+    }
+}
diff --git a/system/src/Twig/DeferredExtension/DeferredNodeVisitorCompat.php b/system/src/Twig/DeferredExtension/DeferredNodeVisitorCompat.php
new file mode 100644
index 0000000000..1ff7fd421d
--- /dev/null
+++ b/system/src/Twig/DeferredExtension/DeferredNodeVisitorCompat.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * This file is part of the rybakit/twig-deferred-extension package.
+ *
+ * (c) Eugene Leonovich <gen.work@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Twig\DeferredExtension;
+
+use Twig\Environment;
+use Twig\Node\ModuleNode;
+use Twig\Node\Node;
+use Twig\NodeVisitor\NodeVisitorInterface;
+
+final class DeferredNodeVisitorCompat implements NodeVisitorInterface
+{
+    private $hasDeferred = false;
+
+    /**
+     * @param \Twig_NodeInterface $node
+     * @param Environment $env
+     * @return Node
+     */
+    public function enterNode(\Twig_NodeInterface $node, Environment $env): Node
+    {
+        if (!$this->hasDeferred && $node instanceof DeferredBlockNode) {
+            $this->hasDeferred = true;
+        }
+
+        \assert($node instanceof Node);
+
+        return $node;
+    }
+
+    /**
+     * @param \Twig_NodeInterface $node
+     * @param Environment $env
+     * @return Node|null
+     */
+    public function leaveNode(\Twig_NodeInterface $node, Environment $env): ?Node
+    {
+        if ($this->hasDeferred && $node instanceof ModuleNode) {
+            $node->setNode('constructor_end', new Node([new DeferredExtensionNode(), $node->getNode('constructor_end')]));
+            $node->setNode('display_end', new Node([new DeferredNode(), $node->getNode('display_end')]));
+            $this->hasDeferred = false;
+        }
+
+        \assert($node instanceof Node);
+
+        return $node;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPriority() : int
+    {
+        return 0;
+    }
+}
diff --git a/system/src/Twig/DeferredExtension/DeferredTokenParser.php b/system/src/Twig/DeferredExtension/DeferredTokenParser.php
new file mode 100644
index 0000000000..1870ae0e42
--- /dev/null
+++ b/system/src/Twig/DeferredExtension/DeferredTokenParser.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * This file is part of the rybakit/twig-deferred-extension package.
+ *
+ * (c) Eugene Leonovich <gen.work@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Twig\DeferredExtension;
+
+use Twig\Node\BlockNode;
+use Twig\Node\Node;
+use Twig\Parser;
+use Twig\Token;
+use Twig\TokenParser\AbstractTokenParser;
+use Twig\TokenParser\BlockTokenParser;
+
+final class DeferredTokenParser extends AbstractTokenParser
+{
+    private $blockTokenParser;
+
+    public function setParser(Parser $parser) : void
+    {
+        parent::setParser($parser);
+
+        $this->blockTokenParser = new BlockTokenParser();
+        $this->blockTokenParser->setParser($parser);
+    }
+
+    public function parse(Token $token) : Node
+    {
+        $stream = $this->parser->getStream();
+        $nameToken = $stream->next();
+        $deferredToken = $stream->nextIf(Token::NAME_TYPE, 'deferred');
+        $stream->injectTokens([$nameToken]);
+
+        $node = $this->blockTokenParser->parse($token);
+
+        if ($deferredToken) {
+            $this->replaceBlockNode($nameToken->getValue());
+        }
+
+        return $node;
+    }
+
+    public function getTag() : string
+    {
+        return 'block';
+    }
+
+    private function replaceBlockNode(string $name) : void
+    {
+        $block = $this->parser->getBlock($name)->getNode('0');
+        $this->parser->setBlock($name, $this->createDeferredBlockNode($block));
+    }
+
+    private function createDeferredBlockNode(BlockNode $block) : DeferredBlockNode
+    {
+        $name = $block->getAttribute('name');
+        $deferredBlock = new DeferredBlockNode($name, new Node([]), $block->getTemplateLine());
+
+        foreach ($block as $nodeName => $node) {
+            $deferredBlock->setNode($nodeName, $node);
+        }
+
+        if ($sourceContext = $block->getSourceContext()) {
+            $deferredBlock->setSourceContext($sourceContext);
+        }
+
+        return $deferredBlock;
+    }
+}
diff --git a/system/templates/default.html.twig b/system/templates/default.html.twig
new file mode 100644
index 0000000000..f18206b771
--- /dev/null
+++ b/system/templates/default.html.twig
@@ -0,0 +1,4 @@
+{# Default output if no theme #}
+<h3 style="color:red">ERROR: <code>{{ page.template() ~'.'~ page.templateFormat() ~".twig" }}</code> template not found for page: <code>{{ page.route() }}</code></h3>
+<h1>{{ page.title() }}</h1>
+{{ page.content()|raw }}
diff --git a/system/templates/external.html.twig b/system/templates/external.html.twig
new file mode 100644
index 0000000000..3fa3508119
--- /dev/null
+++ b/system/templates/external.html.twig
@@ -0,0 +1 @@
+{# Default external template #}
diff --git a/system/templates/flex/404.html.twig b/system/templates/flex/404.html.twig
new file mode 100644
index 0000000000..adf4f65a2c
--- /dev/null
+++ b/system/templates/flex/404.html.twig
@@ -0,0 +1,4 @@
+{% set item = collection ?? object %}
+{% set type = collection ? 'collection' : 'object' %}
+
+ERROR: Layout '{{ layout }}' for flex {{ type }} '{{ item.flexType() }}'  was not found.
\ No newline at end of file
diff --git a/system/templates/flex/_default/collection/debug.html.twig b/system/templates/flex/_default/collection/debug.html.twig
new file mode 100644
index 0000000000..5a37835192
--- /dev/null
+++ b/system/templates/flex/_default/collection/debug.html.twig
@@ -0,0 +1,5 @@
+<h1>{{ directory.getTitle() }} <small>debug dump</small></h1>
+
+{% for object in collection %}
+    {% render object layout: layout %}
+{% endfor %}
diff --git a/system/templates/flex/_default/object/debug.html.twig b/system/templates/flex/_default/object/debug.html.twig
new file mode 100644
index 0000000000..dc961cd65b
--- /dev/null
+++ b/system/templates/flex/_default/object/debug.html.twig
@@ -0,0 +1,4 @@
+<section>
+    <h2>{{ object.key }}</h2>
+    <pre>{{ object.jsonSerialize()|yaml_encode }}</pre>
+</section>
\ No newline at end of file
diff --git a/system/templates/modular/default.html.twig b/system/templates/modular/default.html.twig
new file mode 100644
index 0000000000..f18206b771
--- /dev/null
+++ b/system/templates/modular/default.html.twig
@@ -0,0 +1,4 @@
+{# Default output if no theme #}
+<h3 style="color:red">ERROR: <code>{{ page.template() ~'.'~ page.templateFormat() ~".twig" }}</code> template not found for page: <code>{{ page.route() }}</code></h3>
+<h1>{{ page.title() }}</h1>
+{{ page.content()|raw }}
diff --git a/system/templates/partials/metadata.html.twig b/system/templates/partials/metadata.html.twig
index bf323e7ab2..fcf1217731 100644
--- a/system/templates/partials/metadata.html.twig
+++ b/system/templates/partials/metadata.html.twig
@@ -1,3 +1,3 @@
 {% for meta in page.metadata %}
-    <meta {% if meta.name %}name="{{ meta.name }}" {% endif %}{% if meta.http_equiv %}http-equiv="{{ meta.http_equiv }}" {% endif %}{% if meta.charset %}charset="{{ meta.charset }}" {% endif %}{% if meta.property %}property="{{ meta.property }}" {% endif %}{% if meta.content %}content="{{ meta.content }}" {% endif %}/>
-{% endfor %}
\ No newline at end of file
+    <meta {% if meta.name %}name="{{ meta.name|e }}" {% endif %}{% if meta.http_equiv %}http-equiv="{{ meta.http_equiv|e }}" {% endif %}{% if meta.charset %}charset="{{ meta.charset|e }}" {% endif %}{% if meta.property %}property="{{ meta.property|e }}" {% endif %}{% if meta.content %}content="{{ meta.content|raw }}" {% endif %}/>
+{% endfor %}
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index 1c0ffd94b8..618781de66 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -7,11 +7,15 @@
 
 ini_set('error_log', __DIR__ . '/error.log');
 
-$grav = function() {
+$grav = function () {
     Grav::resetInstance();
     $grav = Grav::instance();
     $grav['config']->init();
 
+    // This must be set first before the other init
+    $grav['config']->set('system.languages.supported', ['en', 'fr', 'vi']);
+    $grav['config']->set('system.languages.default_lang', 'en');
+
     foreach (array_keys($grav['setup']->getStreams()) as $stream) {
         @stream_wrapper_unregister($stream);
     }
@@ -29,7 +33,3 @@
 };
 
 Fixtures::add('grav', $grav);
-
-$fake = Factory::create();
-Fixtures::add('fake', $fake);
-
diff --git a/tests/_support/Helper/Unit.php b/tests/_support/Helper/Unit.php
index 1998729666..74ef5a6b89 100644
--- a/tests/_support/Helper/Unit.php
+++ b/tests/_support/Helper/Unit.php
@@ -2,6 +2,7 @@
 namespace Helper;
 
 use Codeception;
+
 // here you can define custom actions
 // all public methods declared in helper class will be available in $I
 
@@ -14,13 +15,15 @@ class Unit extends Codeception\Module
     /**
      * HOOK: used after configuration is loaded
      */
-    public function _initialize() {
+    public function _initialize()
+    {
     }
 
     /**
      * HOOK: on every Actor class initialization
      */
-    public function _cleanup() {
+    public function _cleanup()
+    {
     }
 
     /**
@@ -28,13 +31,15 @@ public function _cleanup() {
      *
      * @param array $settings
      */
-    public function _beforeSuite($settings = []) {
+    public function _beforeSuite($settings = [])
+    {
     }
 
     /**
      * HOOK: after suite
      **/
-    public function _afterSuite() {
+    public function _afterSuite()
+    {
     }
 
     /**
@@ -42,7 +47,8 @@ public function _afterSuite() {
      *
      * @param Codeception\Step $step*
      */
-    public function _beforeStep(Codeception\Step $step) {
+    public function _beforeStep(Codeception\Step $step)
+    {
     }
 
     /**
@@ -50,7 +56,8 @@ public function _beforeStep(Codeception\Step $step) {
      *
      * @param Codeception\Step $step
      */
-    public function _afterStep(Codeception\Step $step) {
+    public function _afterStep(Codeception\Step $step)
+    {
     }
 
     /**
@@ -58,7 +65,8 @@ public function _afterStep(Codeception\Step $step) {
      *
      * @param Codeception\TestCase $test
      */
-    public function _before(Codeception\TestCase $test) {
+    public function _before(Codeception\TestCase $test)
+    {
     }
 
     /**
@@ -66,7 +74,8 @@ public function _before(Codeception\TestCase $test) {
      *
      * @param Codeception\TestCase $test
      */
-    public function _after(Codeception\TestCase $test) {
+    public function _after(Codeception\TestCase $test)
+    {
     }
 
     /**
@@ -75,6 +84,7 @@ public function _after(Codeception\TestCase $test) {
      * @param Codeception\TestCase $test
      * @param $fail
      */
-    public function _failed(Codeception\TestCase $test, $fail) {
+    public function _failed(Codeception\TestCase $test, $fail)
+    {
     }
 }
diff --git a/tests/fake/simple-site/user/pages/04.page-translated/default.en.md b/tests/fake/simple-site/user/pages/04.page-translated/default.en.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fake/simple-site/user/pages/04.page-translated/default.fr.md b/tests/fake/simple-site/user/pages/04.page-translated/default.fr.md
new file mode 100644
index 0000000000..97156cc5e8
--- /dev/null
+++ b/tests/fake/simple-site/user/pages/04.page-translated/default.fr.md
@@ -0,0 +1,5 @@
+---
+title: Simple Page avec traduction
+---
+
+Simple Page Content in English
\ No newline at end of file
diff --git a/tests/fake/simple-site/user/pages/05.translatedlong/part2/default.en.md b/tests/fake/simple-site/user/pages/05.translatedlong/part2/default.en.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fake/simple-site/user/pages/05.translatedlong/part2/default.fr.md b/tests/fake/simple-site/user/pages/05.translatedlong/part2/default.fr.md
new file mode 100644
index 0000000000..7157062348
--- /dev/null
+++ b/tests/fake/simple-site/user/pages/05.translatedlong/part2/default.fr.md
@@ -0,0 +1,5 @@
+---
+title: Simple Page avec traduction
+---
+
+Page Simple FR
\ No newline at end of file
diff --git a/tests/fake/single-page-translated/user/pages/01.simple-page/default.en.md b/tests/fake/single-page-translated/user/pages/01.simple-page/default.en.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/fake/single-page-translated/user/pages/01.simple-page/default.fr.md b/tests/fake/single-page-translated/user/pages/01.simple-page/default.fr.md
new file mode 100644
index 0000000000..7157062348
--- /dev/null
+++ b/tests/fake/single-page-translated/user/pages/01.simple-page/default.fr.md
@@ -0,0 +1,5 @@
+---
+title: Simple Page avec traduction
+---
+
+Page Simple FR
\ No newline at end of file
diff --git a/tests/functional/Grav/Console/DirectInstallCommandTest.php b/tests/functional/Grav/Console/DirectInstallCommandTest.php
index d1bc6cf763..4f71998629 100644
--- a/tests/functional/Grav/Console/DirectInstallCommandTest.php
+++ b/tests/functional/Grav/Console/DirectInstallCommandTest.php
@@ -4,7 +4,6 @@
 use Grav\Common\Grav;
 use Grav\Console\Gpm\DirectInstallCommand;
 
-
 /**
  * Class DirectInstallCommandTest
  */
@@ -17,12 +16,11 @@ class DirectInstallCommandTest extends \Codeception\TestCase\Test
     protected $directInstall;
 
 
-    protected function _before()
+    protected function _before(): void
     {
         $this->grav = Fixtures::get('grav');
         $this->directInstallCommand = new DirectInstallCommand();
     }
-
 }
 
 /**
diff --git a/tests/phpstan/classes/Toolbox/UniformResourceLocatorExtension.php b/tests/phpstan/classes/Toolbox/UniformResourceLocatorExtension.php
new file mode 100644
index 0000000000..98bbca8a9f
--- /dev/null
+++ b/tests/phpstan/classes/Toolbox/UniformResourceLocatorExtension.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace PHPStan\Toolbox;
+
+use PhpParser\Node\Expr\MethodCall;
+use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
+use PHPStan\Type\DynamicMethodReturnTypeExtension;
+use PHPStan\Type\StringType;
+use PHPStan\Type\Type;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+
+/**
+ * Extension to handle UniformResourceLocator return types.
+ */
+class UniformResourceLocatorExtension implements DynamicMethodReturnTypeExtension
+{
+    /**
+     * @return string
+     */
+    public function getClass(): string
+    {
+        return UniformResourceLocator::class;
+    }
+
+    /**
+     * @param MethodReflection $methodReflection
+     * @return bool
+     */
+    public function isMethodSupported(MethodReflection $methodReflection): bool
+    {
+        return $methodReflection->getName() === 'findResource';
+    }
+
+    /**
+     * @param MethodReflection $methodReflection
+     * @param MethodCall $methodCall
+     * @param Scope $scope
+     * @return Type
+     */
+    public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
+    {
+        $first = $methodCall->getArgs()[2] ?? false;
+        if ($first) {
+            return new StringType();
+        }
+
+        return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+    }
+}
diff --git a/tests/phpstan/extension.neon b/tests/phpstan/extension.neon
new file mode 100644
index 0000000000..ef44d0b415
--- /dev/null
+++ b/tests/phpstan/extension.neon
@@ -0,0 +1,5 @@
+services:
+    -
+        class: PHPStan\Toolbox\UniformResourceLocatorExtension
+        tags:
+            - phpstan.broker.dynamicMethodReturnTypeExtension
diff --git a/tests/phpstan/phpstan.neon b/tests/phpstan/phpstan.neon
index 29781281b0..78bebee7d3 100644
--- a/tests/phpstan/phpstan.neon
+++ b/tests/phpstan/phpstan.neon
@@ -1,14 +1,38 @@
+#phpVersion: 70300
 includes:
     #- '../../vendor/phpstan/phpstan-strict-rules/rules.neon'
     - '../../vendor/phpstan/phpstan-deprecation-rules/rules.neon'
+    - 'extension.neon'
 parameters:
     fileExtensions:
         - php
         - dist
-    bootstrap: tests/phpstan/phpstan-bootstrap.php
-    excludes_analyse:
-        - system/src/Grav/Common/Errors/Resources/layout.html.php
+    bootstrapFiles:
+        - phpstan-bootstrap.php
+    excludePaths:
+        - */system/src/Grav/Common/Errors/Resources/layout.html.php
+        - */system/src/Twig/DeferredExtension/DeferredNodeVisitorCompat.php    # Twig 1
+        - */system/src/Twig/DeferredExtension/DeferredNodeVisitor.php          # Twig 2+3
+        # Ignore vendor dev dependencies and tests
+        - */vendor/*/*/tests
+        - */vendor/behat
+        - */vendor/codeception
+        - */vendor/phpstan
+        - */vendor/phpunit
+        - */vendor/phpspec
+        - */vendor/phpdocumentor
+        - */vendor/sebastian
+        - */vendor/theseer
+        - */vendor/webmozart
+
+    inferPrivatePropertyTypeFromConstructor: true
     reportUnmatchedIgnoredErrors: false
+    treatPhpDocTypesAsCertain: false
+
+    # These checks are new in phpstan 1, ignore them for now.
+    checkMissingIterableValueType: false
+    #checkGenericClassInNonGenericObjectType: false
+
     universalObjectCratesClasses:
         - Grav\Common\Config\Config
         - Grav\Common\Config\Languages
@@ -17,91 +41,135 @@ parameters:
         - Grav\Common\GPM\Common\Package
         - Grav\Common\GPM\Local\Package
         - Grav\Common\GPM\Remote\Package
+        - Grav\Common\Page\Header
         - Grav\Common\Session
+    dynamicConstantNames:
+        - GRAV_CLI
     ignoreErrors:
-
-        # FIXME: Bugs that need to be fixed
+        # New in phpstan 1, ignore them for now.
+        - '#Unsafe usage of new static\(\)#'
 
         # TODO: Errors that needs some more thinking (bad design?)
         - '#Access to an undefined property RocketTheme\\Toolbox\\Event\\Event::#'
+        - '#Instantiation of deprecated class RocketTheme\\Toolbox\\Event\\Event#'
+        - '#extends deprecated class RocketTheme\\Toolbox\\Event\\Event#'
         - '#Access to an undefined property Grav\\Common\\Data\\Blueprint::#'
-        - '#Access to an undefined property Grav\\Common\\Media\\Interfaces\\MediaObjectInterface::#'
-        - '#Access to an undefined property Grav\\Common\\Page\\Interfaces\\PageInterface::#'
         -
             message: '#Cannot call method path\(\) on string#'
-            path: 'system/src/Grav/Common/Page/Media.php'
+            path: '*/system/src/Grav/Common/Page/Media.php'
 
         # TODO: system.twig.umask_fix will not work with Twig 2 anymore
         -
             message: '#Call to deprecated method writeCacheFile\(\) of class Twig\\Environment#'
-            path: 'system/src/Grav/Common/Twig/WriteCacheFileTrait.php'
-
-        # Needed: full coverage (probably with admin plugin...) then redesign constructor
-        -
-            message: '#Grav\\Common\\GPM\\Remote\\GravCore::__construct\(\) does not call parent constructor from Grav\\Common\\GPM\\Remote\\AbstractPackageCollection#'
-            path: 'system/src/Grav/Common/GPM/Remote/GravCore.php'
+            path: '*/system/src/Grav/Common/Twig/WriteCacheFileTrait.php'
 
         # PSR-16 Exception interfaces do not extend \Throwable
         - '#PHPDoc tag \@throws with type Psr\\SimpleCache\\(CacheException|InvalidArgumentException) is not subtype of Throwable#'
-        - '#expects Exception, Psr\\SimpleCache\\InvalidArgumentException&Throwable given#'
-
-        # Needed: psr-17 (http-factories) support (through decorator or further investigations)
-        -
-            message: '#Call to an undefined static method Grav\\Framework\\Psr7\\Stream::create\(\)#'
-            path: 'system/src/Grav/Framework/Form/FormFlashFile.php'
 
         # Medium __call() methods
         - '#Call to an undefined method Grav\\Common\\Page\\Medium\\(\w*)Medium::#'
 
-        # Filesystem::getInstance()
-        -
-            message: '#Strict comparison using === between null and static#'
-            path: 'system/src/Grav/Framework/Filesystem/Filesystem.php'
-
         # These errors are about plugins (need to find a better solution)
         -
             message: '#Call to static method sendEmail\(\) on an unknown class Grav\\Plugin\\Email\\Utils#'
-            path: 'system/src/Grav/Common/Scheduler/Job.php'
+            path: '*/system/src/Grav/Common/Scheduler/Job.php'
         -
-            message: '#on an unknown class Grav\\Plugin\\Admin#'
-            path: 'system/src/Grav/Common/Page/Pages.php'
+            message: '#unknown class Grav\\Plugin\\Admin#'
+            path: '*/system/src/Grav/Common/Page/Pages.php'
         -
-            message: '#Call to method getFlash\(\) on an unknown class Grav\\Common\\Grav\\Plugin\\Form\\Forms#'
-            path: 'system/src/Grav/Common/Session.php'
-
-        # Can be ignored, after fopen there's always an $http_response_header locally available
+            message: '#unknown class Grav\\Plugin\\Admin#'
+            path: '*/system/src/Grav/Common/Flex/Pages/PageObject.php'
+        -
+            message: '#unknown class Grav\\Plugin\\Admin\\Admin#'
+            path: '*/system/src/Grav/Common/Flex/Types/Pages/PageObject.php'
         -
-            message: '#Variable \$http_response_header in isset\(\) always exists and is not nullable#'
-            path: 'system/src/Grav/Common/GPM/Response.php'
+            message: '#unknown class Grav\\Plugin\\Form\\Forms#'
+            path: '*/system/src/Grav/Common/Processors/PagesProcessor.php'
 
+        # Clockwork does not define functions for __call() call
+        -
+            message: '#Call to an undefined method Clockwork\\Clockwork::(info|userData|addEvent|alert)\(\)#'
+            path: '*/system/src/Grav/Common/Debugger.php'
 
         # These errors can be ignored (they depend on installed extensions)
         -
             message: '#Instantiated class (Memcache|Memcached|Redis|RedisException) not found#'
-            path: 'system/src/Grav/Common/Cache.php'
+            path: '*/system/src/Grav/Common/Cache.php'
+        -
+            message: '#unknown class (Memcache|Memcached|Redis|RedisException)#'
+            path: '*/system/src/Grav/Common/Cache.php'
+        -
+            message: '#unknown class Collator#'
+            path: '*/system/src/Grav/Common/Page/Pages.php'
         -
-            message: '#on an unknown class (Memcache|Memcached|Redis|RedisException)#'
-            path: 'system/src/Grav/Common/Cache.php'
+            message: '#unknown class Collator#'
+            path: '*/system/src/Grav/Common/Flex/Types/Pages/PageCollection.php'
         -
-            message: '#on an unknown class Collator#'
-            path: 'system/src/Grav/Common/Page/Pages.php'
+            message: '#Ternary operator condition is always true#'
+            path: '*/system/src/Grav/Framework/Cache/AbstractCache.php'
+        -
+            message: '#Call to function is_object\(\) with int will always evaluate to false#'
+            path: '*/system/src/Grav/Framework/Cache/AbstractCache.php'
+
+        # XHprof
+        - '#tideways_xhprof_enable#'
 
         # Support for deprecated features
         -
-            message: '#Instantiation of deprecated class Doctrine\\Common\\Cache\\MemcacheCache#'
-            path: 'system/src/Grav/Common/Cache.php'
+            message: '#Instantiation of deprecated class Doctrine\\Common\\Cache\\(\w+)Cache#'
+            path: '*/system/src/Grav/Common/Cache.php'
+        -
+            message: '#Instantiation of deprecated class Doctrine\\Common\\Cache\\(\w+)Cache#'
+            path: '*/system/src/Grav/Common/GPM/Remote/*.php'
         -
             message: '#Call to deprecated method order#'
-            path: 'system/src/Grav/Common/Page/Pages.php'
+            path: '*/system/src/Grav/Common/Page/Pages.php'
         -
             message: '#Fetching class constant class of deprecated class Grav\\Common\\User\\User#'
-            path: 'system/src/Grav/Common/Service/AccountsServiceProvider.php'
+            path: '*/system/src/Grav/Common/Service/AccountsServiceProvider.php'
         -
             message: '#Call to deprecated method getLegacyFiles\(\)#'
-            path: 'system/src/Grav/Common/Session.php'
+            path: '*/system/src/Grav/Common/Session.php'
+        -
+            message: '#Call to deprecated method \w+\(\) of class Grav\\Common\\Flex\\Types\\Users\\UserObject#'
+            path: '*/system/src/Grav/Common/Flex/Types/Users/UserObject.php'
         -
-            message: '#Call to deprecated method getType\(\) of class#'
-            path: 'system/src/Grav/Framework/Object/Base/ObjectTrait.php'
+            message: '#Call to deprecated method \w+\(\) of class Grav\\Framework\\Flex\\FlexObject#'
+            path: '*/system/src/Grav/Framework/Flex/FlexObject.php'
+        -
+            message: '#Call to deprecated method \w+\(\) of class Grav\\Framework\\Flex\\FlexIndex#'
+            path: '*/system/src/Grav/Framework/Flex/FlexIndex.php'
+        -
+            message: '#Call to deprecated method \w+\(\) of class Grav\\Framework\\Flex\\FlexCollection#'
+            path: '*/system/src/Grav/Framework/Flex/FlexCollection.php'
+        -
+            message: '#Call to deprecated method (getAuthorizeScope|getActiveUser)\(\) of class Grav\\Framework\\Flex\\FlexObject#'
+            path: '*/system/src/Grav/Framework/Flex/Pages/Traits/PageAuthorsTrait.php'
         -
             message: '#deprecated class#'
-            path: 'system/src/Grav/Framework/Uri/Uri.php'
+            path: '*/system/src/Grav/Framework/Uri/Uri.php'
+        -
+            message: '#Method Symfony\\Contracts\\EventDispatcher\\EventDispatcherInterface::dispatch#'
+            path: '*/system/src/Grav/Common/Grav.php'
+
+        - '#has typehint with deprecated class RocketTheme\\Toolbox\\Event\\Event#'
+        - '#Call to deprecated method stopPropagation\(\) of class Symfony\\Component\\EventDispatcher\\Event#'
+        - '#Parameter \#2 \$listener of method Symfony\\Component\\EventDispatcher\\EventDispatcher::addListener\(\)#'
+        - '#Parameter \#2 \$listener of method Symfony\\Component\\EventDispatcher\\EventDispatcher::removeListener\(\)#'
+        - '#Class Grav\\Common\\GPM\\Response not found#'
+
+        # Installer updates
+        -
+            message: '#Variable \$this in PHPDoc tag @var does not exist#'
+            path: '*/system/src/Grav/Installer/updates/*'
+        -
+            message: '#YamlUpdater::isInlineComment\(\) is unused#'
+            path: '*/system/src/Grav/Installer/YamlUpdater.php'
+
+        # Twig Deferred extension compatibility
+        -
+            message: '#typehint with deprecated interface#'
+            path: '*/system/src/Twig/DeferredExtension/DeferredNodeVisitorCompat.php'
+        -
+            message: '#Function twig_array_filter not found#'
+            path: '*/system/src/Grav/Common/Twig/Extension/GravExtension.php'
diff --git a/tests/phpstan/plugins-bootstrap.php b/tests/phpstan/plugins-bootstrap.php
index 8d5492971e..1c18280339 100644
--- a/tests/phpstan/plugins-bootstrap.php
+++ b/tests/phpstan/plugins-bootstrap.php
@@ -1,6 +1,7 @@
 <?php
 
 use Grav\Common\Grav;
+use Grav\Common\Plugin;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 \define('GRAV_CLI', true);
@@ -9,10 +10,6 @@
 
 $autoload = require __DIR__ . '/../../vendor/autoload.php';
 
-if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
-    exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
-}
-
 if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
@@ -21,7 +18,7 @@
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
-$grav = Grav::instance(array('loader' => $autoload));
+$grav = Grav::instance(['loader' => $autoload]);
 $grav->setup('tests');
 $grav['config']->init();
 
@@ -30,12 +27,38 @@
 /** @var UniformResourceLocator $locator */
 $locator = Grav::instance()['locator'];
 $iterator = $locator->getIterator('plugins://');
-foreach($iterator as $directory) {
+/** @var DirectoryIterator $directory */
+foreach ($iterator as $directory) {
     if (!$directory->isDir()) {
         continue;
     }
-    $autoloader = $directory->getPathname() . '/vendor/autoload.php';
-    if (file_exists($autoloader)) {
-        require $autoloader;
+    $plugin = $directory->getBasename();
+    $file = $directory->getPathname() . '/' . $plugin . '.php';
+    $classloader = null;
+    if (file_exists($file)) {
+        require_once $file;
+
+        $pluginClass = "\\Grav\\Plugin\\{$plugin}Plugin";
+
+        if (is_subclass_of($pluginClass, Plugin::class, true)) {
+            $class = new $pluginClass($plugin, $grav);
+            if (is_callable([$class, 'autoload'])) {
+                $classloader = $class->autoload();
+            }
+        }
+    }
+    if (null === $classloader) {
+        $autoloader = $directory->getPathname() . '/vendor/autoload.php';
+        if (file_exists($autoloader)) {
+            require $autoloader;
+        }
     }
 }
+
+define('GANTRY_DEBUGGER', true);
+define('GANTRY5_DEBUG', true);
+define('GANTRY5_PLATFORM', 'grav');
+define('GANTRY5_ROOT', GRAV_ROOT);
+define('GANTRY5_VERSION', '@version@');
+define('GANTRY5_VERSION_DATE', '@versiondate@');
+define('GANTRYADMIN_PATH', '');
diff --git a/tests/phpstan/plugins.neon b/tests/phpstan/plugins.neon
index 9b8d46c6df..82570cca56 100644
--- a/tests/phpstan/plugins.neon
+++ b/tests/phpstan/plugins.neon
@@ -1,14 +1,35 @@
 includes:
     #- '../../vendor/phpstan/phpstan-strict-rules/rules.neon'
     - '../../vendor/phpstan/phpstan-deprecation-rules/rules.neon'
+    - 'extension.neon'
 parameters:
     fileExtensions:
         - php
-    excludes_analyse:
+    excludePaths:
         - %currentWorkingDirectory%/user/plugins/*/vendor/*
         - %currentWorkingDirectory%/user/plugins/*/tests/*
-    bootstrap: tests/phpstan/plugins-bootstrap.php
-    reportUnmatchedIgnoredErrors: true
+        - %currentWorkingDirectory%/user/plugins/gantry5/src/platforms
+        - %currentWorkingDirectory%/user/plugins/gantry5/src/classes/Gantry/Framework/Services/ErrorServiceProvider.php
+        # Ignore vendor dev dependencies and tests
+        - */vendor/*/*/tests
+        - */vendor/behat
+        - */vendor/codeception
+        - */vendor/phpstan
+        - */vendor/phpunit
+        - */vendor/phpspec
+        - */vendor/phpdocumentor
+        - */vendor/sebastian
+        - */vendor/theseer
+        - */vendor/webmozart
+    bootstrapFiles:
+        - plugins-bootstrap.php
+    inferPrivatePropertyTypeFromConstructor: true
+    reportUnmatchedIgnoredErrors: false
+
+    # These checks are new in phpstan 1, ignore them for now.
+    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
+
     universalObjectCratesClasses:
         - Grav\Common\Config\Config
         - Grav\Common\Config\Languages
@@ -17,4 +38,33 @@ parameters:
         - Grav\Common\GPM\Common\Package
         - Grav\Common\GPM\Local\Package
         - Grav\Common\GPM\Remote\Package
+        - Grav\Common\Page\Header
         - Grav\Common\Session
+        - Gantry\Component\Config\Config
+    dynamicConstantNames:
+        - GRAV_CLI
+        - GANTRY_DEBUGGER
+        - GANTRY5_DEBUG
+        - GANTRY5_VERSION
+        - GANTRY5_VERSION_DATE
+        - GANTRY5_PLATFORM
+        - GANTRY5_ROOT
+    ignoreErrors:
+        # New in phpstan 1, ignore them for now.
+        - '#Unsafe usage of new static\(\)#'
+        - '#Cannot instantiate interface Grav\\Framework\\#'
+
+        # PSR-16 Exception interfaces do not extend \Throwable
+        - '#PHPDoc tag \@throws with type (.*|)?Psr\\SimpleCache\\(CacheException|InvalidArgumentException)(|.*)? is not subtype of Throwable#'
+
+        - '#Access to an undefined property RocketTheme\\Toolbox\\Event\\Event::#'
+        - '#Instantiation of deprecated class RocketTheme\\Toolbox\\Event\\Event#'
+        - '#extends deprecated class RocketTheme\\Toolbox\\Event\\Event#'
+        - '#implements deprecated interface RocketTheme\\Toolbox\\Event\\EventSubscriberInterface#'
+        - '#Call to method __construct\(\) of deprecated class RocketTheme\\Toolbox\\Event\\Event#'
+        - '#Call to deprecated method (stopPropagation|isPropagationStopped)\(\) of class Symfony\\Component\\EventDispatcher\\Event#'
+        - '#Call to an undefined method Grav\\Plugin\\ApartmentData\\Application\\Application::#'
+        - '#Parameter \#1 \$lineNumberStyle of method ScssPhp\\ScssPhp\\Compiler::setLineNumberStyle\(\) expects string, int given#'
+
+        # Deprecated event class
+        - '#has typehint with deprecated class RocketTheme\\Toolbox\\Event\\Event#'
diff --git a/tests/unit/Grav/Common/AssetsTest.php b/tests/unit/Grav/Common/AssetsTest.php
index a5516a5181..57539a6f34 100644
--- a/tests/unit/Grav/Common/AssetsTest.php
+++ b/tests/unit/Grav/Common/AssetsTest.php
@@ -15,24 +15,24 @@ class AssetsTest extends \Codeception\TestCase\Test
     /** @var Assets $assets */
     protected $assets;
 
-    protected function _before()
+    protected function _before(): void
     {
         $grav = Fixtures::get('grav');
         $this->grav = $grav();
         $this->assets = $this->grav['assets'];
     }
 
-    protected function _after()
+    protected function _after(): void
     {
     }
 
-    public function testAddingAssets()
+    public function testAddingAssets(): void
     {
         //test add()
         $this->assets->add('test.css');
 
         $css = $this->assets->css();
-        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
+        self::assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         $array = $this->assets->getCss();
 
@@ -40,16 +40,16 @@ public function testAddingAssets()
         $item = reset($array);
         $actual = json_encode($item);
         $expected = '
-        {  
+        {
            "type":"css",
-           "elements":{  
+           "elements":{
               "asset":"\/test.css",
               "asset_type":"css",
               "order":0,
               "group":"head",
               "position":"pipeline",
               "priority":10,
-              "attributes":{  
+              "attributes":{
                  "type":"text\/css",
                  "rel":"stylesheet"
               },
@@ -57,11 +57,11 @@ public function testAddingAssets()
               "query":""
            }
         }';
-        $this->assertJsonStringEqualsJsonString($expected, $actual);
+        self::assertJsonStringEqualsJsonString($expected, $actual);
 
         $this->assets->add('test.js');
         $js = $this->assets->js();
-        $this->assertSame('<script src="/test.js"></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/test.js"></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
 
@@ -69,45 +69,45 @@ public function testAddingAssets()
         $item = reset($array);
         $actual = json_encode($item);
         $expected = '
-        {  
+        {
            "type":"js",
-           "elements":{  
+           "elements":{
               "asset":"\/test.js",
               "asset_type":"js",
               "order":0,
               "group":"head",
               "position":"pipeline",
               "priority":10,
-              "attributes":[  
-        
+              "attributes":[
+
               ],
               "modified":false,
               "query":""
            }
         }';
-        $this->assertJsonStringEqualsJsonString($expected, $actual);
+        self::assertJsonStringEqualsJsonString($expected, $actual);
 
         //test addCss(). Test adding asset to a separate group
         $this->assets->reset();
         $this->assets->addCSS('test.css');
         $css = $this->assets->css();
-        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
+        self::assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         $array = $this->assets->getCss();
         /** @var Assets\BaseAsset $item */
         $item = reset($array);
         $actual = json_encode($item);
         $expected = '
-        {  
+        {
            "type":"css",
-           "elements":{  
+           "elements":{
               "asset":"\/test.css",
               "asset_type":"css",
               "order":0,
               "group":"head",
               "position":"pipeline",
               "priority":10,
-              "attributes":{  
+              "attributes":{
                  "type":"text\/css",
                  "rel":"stylesheet"
               },
@@ -115,57 +115,57 @@ public function testAddingAssets()
               "query":""
            }
         }';
-        $this->assertJsonStringEqualsJsonString($expected, $actual);
+        self::assertJsonStringEqualsJsonString($expected, $actual);
 
         //test addCss(). Testing with remote URL
         $this->assets->reset();
         $this->assets->addCSS('http://www.somesite.com/test.css');
         $css = $this->assets->css();
-        $this->assertSame('<link href="http://www.somesite.com/test.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
+        self::assertSame('<link href="http://www.somesite.com/test.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         $array = $this->assets->getCss();
         /** @var Assets\BaseAsset $item */
         $item = reset($array);
         $actual = json_encode($item);
         $expected = '
-        {  
+        {
            "type":"css",
-           "elements":{  
+           "elements":{
               "asset":"http:\/\/www.somesite.com\/test.css",
               "asset_type":"css",
               "order":0,
               "group":"head",
               "position":"pipeline",
               "priority":10,
-              "attributes":{  
+              "attributes":{
                  "type":"text\/css",
                  "rel":"stylesheet"
               },
               "query":""
            }
         }';
-        $this->assertJsonStringEqualsJsonString($expected, $actual);
+        self::assertJsonStringEqualsJsonString($expected, $actual);
 
         //test addCss() adding asset to a separate group, and with an alternate rel attribute
         $this->assets->reset();
         $this->assets->addCSS('test.css', ['group' => 'alternate', 'rel' => 'alternate']);
         $css = $this->assets->css('alternate');
-        $this->assertSame('<link href="/test.css" type="text/css" rel="alternate">' . PHP_EOL, $css);
+        self::assertSame('<link href="/test.css" type="text/css" rel="alternate">' . PHP_EOL, $css);
 
         //test addJs()
         $this->assets->reset();
         $this->assets->addJs('test.js');
         $js = $this->assets->js();
-        $this->assertSame('<script src="/test.js"></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/test.js"></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
         /** @var Assets\BaseAsset $item */
         $item = reset($array);
         $actual = json_encode($item);
         $expected = '
-        {  
+        {
            "type":"js",
-           "elements":{  
+           "elements":{
               "asset":"\/test.js",
               "asset_type":"js",
               "order":0,
@@ -177,15 +177,15 @@ public function testAddingAssets()
               "query":""
            }
         }';
-        $this->assertJsonStringEqualsJsonString($expected, $actual);
+        self::assertJsonStringEqualsJsonString($expected, $actual);
 
         //Test CSS Groups
         $this->assets->reset();
         $this->assets->addCSS('test.css', ['group' => 'footer']);
         $css = $this->assets->css();
-        $this->assertEmpty($css);
+        self::assertEmpty($css);
         $css = $this->assets->css('footer');
-        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
+        self::assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         $array = $this->assets->getCss();
         /** @var Assets\BaseAsset $item */
@@ -210,15 +210,15 @@ public function testAddingAssets()
           }
         }
         ';
-        $this->assertJsonStringEqualsJsonString($expected, $actual);
+        self::assertJsonStringEqualsJsonString($expected, $actual);
 
         //Test JS Groups
         $this->assets->reset();
         $this->assets->addJs('test.js', ['group' => 'footer']);
         $js = $this->assets->js();
-        $this->assertEmpty($js);
+        self::assertEmpty($js);
         $js = $this->assets->js('footer');
-        $this->assertSame('<script src="/test.js"></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/test.js"></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
         /** @var Assets\BaseAsset $item */
@@ -239,13 +239,13 @@ public function testAddingAssets()
             "query": ""
           }
         }';
-        $this->assertJsonStringEqualsJsonString($expected, $actual);
+        self::assertJsonStringEqualsJsonString($expected, $actual);
 
         //Test async / defer
         $this->assets->reset();
         $this->assets->addJs('test.js', ['loading' => 'async']);
         $js = $this->assets->js();
-        $this->assertSame('<script src="/test.js" async></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/test.js" async></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
         /** @var Assets\BaseAsset $item */
@@ -268,12 +268,12 @@ public function testAddingAssets()
             "query": ""
           }
         }';
-        $this->assertJsonStringEqualsJsonString($expected, $actual);
+        self::assertJsonStringEqualsJsonString($expected, $actual);
 
         $this->assets->reset();
         $this->assets->addJs('test.js', ['loading' => 'defer']);
         $js = $this->assets->js();
-        $this->assertSame('<script src="/test.js" defer></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/test.js" defer></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
         /** @var Assets\BaseAsset $item */
@@ -296,71 +296,68 @@ public function testAddingAssets()
             "query": ""
           }
         }';
-        $this->assertJsonStringEqualsJsonString($expected, $actual);
+        self::assertJsonStringEqualsJsonString($expected, $actual);
 
         //Test inline
         $this->assets->reset();
         $this->assets->setJsPipeline(true);
         $this->assets->addJs('/system/assets/jquery/jquery-3.x.min.js');
         $js = $this->assets->js('head', ['loading' => 'inline']);
-        $this->assertContains('"jquery",[],function()', $js);
+        self::assertStringContainsString('"jquery",[],function()', $js);
 
         $this->assets->reset();
         $this->assets->setCssPipeline(true);
-        $this->assets->addCss('/system/assets/debugger.css');
+        $this->assets->addCss('/system/assets/debugger/phpdebugbar.css');
         $css = $this->assets->css('head', ['loading' => 'inline']);
-        $this->assertContains('div.phpdebugbar', $css);
+        self::assertStringContainsString('div.phpdebugbar', $css);
 
         $this->assets->reset();
         $this->assets->setCssPipeline(true);
         $this->assets->addCss('https://fonts.googleapis.com/css?family=Roboto');
         $css = $this->assets->css('head', ['loading' => 'inline']);
-        $this->assertContains('font-family:\'Roboto\';', $css);
+        self::assertStringContainsString('font-family:\'Roboto\';', $css);
 
         //Test adding media queries
         $this->assets->reset();
         $this->assets->add('test.css', ['media' => 'only screen and (min-width: 640px)']);
         $css = $this->assets->css();
-        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" media="only screen and (min-width: 640px)">' . PHP_EOL, $css);
-
-
+        self::assertSame('<link href="/test.css" type="text/css" rel="stylesheet" media="only screen and (min-width: 640px)">' . PHP_EOL, $css);
     }
 
-    public function testAddingAssetPropertiesWithArray()
+    public function testAddingAssetPropertiesWithArray(): void
     {
         //Test adding assets with object to define properties
         $this->assets->reset();
         $this->assets->addJs('test.js', ['loading' => 'async']);
         $js = $this->assets->js();
-        $this->assertSame('<script src="/test.js" async></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/test.js" async></script>' . PHP_EOL, $js);
         $this->assets->reset();
-
     }
 
-    public function testAddingJSAssetPropertiesWithArrayFromCollection()
+    public function testAddingJSAssetPropertiesWithArrayFromCollection(): void
     {
         //Test adding properties with array
         $this->assets->reset();
         $this->assets->addJs('jquery', ['loading' => 'async']);
         $js = $this->assets->js();
-        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" async></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/system/assets/jquery/jquery-3.x.min.js" async></script>' . PHP_EOL, $js);
 
         //Test priority too
         $this->assets->reset();
         $this->assets->addJs('jquery', ['loading' => 'async', 'priority' => 1]);
         $this->assets->addJs('test.js', ['loading' => 'async', 'priority' => 2]);
         $js = $this->assets->js();
-        $this->assertSame('<script src="/test.js" async></script>' . PHP_EOL .
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" async></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/test.js" async></script>' . PHP_EOL .
+            '<script src="/system/assets/jquery/jquery-3.x.min.js" async></script>' . PHP_EOL, $js);
 
         //Test multiple groups
         $this->assets->reset();
         $this->assets->addJs('jquery', ['loading' => 'async', 'priority' => 1, 'group' => 'footer']);
         $this->assets->addJs('test.js', ['loading' => 'async', 'priority' => 2]);
         $js = $this->assets->js();
-        $this->assertSame('<script src="/test.js" async></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/test.js" async></script>' . PHP_EOL, $js);
         $js = $this->assets->js('footer');
-        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" async></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/system/assets/jquery/jquery-3.x.min.js" async></script>' . PHP_EOL, $js);
 
         //Test adding array of assets
         //Test priority too
@@ -368,34 +365,34 @@ public function testAddingJSAssetPropertiesWithArrayFromCollection()
         $this->assets->addJs(['jquery', 'test.js'], ['loading' => 'async']);
         $js = $this->assets->js();
 
-        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" async></script>' . PHP_EOL .
+        self::assertSame('<script src="/system/assets/jquery/jquery-3.x.min.js" async></script>' . PHP_EOL .
             '<script src="/test.js" async></script>' . PHP_EOL, $js);
     }
 
-    public function testAddingLegacyFormat()
+    public function testAddingLegacyFormat(): void
     {
         // regular CSS add
         //test addCss(). Test adding asset to a separate group
         $this->assets->reset();
         $this->assets->addCSS('test.css', 15, true, 'bottom', 'async');
         $css = $this->assets->css('bottom');
-        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" async>' . PHP_EOL, $css);
+        self::assertSame('<link href="/test.css" type="text/css" rel="stylesheet" async>' . PHP_EOL, $css);
 
         $array = $this->assets->getCss();
         /** @var Assets\BaseAsset $item */
         $item = reset($array);
         $actual = json_encode($item);
         $expected = '
-        {  
+        {
            "type":"css",
-           "elements":{  
+           "elements":{
               "asset":"\/test.css",
               "asset_type":"css",
               "order":0,
               "group":"bottom",
               "position":"pipeline",
               "priority":15,
-              "attributes":{  
+              "attributes":{
                  "type":"text\/css",
                  "rel":"stylesheet",
                  "loading":"async"
@@ -404,12 +401,12 @@ public function testAddingLegacyFormat()
               "query":""
            }
         }';
-        $this->assertJsonStringEqualsJsonString($expected, $actual);
+        self::assertJsonStringEqualsJsonString($expected, $actual);
 
         $this->assets->reset();
         $this->assets->addJs('test.js', 15, false, 'defer', 'bottom');
         $js = $this->assets->js('bottom');
-        $this->assertSame('<script src="/test.js" defer></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/test.js" defer></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
         /** @var Assets\BaseAsset $item */
@@ -432,22 +429,21 @@ public function testAddingLegacyFormat()
             "query": ""
           }
         }';
-        $this->assertJsonStringEqualsJsonString($expected, $actual);
+        self::assertJsonStringEqualsJsonString($expected, $actual);
 
 
         $this->assets->reset();
         $this->assets->addInlineCss('body { color: black }', 15, 'bottom');
         $css = $this->assets->css('bottom');
-        $this->assertSame('<style>' . PHP_EOL . 'body { color: black }' . PHP_EOL . '</style>' . PHP_EOL, $css);
+        self::assertSame('<style>' . PHP_EOL . 'body { color: black }' . PHP_EOL . '</style>' . PHP_EOL, $css);
 
         $this->assets->reset();
         $this->assets->addInlineJs('alert("test")', 15, 'bottom', ['id' => 'foo']);
         $js = $this->assets->js('bottom');
-        $this->assertSame('<script id="foo">' . PHP_EOL . 'alert("test")' . PHP_EOL . '</script>' . PHP_EOL, $js);
-
+        self::assertSame('<script id="foo">' . PHP_EOL . 'alert("test")' . PHP_EOL . '</script>' . PHP_EOL, $js);
     }
 
-    public function testAddingCSSAssetPropertiesWithArrayFromCollection()
+    public function testAddingCSSAssetPropertiesWithArrayFromCollection(): void
     {
         $this->assets->registerCollection('test', ['/system/assets/whoops.css']);
 
@@ -456,7 +452,7 @@ public function testAddingCSSAssetPropertiesWithArrayFromCollection()
         $this->assets->addCss('test', ['priority' => 1]);
         $this->assets->addCss('test.css', ['priority' => 2]);
         $css = $this->assets->css();
-        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL .
+        self::assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL .
             '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         //Test multiple groups
@@ -464,27 +460,80 @@ public function testAddingCSSAssetPropertiesWithArrayFromCollection()
         $this->assets->addCss('test', ['priority' => 1, 'group' => 'footer']);
         $this->assets->addCss('test.css', ['priority' => 2]);
         $css = $this->assets->css();
-        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
+        self::assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
         $css = $this->assets->css('footer');
-        $this->assertSame('<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
+        self::assertSame('<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         //Test adding array of assets
         //Test priority too
         $this->assets->reset();
         $this->assets->addCss(['test', 'test.css'], ['loading' => 'async']);
         $css = $this->assets->css();
-        $this->assertSame('<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" async>' . PHP_EOL .
+        self::assertSame('<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" async>' . PHP_EOL .
             '<link href="/test.css" type="text/css" rel="stylesheet" async>' . PHP_EOL, $css);
     }
 
-    public function testPriorityOfAssets()
+    public function testAddingAssetPropertiesWithArrayFromCollectionAndParameters(): void
+    {
+        $this->assets->registerCollection('collection_multi_params', [
+            'foo.js' => [ 'defer' => true ],
+            'bar.js' => [ 'integrity' => 'sha512-abc123' ],
+            'foobar.css' => [ 'defer' => null, 'loading' => null ]
+        ]);
+
+        // # Test adding properties with array
+        $this->assets->addJs('collection_multi_params', ['loading' => 'async']);
+        $js = $this->assets->js();
+
+        // expected output
+        $expected = [
+            '<script src="/foo.js" async defer="1"></script>',
+            '<script src="/bar.js" async integrity="sha512-abc123"></script>',
+            '<script src="/foobar.css"></script>',
+        ];
+
+        self::assertCount(count($expected), array_filter(explode("\n", $js)));
+        self::assertSame(implode("\n", $expected) . PHP_EOL, $js);
+
+        // # Test priority as second argument + render JS should not have any css
+        $this->assets->reset();
+        $this->assets->add('low_priority.js', 1);
+        $this->assets->add('collection_multi_params', 2);
+        $js = $this->assets->js();
+
+        // expected output
+        $expected = [
+            '<script src="/foo.js" defer="1"></script>',
+            '<script src="/bar.js" integrity="sha512-abc123"></script>',
+            '<script src="/low_priority.js"></script>',
+        ];
+
+        self::assertCount(3, array_filter(explode("\n", $js)));
+        self::assertSame(implode("\n", $expected) . PHP_EOL, $js);
+
+        // # Test rendering CSS, should not have any JS
+        $this->assets->reset();
+        $this->assets->add('collection_multi_params', [ 'class' => '__classname' ]);
+        $css = $this->assets->css();
+
+        // expected output
+        $expected = [
+            '<link href="/foobar.css" type="text/css" rel="stylesheet" class="__classname">',
+        ];
+
+
+        self::assertCount(1, array_filter(explode("\n", $css)));
+        self::assertSame(implode("\n", $expected) . PHP_EOL, $css);
+    }
+
+    public function testPriorityOfAssets(): void
     {
         $this->assets->reset();
         $this->assets->add('test.css');
         $this->assets->add('test-after.css');
 
         $css = $this->assets->css();
-        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL .
+        self::assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL .
             '<link href="/test-after.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         //----------------
@@ -493,7 +542,7 @@ public function testPriorityOfAssets()
         $this->assets->add('test.css', 2);
 
         $css = $this->assets->css();
-        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL .
+        self::assertSame('<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL .
             '<link href="/test-after.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         //----------------
@@ -503,12 +552,12 @@ public function testPriorityOfAssets()
         $this->assets->add('test-before.css', 3);
 
         $css = $this->assets->css();
-        $this->assertSame('<link href="/test-before.css" type="text/css" rel="stylesheet">' . PHP_EOL .
+        self::assertSame('<link href="/test-before.css" type="text/css" rel="stylesheet">' . PHP_EOL .
             '<link href="/test.css" type="text/css" rel="stylesheet">' . PHP_EOL .
             '<link href="/test-after.css" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
     }
 
-    public function testPipeline()
+    public function testPipeline(): void
     {
         $this->assets->reset();
 
@@ -516,15 +565,15 @@ public function testPipeline()
         $this->assets->add('test.css', null, true);
         $this->assets->setCssPipeline(true);
         $css = $this->assets->css();
-        $this->assertRegExp('#<link href=\"\/assets\/(.*).css\" type=\"text\/css\" rel=\"stylesheet\">#', $css);
+        self::assertRegExp('#<link href=\"\/assets\/(.*).css\" type=\"text\/css\" rel=\"stylesheet\">#', $css);
 
         //Add a core Grav CSS file, which is found. Pipeline will now return a file
-        $this->assets->add('/system/assets/debugger.css', null, true);
+        $this->assets->add('/system/assets/debugger/phpdebugbar', null, true);
         $css = $this->assets->css();
-        $this->assertRegExp('#<link href=\"\/assets\/(.*).css\" type=\"text\/css\" rel=\"stylesheet\">#', $css);
+        self::assertRegExp('#<link href=\"\/assets\/(.*).css\" type=\"text\/css\" rel=\"stylesheet\">#', $css);
     }
 
-    public function testPipelineWithTimestamp()
+    public function testPipelineWithTimestamp(): void
     {
         $this->assets->reset();
         $this->assets->setTimestamp('foo');
@@ -533,28 +582,28 @@ public function testPipelineWithTimestamp()
         //Add a core Grav CSS file, which is found. Pipeline will now return a file
         $this->assets->add('/system/assets/debugger.css', null, true);
         $css = $this->assets->css();
-        $this->assertRegExp('#<link href=\"\/assets\/(.*).css\?foo\" type=\"text\/css\" rel=\"stylesheet\">#', $css);
+        self::assertRegExp('#<link href=\"\/assets\/(.*).css\?foo\" type=\"text\/css\" rel=\"stylesheet\">#', $css);
     }
 
-    public function testInline()
+    public function testInline(): void
     {
         $this->assets->reset();
 
         //File not existing. Pipeline searches for that file without reaching it. Output is empty.
         $this->assets->add('test.css', ['loading' => 'inline']);
         $css = $this->assets->css();
-        $this->assertSame("<style>\n\n</style>\n", $css);
+        self::assertSame("<style>\n\n</style>\n", $css);
 
         $this->assets->reset();
         //Add a core Grav CSS file, which is found. Pipeline will now return its content.
         $this->assets->addCss('https://fonts.googleapis.com/css?family=Roboto', ['loading' => 'inline']);
-        $this->assets->addCss('/system/assets/debugger.css', ['loading' => 'inline']);
+        $this->assets->addCss('/system/assets/debugger/phpdebugbar.css', ['loading' => 'inline']);
         $css = $this->assets->css();
-        $this->assertContains('font-family: \'Roboto\';', $css);
-        $this->assertContains('div.phpdebugbar-header', $css);
+        self::assertStringContainsString('font-family: \'Roboto\';', $css);
+        self::assertStringContainsString('div.phpdebugbar-header', $css);
     }
 
-    public function testInlinePipeline()
+    public function testInlinePipeline(): void
     {
         $this->assets->reset();
         $this->assets->setCssPipeline(true);
@@ -562,217 +611,237 @@ public function testInlinePipeline()
         //File not existing. Pipeline searches for that file without reaching it. Output is empty.
         $this->assets->add('test.css');
         $css = $this->assets->css('head', ['loading' => 'inline']);
-        $this->assertSame("<style>\n\n</style>\n", $css);
+        self::assertSame("<style>\n\n</style>\n", $css);
 
         //Add a core Grav CSS file, which is found. Pipeline will now return its content.
         $this->assets->addCss('https://fonts.googleapis.com/css?family=Roboto', null, true);
-        $this->assets->add('/system/assets/debugger.css', null, true);
+        $this->assets->add('/system/assets/debugger/phpdebugbar.css', null, true);
         $css = $this->assets->css('head', ['loading' => 'inline']);
-        $this->assertContains('font-family:\'Roboto\';', $css);
-        $this->assertContains('div.phpdebugbar', $css);
+        self::assertStringContainsString('font-family:\'Roboto\';', $css);
+        self::assertStringContainsString('div.phpdebugbar', $css);
     }
 
-    public function testAddAsyncJs()
+    public function testAddAsyncJs(): void
     {
         $this->assets->reset();
         $this->assets->addAsyncJs('jquery');
         $js = $this->assets->js();
-        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" async></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/system/assets/jquery/jquery-3.x.min.js" async></script>' . PHP_EOL, $js);
     }
 
-    public function testAddDeferJs()
+    public function testAddDeferJs(): void
     {
         $this->assets->reset();
         $this->assets->addDeferJs('jquery');
         $js = $this->assets->js();
-        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" defer></script>' . PHP_EOL, $js);
+        self::assertSame('<script src="/system/assets/jquery/jquery-3.x.min.js" defer></script>' . PHP_EOL, $js);
     }
 
-    public function testTimestamps()
+    public function testTimestamps(): void
     {
         // local CSS nothing extra
         $this->assets->reset();
         $this->assets->setTimestamp('foo');
         $this->assets->addCSS('test.css');
         $css = $this->assets->css();
-        $this->assertSame('<link href="/test.css?foo" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
+        self::assertSame('<link href="/test.css?foo" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         // local CSS already with param
         $this->assets->reset();
         $this->assets->setTimestamp('foo');
         $this->assets->addCSS('test.css?bar');
         $css = $this->assets->css();
-        $this->assertSame('<link href="/test.css?bar&foo" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
+        self::assertSame('<link href="/test.css?bar&foo" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         // external CSS already
         $this->assets->reset();
         $this->assets->setTimestamp('foo');
         $this->assets->addCSS('http://somesite.com/test.css');
         $css = $this->assets->css();
-        $this->assertSame('<link href="http://somesite.com/test.css?foo" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
+        self::assertSame('<link href="http://somesite.com/test.css?foo" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         // external CSS already with param
         $this->assets->reset();
         $this->assets->setTimestamp('foo');
         $this->assets->addCSS('http://somesite.com/test.css?bar');
         $css = $this->assets->css();
-        $this->assertSame('<link href="http://somesite.com/test.css?bar&foo" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
+        self::assertSame('<link href="http://somesite.com/test.css?bar&foo" type="text/css" rel="stylesheet">' . PHP_EOL, $css);
 
         // local JS nothing extra
         $this->assets->reset();
         $this->assets->setTimestamp('foo');
         $this->assets->addJs('test.js');
         $css = $this->assets->js();
-        $this->assertSame('<script src="/test.js?foo"></script>' . PHP_EOL, $css);
+        self::assertSame('<script src="/test.js?foo"></script>' . PHP_EOL, $css);
 
         // local JS already with param
         $this->assets->reset();
         $this->assets->setTimestamp('foo');
         $this->assets->addJs('test.js?bar');
         $css = $this->assets->js();
-        $this->assertSame('<script src="/test.js?bar&foo"></script>' . PHP_EOL, $css);
+        self::assertSame('<script src="/test.js?bar&foo"></script>' . PHP_EOL, $css);
 
         // external JS already
         $this->assets->reset();
         $this->assets->setTimestamp('foo');
         $this->assets->addJs('http://somesite.com/test.js');
         $css = $this->assets->js();
-        $this->assertSame('<script src="http://somesite.com/test.js?foo"></script>' . PHP_EOL, $css);
+        self::assertSame('<script src="http://somesite.com/test.js?foo"></script>' . PHP_EOL, $css);
 
         // external JS already with param
         $this->assets->reset();
         $this->assets->setTimestamp('foo');
         $this->assets->addJs('http://somesite.com/test.js?bar');
         $css = $this->assets->js();
-        $this->assertSame('<script src="http://somesite.com/test.js?bar&foo"></script>' . PHP_EOL, $css);
+        self::assertSame('<script src="http://somesite.com/test.js?bar&foo"></script>' . PHP_EOL, $css);
     }
 
-    public function testAddInlineCss()
+    public function testAddInlineCss(): void
     {
         $this->assets->reset();
         $this->assets->addInlineCss('body { color: black }');
         $css = $this->assets->css();
-        $this->assertSame('<style>' . PHP_EOL . 'body { color: black }' . PHP_EOL . '</style>' . PHP_EOL, $css);
+        self::assertSame('<style>' . PHP_EOL . 'body { color: black }' . PHP_EOL . '</style>' . PHP_EOL, $css);
     }
 
-    public function testAddInlineJs()
+    public function testAddInlineJs(): void
     {
         $this->assets->reset();
         $this->assets->addInlineJs('alert("test")');
         $js = $this->assets->js();
-        $this->assertSame('<script>' . PHP_EOL . 'alert("test")' . PHP_EOL . '</script>' . PHP_EOL, $js);
+        self::assertSame('<script>' . PHP_EOL . 'alert("test")' . PHP_EOL . '</script>' . PHP_EOL, $js);
     }
 
-    public function testGetCollections()
+    public function testGetCollections(): void
     {
-        $this->assertInternalType('array', $this->assets->getCollections());
-        $this->assertContains('jquery', array_keys($this->assets->getCollections()));
-        $this->assertContains('system://assets/jquery/jquery-2.x.min.js', $this->assets->getCollections());
+        self::assertIsArray($this->assets->getCollections());
+        self::assertContains('jquery', array_keys($this->assets->getCollections()));
+        self::assertContains('system://assets/jquery/jquery-3.x.min.js', $this->assets->getCollections());
     }
 
-    public function testExists()
+    public function testExists(): void
     {
-        $this->assertTrue($this->assets->exists('jquery'));
-        $this->assertFalse($this->assets->exists('another-unexisting-library'));
+        self::assertTrue($this->assets->exists('jquery'));
+        self::assertFalse($this->assets->exists('another-unexisting-library'));
     }
 
-    public function testRegisterCollection()
+    public function testRegisterCollection(): void
     {
         $this->assets->registerCollection('debugger', ['/system/assets/debugger.css']);
-        $this->assertTrue($this->assets->exists('debugger'));
-        $this->assertContains('debugger', array_keys($this->assets->getCollections()));
+        self::assertTrue($this->assets->exists('debugger'));
+        self::assertContains('debugger', array_keys($this->assets->getCollections()));
     }
 
-    public function testReset()
+    public function testRegisterCollectionWithParameters(): void
+    {
+        $this->assets->registerCollection('collection_multi_params', [
+            'foo.js' => [ 'defer' => true ],
+            'bar.js' => [ 'integrity' => 'sha512-abc123' ],
+            'foobar.css' => [ 'defer' => null ],
+        ]);
+
+        self::assertTrue($this->assets->exists('collection_multi_params'));
+
+        $collection = $this->assets->getCollections()['collection_multi_params'];
+        self::assertArrayHasKey('foo.js', $collection);
+        self::assertArrayHasKey('bar.js', $collection);
+        self::assertArrayHasKey('foobar.css', $collection);
+        self::assertArrayHasKey('defer', $collection['foo.js']);
+        self::assertArrayHasKey('defer', $collection['foobar.css']);
+
+        self::assertNull($collection['foobar.css']['defer']);
+        self::assertTrue($collection['foo.js']['defer']);
+    }
+
+    public function testReset(): void
     {
         $this->assets->addInlineJs('alert("test")');
         $this->assets->reset();
-        $this->assertCount(0, (array) $this->assets->getJs());
+        self::assertCount(0, (array) $this->assets->getJs());
 
         $this->assets->addAsyncJs('jquery');
         $this->assets->reset();
-        $this->assertCount(0, (array) $this->assets->getJs());
+        self::assertCount(0, (array) $this->assets->getJs());
 
         $this->assets->addInlineCss('body { color: black }');
         $this->assets->reset();
-        $this->assertCount(0, (array) $this->assets->getCss());
+        self::assertCount(0, (array) $this->assets->getCss());
 
         $this->assets->add('/system/assets/debugger.css', null, true);
         $this->assets->reset();
-        $this->assertCount(0, (array) $this->assets->getCss());
+        self::assertCount(0, (array) $this->assets->getCss());
     }
 
-    public function testResetJs()
+    public function testResetJs(): void
     {
         $this->assets->addInlineJs('alert("test")');
         $this->assets->resetJs();
-        $this->assertCount(0, (array) $this->assets->getJs());
+        self::assertCount(0, (array) $this->assets->getJs());
 
         $this->assets->addAsyncJs('jquery');
         $this->assets->resetJs();
-        $this->assertCount(0, (array) $this->assets->getJs());
+        self::assertCount(0, (array) $this->assets->getJs());
     }
 
-    public function testResetCss()
+    public function testResetCss(): void
     {
         $this->assets->addInlineCss('body { color: black }');
         $this->assets->resetCss();
-        $this->assertCount(0, (array) $this->assets->getCss());
+        self::assertCount(0, (array) $this->assets->getCss());
 
         $this->assets->add('/system/assets/debugger.css', null, true);
         $this->assets->resetCss();
-        $this->assertCount(0, (array) $this->assets->getCss());
+        self::assertCount(0, (array) $this->assets->getCss());
     }
 
-    public function testAddDirCss()
+    public function testAddDirCss(): void
     {
         $this->assets->addDirCss('/system');
 
-        $this->assertInternalType('array', $this->assets->getCss());
-        $this->assertGreaterThan(0, (array) $this->assets->getCss());
-        $this->assertInternalType('array', $this->assets->getJs());
-        $this->assertCount(0, (array) $this->assets->getJs());
+        self::assertIsArray($this->assets->getCss());
+        self::assertGreaterThan(0, (array) $this->assets->getCss());
+        self::assertIsArray($this->assets->getJs());
+        self::assertCount(0, (array) $this->assets->getJs());
 
         $this->assets->reset();
         $this->assets->addDirCss('/system/assets');
 
-        $this->assertInternalType('array', $this->assets->getCss());
-        $this->assertGreaterThan(0, (array) $this->assets->getCss());
-        $this->assertInternalType('array', $this->assets->getJs());
-        $this->assertCount(0, (array) $this->assets->getJs());
+        self::assertIsArray($this->assets->getCss());
+        self::assertGreaterThan(0, (array) $this->assets->getCss());
+        self::assertIsArray($this->assets->getJs());
+        self::assertCount(0, (array) $this->assets->getJs());
 
         $this->assets->reset();
         $this->assets->addDirJs('/system');
 
-        $this->assertInternalType('array', $this->assets->getCss());
-        $this->assertCount(0, (array) $this->assets->getCss());
-        $this->assertInternalType('array', $this->assets->getJs());
-        $this->assertGreaterThan(0, (array) $this->assets->getJs());
+        self::assertIsArray($this->assets->getCss());
+        self::assertCount(0, (array) $this->assets->getCss());
+        self::assertIsArray($this->assets->getJs());
+        self::assertGreaterThan(0, (array) $this->assets->getJs());
 
         $this->assets->reset();
         $this->assets->addDirJs('/system/assets');
 
-        $this->assertInternalType('array', $this->assets->getCss());
-        $this->assertCount(0, (array) $this->assets->getCss());
-        $this->assertInternalType('array', $this->assets->getJs());
-        $this->assertGreaterThan(0, (array) $this->assets->getJs());
+        self::assertIsArray($this->assets->getCss());
+        self::assertCount(0, (array) $this->assets->getCss());
+        self::assertIsArray($this->assets->getJs());
+        self::assertGreaterThan(0, (array) $this->assets->getJs());
 
         $this->assets->reset();
         $this->assets->addDir('/system/assets');
 
-        $this->assertInternalType('array', $this->assets->getCss());
-        $this->assertGreaterThan(0, (array) $this->assets->getCss());
-        $this->assertInternalType('array', $this->assets->getJs());
-        $this->assertGreaterThan(0, (array) $this->assets->getJs());
+        self::assertIsArray($this->assets->getCss());
+        self::assertGreaterThan(0, (array) $this->assets->getCss());
+        self::assertIsArray($this->assets->getJs());
+        self::assertGreaterThan(0, (array) $this->assets->getJs());
 
         //Use streams
         $this->assets->reset();
         $this->assets->addDir('system://assets');
 
-        $this->assertInternalType('array', $this->assets->getCss());
-        $this->assertGreaterThan(0, (array) $this->assets->getCss());
-        $this->assertInternalType('array', $this->assets->getJs());
-        $this->assertGreaterThan(0, (array) $this->assets->getJs());
-
+        self::assertIsArray($this->assets->getCss());
+        self::assertGreaterThan(0, (array) $this->assets->getCss());
+        self::assertIsArray($this->assets->getJs());
+        self::assertGreaterThan(0, (array) $this->assets->getJs());
     }
 }
diff --git a/tests/unit/Grav/Common/BrowserTest.php b/tests/unit/Grav/Common/BrowserTest.php
index 6e637384e3..a1033d8c97 100644
--- a/tests/unit/Grav/Common/BrowserTest.php
+++ b/tests/unit/Grav/Common/BrowserTest.php
@@ -11,38 +11,41 @@ class BrowserTest extends \Codeception\TestCase\Test
     /** @var Grav $grav */
     protected $grav;
 
-    protected function _before()
+    protected function _before(): void
     {
         $grav = Fixtures::get('grav');
         $this->grav = $grav();
     }
 
-    protected function _after()
+    protected function _after(): void
     {
     }
 
-    public function testGetBrowser()
-    { /* Already covered by PhpUserAgent tests */
+    public function testGetBrowser(): void
+    {
+ /* Already covered by PhpUserAgent tests */
     }
 
-    public function testGetPlatform()
-    { /* Already covered by PhpUserAgent tests */
+    public function testGetPlatform(): void
+    {
+ /* Already covered by PhpUserAgent tests */
     }
 
-    public function testGetLongVersion()
-    { /* Already covered by PhpUserAgent tests */
+    public function testGetLongVersion(): void
+    {
+ /* Already covered by PhpUserAgent tests */
     }
 
-    public function testGetVersion()
-    { /* Already covered by PhpUserAgent tests */
+    public function testGetVersion(): void
+    {
+ /* Already covered by PhpUserAgent tests */
     }
 
-    public function testIsHuman()
+    public function testIsHuman(): void
     {
         //Already Partially covered by PhpUserAgent tests
 
         //Make sure it recognizes the test as not human
-        $this->assertFalse($this->grav['browser']->isHuman());
+        self::assertFalse($this->grav['browser']->isHuman());
     }
 }
-
diff --git a/tests/unit/Grav/Common/ComposerTest.php b/tests/unit/Grav/Common/ComposerTest.php
index 243a888628..8c73a1fc3d 100644
--- a/tests/unit/Grav/Common/ComposerTest.php
+++ b/tests/unit/Grav/Common/ComposerTest.php
@@ -5,28 +5,27 @@
 
 class ComposerTest extends \Codeception\TestCase\Test
 {
-    protected function _before()
+    protected function _before(): void
     {
     }
 
-    protected function _after()
+    protected function _after(): void
     {
     }
 
-    public function testGetComposerLocation()
+    public function testGetComposerLocation(): void
     {
         $composerLocation = Composer::getComposerLocation();
-        $this->assertInternalType('string', $composerLocation);
-        $this->assertSame('/', $composerLocation[0]);
+        self::assertIsString($composerLocation);
+        self::assertSame('/', $composerLocation[0]);
     }
 
-    public function testGetComposerExecutor()
+    public function testGetComposerExecutor(): void
     {
         $composerExecutor = Composer::getComposerExecutor();
-        $this->assertInternalType('string', $composerExecutor);
-        $this->assertSame('/', $composerExecutor[0]);
-        $this->assertNotNull(strstr($composerExecutor, 'php'));
-        $this->assertNotNull(strstr($composerExecutor, 'composer'));
+        self::assertIsString($composerExecutor);
+        self::assertSame('/', $composerExecutor[0]);
+        self::assertNotNull(strstr($composerExecutor, 'php'));
+        self::assertNotNull(strstr($composerExecutor, 'composer'));
     }
-
 }
diff --git a/tests/unit/Grav/Common/Data/BlueprintTest.php b/tests/unit/Grav/Common/Data/BlueprintTest.php
new file mode 100644
index 0000000000..ff6ccf56e7
--- /dev/null
+++ b/tests/unit/Grav/Common/Data/BlueprintTest.php
@@ -0,0 +1,72 @@
+<?php
+
+use Grav\Common\Config\Config;
+use Grav\Common\Data\Blueprint;
+use Grav\Common\Grav;
+
+/**
+ * Class InstallCommandTest
+ */
+class BlueprintTest extends \Codeception\TestCase\Test
+{
+    /**
+     */
+    public function testValidateStrict(): void
+    {
+        $blueprint = $this->loadBlueprint('strict');
+
+        $blueprint->validate(['test' => 'string']);
+    }
+
+    /**
+     * @depends testValidateStrict
+     */
+    public function testValidateStrictRequired(): void
+    {
+        $blueprint = $this->loadBlueprint('strict');
+
+        $this->expectException(\Grav\Common\Data\ValidationException::class);
+        $blueprint->validate([]);
+    }
+
+    /**
+     * @depends testValidateStrict
+     */
+    public function testValidateStrictExtra(): void
+    {
+        $blueprint = $this->loadBlueprint('strict');
+
+        $blueprint->validate(['test' => 'string', 'wrong' => 'field']);
+    }
+
+    /**
+     * @depends testValidateStrict
+     */
+    public function testValidateStrictExtraException(): void
+    {
+        $blueprint = $this->loadBlueprint('strict');
+
+        /** @var Config $config */
+        $config = Grav::instance()['config'];
+        $var = 'system.strict_mode.blueprint_strict_compat';
+        $config->set($var, false);
+
+        $this->expectException(\Grav\Common\Data\ValidationException::class);
+        $blueprint->validate(['test' => 'string', 'wrong' => 'field']);
+
+        $config->set($var, true);
+    }
+
+    /**
+     * @param string $filename
+     * @return Blueprint
+     */
+    protected function loadBlueprint($filename): Blueprint
+    {
+        $blueprint = new Blueprint('strict');
+        $blueprint->setContext(dirname(__DIR__, 3). '/data/blueprints');
+        $blueprint->load()->init();
+
+        return $blueprint;
+    }
+}
diff --git a/tests/unit/Grav/Common/GPM/GPMTest.php b/tests/unit/Grav/Common/GPM/GPMTest.php
index 7e1c03e925..684ed3dd18 100644
--- a/tests/unit/Grav/Common/GPM/GPMTest.php
+++ b/tests/unit/Grav/Common/GPM/GPMTest.php
@@ -7,18 +7,25 @@
 define('EXCEPTION_BAD_FORMAT', 1);
 define('EXCEPTION_INCOMPATIBLE_VERSIONS', 2);
 
+/**
+ * Class GpmStub
+ */
 class GpmStub extends GPM
 {
+    /** @var array */
     public $data;
 
-    public function findPackage($packageName, $ignore_exception = false)
+    /**
+     * @inheritdoc
+     */
+    public function findPackage($search, $ignore_exception = false)
     {
-        if (isset($this->data[$packageName])) {
-            return $this->data[$packageName];
-        }
-
+        return $this->data[$search] ?? false;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function findPackages($searches = [])
     {
         return $this->data;
@@ -36,17 +43,17 @@ class GpmTest extends \Codeception\TestCase\Test
     /** @var GpmStub */
     protected $gpm;
 
-    protected function _before()
+    protected function _before(): void
     {
         $this->grav = Fixtures::get('grav');
         $this->gpm = new GpmStub();
     }
 
-    protected function _after()
+    protected function _after(): void
     {
     }
 
-    public function testCalculateMergedDependenciesOfPackages()
+    public function testCalculateMergedDependenciesOfPackages(): void
     {
         //////////////////////////////////////////////////////////////////////////////////////////
         // First working example
@@ -54,22 +61,22 @@ public function testCalculateMergedDependenciesOfPackages()
         $this->gpm->data = [
             'admin' => (object)[
                 'dependencies' => [
-                    ["name" => "grav", "version" => ">=1.0.10"],
-                    ["name" => "form", "version" => "~2.0"],
-                    ["name" => "login", "version" => ">=2.0"],
-                    ["name" => "errors", "version" => "*"],
-                    ["name" => "problems"],
+                    ['name' => 'grav', 'version' => '>=1.0.10'],
+                    ['name' => 'form', 'version' => '~2.0'],
+                    ['name' => 'login', 'version' => '>=2.0'],
+                    ['name' => 'errors', 'version' => '*'],
+                    ['name' => 'problems'],
                 ]
             ],
             'test' => (object)[
                 'dependencies' => [
-                    ["name" => "errors", "version" => ">=1.0"]
+                    ['name' => 'errors', 'version' => '>=1.0']
                 ]
             ],
             'grav',
             'form' => (object)[
                 'dependencies' => [
-                    ["name" => "errors", "version" => ">=3.2"]
+                    ['name' => 'errors', 'version' => '>=3.2']
                 ]
             ]
 
@@ -80,12 +87,12 @@ public function testCalculateMergedDependenciesOfPackages()
 
         $dependencies = $this->gpm->calculateMergedDependenciesOfPackages($packages);
 
-        $this->assertInternalType('array', $dependencies);
-        $this->assertCount(5, $dependencies);
+        self::assertIsArray($dependencies);
+        self::assertCount(5, $dependencies);
 
-        $this->assertSame('>=1.0.10', $dependencies['grav']);
-        $this->assertArrayHasKey('errors', $dependencies);
-        $this->assertArrayHasKey('problems', $dependencies);
+        self::assertSame('>=1.0.10', $dependencies['grav']);
+        self::assertArrayHasKey('errors', $dependencies);
+        self::assertArrayHasKey('problems', $dependencies);
 
         //////////////////////////////////////////////////////////////////////////////////////////
         // Second working example
@@ -93,9 +100,9 @@ public function testCalculateMergedDependenciesOfPackages()
         $packages = ['admin', 'form'];
 
         $dependencies = $this->gpm->calculateMergedDependenciesOfPackages($packages);
-        $this->assertInternalType('array', $dependencies);
-        $this->assertCount(5, $dependencies);
-        $this->assertSame('>=3.2', $dependencies['errors']);
+        self::assertIsArray($dependencies);
+        self::assertCount(5, $dependencies);
+        self::assertSame('>=3.2', $dependencies['errors']);
 
         //////////////////////////////////////////////////////////////////////////////////////////
         // Third working example
@@ -104,17 +111,17 @@ public function testCalculateMergedDependenciesOfPackages()
 
             'admin' => (object)[
                 'dependencies' => [
-                    ["name" => "errors", "version" => ">=4.0"],
+                    ['name' => 'errors', 'version' => '>=4.0'],
                 ]
             ],
             'test' => (object)[
                 'dependencies' => [
-                    ["name" => "errors", "version" => ">=1.0"]
+                    ['name' => 'errors', 'version' => '>=1.0']
                 ]
             ],
             'another' => (object)[
                 'dependencies' => [
-                    ["name" => "errors", "version" => ">=3.2"]
+                    ['name' => 'errors', 'version' => '>=3.2']
                 ]
             ]
 
@@ -124,9 +131,9 @@ public function testCalculateMergedDependenciesOfPackages()
 
 
         $dependencies = $this->gpm->calculateMergedDependenciesOfPackages($packages);
-        $this->assertInternalType('array', $dependencies);
-        $this->assertCount(1, $dependencies);
-        $this->assertSame('>=4.0', $dependencies['errors']);
+        self::assertIsArray($dependencies);
+        self::assertCount(1, $dependencies);
+        self::assertSame('>=4.0', $dependencies['errors']);
 
 
 
@@ -136,23 +143,23 @@ public function testCalculateMergedDependenciesOfPackages()
         $this->gpm->data = [
             'admin' => (object)[
                 'dependencies' => [
-                    ["name" => "package1", "version" => ">=4.0.0-rc1"],
-                    ["name" => "package4", "version" => ">=3.2.0"],
+                    ['name' => 'package1', 'version' => '>=4.0.0-rc1'],
+                    ['name' => 'package4', 'version' => '>=3.2.0'],
                 ]
             ],
             'test' => (object)[
                 'dependencies' => [
-                    ["name" => "package1", "version" => ">=4.0.0-rc2"],
-                    ["name" => "package2", "version" => ">=3.2.0-alpha"],
-                    ["name" => "package3", "version" => ">=3.2.0-alpha.2"],
-                    ["name" => "package4", "version" => ">=3.2.0-alpha"],
+                    ['name' => 'package1', 'version' => '>=4.0.0-rc2'],
+                    ['name' => 'package2', 'version' => '>=3.2.0-alpha'],
+                    ['name' => 'package3', 'version' => '>=3.2.0-alpha.2'],
+                    ['name' => 'package4', 'version' => '>=3.2.0-alpha'],
                 ]
             ],
             'another' => (object)[
                 'dependencies' => [
-                    ["name" => "package2", "version" => ">=3.2.0-beta.11"],
-                    ["name" => "package3", "version" => ">=3.2.0-alpha.1"],
-                    ["name" => "package4", "version" => ">=3.2.0-beta"],
+                    ['name' => 'package2', 'version' => '>=3.2.0-beta.11'],
+                    ['name' => 'package3', 'version' => '>=3.2.0-alpha.1'],
+                    ['name' => 'package4', 'version' => '>=3.2.0-beta'],
                 ]
             ]
         ];
@@ -161,10 +168,10 @@ public function testCalculateMergedDependenciesOfPackages()
 
 
         $dependencies = $this->gpm->calculateMergedDependenciesOfPackages($packages);
-        $this->assertSame('>=4.0.0-rc2', $dependencies['package1']);
-        $this->assertSame('>=3.2.0-beta.11', $dependencies['package2']);
-        $this->assertSame('>=3.2.0-alpha.2', $dependencies['package3']);
-        $this->assertSame('>=3.2.0', $dependencies['package4']);
+        self::assertSame('>=4.0.0-rc2', $dependencies['package1']);
+        self::assertSame('>=3.2.0-beta.11', $dependencies['package2']);
+        self::assertSame('>=3.2.0-alpha.2', $dependencies['package3']);
+        self::assertSame('>=3.2.0', $dependencies['package4']);
 
 
         //////////////////////////////////////////////////////////////////////////////////////////
@@ -174,12 +181,12 @@ public function testCalculateMergedDependenciesOfPackages()
 
             'admin' => (object)[
                 'dependencies' => [
-                    ["name" => "errors", "version" => ">=4.0"],
+                    ['name' => 'errors', 'version' => '>=4.0'],
                 ]
             ],
             'test' => (object)[
                 'dependencies' => [
-                    ["name" => "errors", "version" => ">="]
+                    ['name' => 'errors', 'version' => '>=']
                 ]
             ],
 
@@ -189,10 +196,10 @@ public function testCalculateMergedDependenciesOfPackages()
 
         try {
             $this->gpm->calculateMergedDependenciesOfPackages($packages);
-            $this->fail("Expected Exception not thrown");
+            self::fail('Expected Exception not thrown');
         } catch (Exception $e) {
-            $this->assertEquals(EXCEPTION_BAD_FORMAT, $e->getCode());
-            $this->assertStringStartsWith("Bad format for version of dependency", $e->getMessage());
+            self::assertEquals(EXCEPTION_BAD_FORMAT, $e->getCode());
+            self::assertStringStartsWith('Bad format for version of dependency', $e->getMessage());
         }
 
         //////////////////////////////////////////////////////////////////////////////////////////
@@ -201,12 +208,12 @@ public function testCalculateMergedDependenciesOfPackages()
         $this->gpm->data = [
             'admin' => (object)[
                 'dependencies' => [
-                    ["name" => "errors", "version" => "~4.0"],
+                    ['name' => 'errors', 'version' => '~4.0'],
                 ]
             ],
             'test' => (object)[
                 'dependencies' => [
-                    ["name" => "errors", "version" => "~3.0"]
+                    ['name' => 'errors', 'version' => '~3.0']
                 ]
             ],
         ];
@@ -215,10 +222,10 @@ public function testCalculateMergedDependenciesOfPackages()
 
         try {
             $this->gpm->calculateMergedDependenciesOfPackages($packages);
-            $this->fail("Expected Exception not thrown");
+            self::fail('Expected Exception not thrown');
         } catch (Exception $e) {
-            $this->assertEquals(EXCEPTION_INCOMPATIBLE_VERSIONS, $e->getCode());
-            $this->assertStringEndsWith("required in two incompatible versions", $e->getMessage());
+            self::assertEquals(EXCEPTION_INCOMPATIBLE_VERSIONS, $e->getCode());
+            self::assertStringEndsWith('required in two incompatible versions', $e->getMessage());
         }
 
         //////////////////////////////////////////////////////////////////////////////////////////
@@ -227,22 +234,22 @@ public function testCalculateMergedDependenciesOfPackages()
         $this->gpm->data = [
             'admin' => (object)[
                 'dependencies' => [
-                    ["name" => "grav", "version" => ">=1.0.10"],
-                    ["name" => "form", "version" => "~2.0"],
-                    ["name" => "login", "version" => ">=2.0"],
-                    ["name" => "errors", "version" => "*"],
-                    ["name" => "problems"],
+                    ['name' => 'grav', 'version' => '>=1.0.10'],
+                    ['name' => 'form', 'version' => '~2.0'],
+                    ['name' => 'login', 'version' => '>=2.0'],
+                    ['name' => 'errors', 'version' => '*'],
+                    ['name' => 'problems'],
                 ]
             ],
             'login' => (object)[
                 'dependencies' => [
-                    ["name" => "antimatter", "version" => ">=1.0"]
+                    ['name' => 'antimatter', 'version' => '>=1.0']
                 ]
             ],
             'grav',
             'antimatter' => (object)[
                 'dependencies' => [
-                    ["name" => "something", "version" => ">=3.2"]
+                    ['name' => 'something', 'version' => '>=3.2']
                 ]
             ]
 
@@ -253,71 +260,70 @@ public function testCalculateMergedDependenciesOfPackages()
 
         $dependencies = $this->gpm->calculateMergedDependenciesOfPackages($packages);
 
-        $this->assertInternalType('array', $dependencies);
-        $this->assertCount(7, $dependencies);
+        self::assertIsArray($dependencies);
+        self::assertCount(7, $dependencies);
 
-        $this->assertSame('>=1.0.10', $dependencies['grav']);
-        $this->assertArrayHasKey('errors', $dependencies);
-        $this->assertArrayHasKey('problems', $dependencies);
-        $this->assertArrayHasKey('antimatter', $dependencies);
-        $this->assertArrayHasKey('something', $dependencies);
-        $this->assertSame('>=3.2', $dependencies['something']);
+        self::assertSame('>=1.0.10', $dependencies['grav']);
+        self::assertArrayHasKey('errors', $dependencies);
+        self::assertArrayHasKey('problems', $dependencies);
+        self::assertArrayHasKey('antimatter', $dependencies);
+        self::assertArrayHasKey('something', $dependencies);
+        self::assertSame('>=3.2', $dependencies['something']);
     }
 
-    public function testVersionFormatIsNextSignificantRelease()
+    public function testVersionFormatIsNextSignificantRelease(): void
     {
-        $this->assertFalse($this->gpm->versionFormatIsNextSignificantRelease('>=1.0'));
-        $this->assertFalse($this->gpm->versionFormatIsNextSignificantRelease('>=2.3.4'));
-        $this->assertFalse($this->gpm->versionFormatIsNextSignificantRelease('>=2.3.x'));
-        $this->assertFalse($this->gpm->versionFormatIsNextSignificantRelease('1.0'));
-        $this->assertTrue($this->gpm->versionFormatIsNextSignificantRelease('~2.3.x'));
-        $this->assertTrue($this->gpm->versionFormatIsNextSignificantRelease('~2.0'));
+        self::assertFalse($this->gpm->versionFormatIsNextSignificantRelease('>=1.0'));
+        self::assertFalse($this->gpm->versionFormatIsNextSignificantRelease('>=2.3.4'));
+        self::assertFalse($this->gpm->versionFormatIsNextSignificantRelease('>=2.3.x'));
+        self::assertFalse($this->gpm->versionFormatIsNextSignificantRelease('1.0'));
+        self::assertTrue($this->gpm->versionFormatIsNextSignificantRelease('~2.3.x'));
+        self::assertTrue($this->gpm->versionFormatIsNextSignificantRelease('~2.0'));
     }
 
-    public function testVersionFormatIsEqualOrHigher()
+    public function testVersionFormatIsEqualOrHigher(): void
     {
-        $this->assertTrue($this->gpm->versionFormatIsEqualOrHigher('>=1.0'));
-        $this->assertTrue($this->gpm->versionFormatIsEqualOrHigher('>=2.3.4'));
-        $this->assertTrue($this->gpm->versionFormatIsEqualOrHigher('>=2.3.x'));
-        $this->assertFalse($this->gpm->versionFormatIsEqualOrHigher('~2.3.x'));
-        $this->assertFalse($this->gpm->versionFormatIsEqualOrHigher('1.0'));
+        self::assertTrue($this->gpm->versionFormatIsEqualOrHigher('>=1.0'));
+        self::assertTrue($this->gpm->versionFormatIsEqualOrHigher('>=2.3.4'));
+        self::assertTrue($this->gpm->versionFormatIsEqualOrHigher('>=2.3.x'));
+        self::assertFalse($this->gpm->versionFormatIsEqualOrHigher('~2.3.x'));
+        self::assertFalse($this->gpm->versionFormatIsEqualOrHigher('1.0'));
     }
 
-    public function testCheckNextSignificantReleasesAreCompatible()
+    public function testCheckNextSignificantReleasesAreCompatible(): void
     {
         /*
          * ~1.0     is equivalent to >=1.0 < 2.0.0
          * ~1.2     is equivalent to >=1.2 <2.0.0
          * ~1.2.3   is equivalent to >=1.2.3 <1.3.0
          */
-        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.2'));
-        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.2', '1.0'));
-        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.0.10'));
-        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.1', '1.1.10'));
-        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('30.0', '30.10'));
-        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.1.10'));
-        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.8'));
-        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0.1', '1.1'));
-        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('2.0.0-beta', '2.0'));
-        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('2.0.0-rc.1', '2.0'));
-        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('2.0', '2.0.0-alpha'));
-
-        $this->assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '2.2'));
-        $this->assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('1.0.0-beta.1', '2.0'));
-        $this->assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('0.9.99', '1.0.0'));
-        $this->assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('0.9.99', '1.0.10'));
-        $this->assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('0.9.99', '1.0.10.2'));
+        self::assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.2'));
+        self::assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.2', '1.0'));
+        self::assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.0.10'));
+        self::assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.1', '1.1.10'));
+        self::assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('30.0', '30.10'));
+        self::assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.1.10'));
+        self::assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.8'));
+        self::assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0.1', '1.1'));
+        self::assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('2.0.0-beta', '2.0'));
+        self::assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('2.0.0-rc.1', '2.0'));
+        self::assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('2.0', '2.0.0-alpha'));
+
+        self::assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '2.2'));
+        self::assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('1.0.0-beta.1', '2.0'));
+        self::assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('0.9.99', '1.0.0'));
+        self::assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('0.9.99', '1.0.10'));
+        self::assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('0.9.99', '1.0.10.2'));
     }
 
-
-    public function testCalculateVersionNumberFromDependencyVersion()
+    public function testCalculateVersionNumberFromDependencyVersion(): void
     {
-        $this->assertSame('2.0', $this->gpm->calculateVersionNumberFromDependencyVersion('>=2.0'));
-        $this->assertSame('2.0.2', $this->gpm->calculateVersionNumberFromDependencyVersion('>=2.0.2'));
-        $this->assertSame('2.0.2', $this->gpm->calculateVersionNumberFromDependencyVersion('~2.0.2'));
-        $this->assertSame('1', $this->gpm->calculateVersionNumberFromDependencyVersion('~1'));
-        $this->assertNull($this->gpm->calculateVersionNumberFromDependencyVersion(''));
-        $this->assertNull($this->gpm->calculateVersionNumberFromDependencyVersion('*'));
-        $this->assertSame('2.0.2', $this->gpm->calculateVersionNumberFromDependencyVersion('2.0.2'));
+        self::assertSame('2.0', $this->gpm->calculateVersionNumberFromDependencyVersion('>=2.0'));
+        self::assertSame('2.0.2', $this->gpm->calculateVersionNumberFromDependencyVersion('>=2.0.2'));
+        self::assertSame('2.0.2', $this->gpm->calculateVersionNumberFromDependencyVersion('~2.0.2'));
+        self::assertSame('1', $this->gpm->calculateVersionNumberFromDependencyVersion('~1'));
+        self::assertNull($this->gpm->calculateVersionNumberFromDependencyVersion(''));
+        self::assertNull($this->gpm->calculateVersionNumberFromDependencyVersion('*'));
+        self::assertSame('2.0.2', $this->gpm->calculateVersionNumberFromDependencyVersion('2.0.2'));
     }
 }
diff --git a/tests/unit/Grav/Common/Helpers/ExcerptsTest.php b/tests/unit/Grav/Common/Helpers/ExcerptsTest.php
index b57b3856c8..8cb473c314 100644
--- a/tests/unit/Grav/Common/Helpers/ExcerptsTest.php
+++ b/tests/unit/Grav/Common/Helpers/ExcerptsTest.php
@@ -3,10 +3,12 @@
 use Codeception\Util\Fixtures;
 use Grav\Common\Helpers\Excerpts;
 use Grav\Common\Grav;
+use Grav\Common\Page\Interfaces\PageInterface;
 use Grav\Common\Uri;
 use Grav\Common\Config\Config;
 use Grav\Common\Page\Pages;
 use Grav\Common\Language\Language;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 /**
  * Class ExcerptsTest
@@ -36,7 +38,7 @@ class ExcerptsTest extends \Codeception\TestCase\Test
 
     protected $old_home;
 
-    protected function _before()
+    protected function _before(): void
     {
         $grav = Fixtures::get('grav');
         $this->grav = $grav();
@@ -64,22 +66,55 @@ protected function _before()
             'escape_markup'    => false,
             'special_chars'    => ['>' => 'gt', '<' => 'lt'],
         ];
-        $this->page = $this->pages->dispatch('/item2/item2-2');
+        $this->page = $this->pages->find('/item2/item2-2');
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
     }
 
-    protected function _after()
+    protected function _after(): void
     {
         $this->config->set('system.home.alias', $this->old_home);
     }
 
 
-    public function testProcessImageHtml()
+    public function testProcessImageHtml(): void
     {
-        $this->assertRegexp('|<img alt="Sample Image" src="\/images\/.*-sample-image.jpe?g\" data-src="sample-image\.jpg\?cropZoom=300,300" \/>|',
-            Excerpts::processImageHtml('<img src="sample-image.jpg?cropZoom=300,300" alt="Sample Image" />', $this->page));
-        $this->assertRegexp('|<img alt="Sample Image" class="foo" src="\/images\/.*-sample-image.jpe?g\" data-src="sample-image\.jpg\?classes=foo" \/>|',
-            Excerpts::processImageHtml('<img src="sample-image.jpg?classes=foo" alt="Sample Image" />', $this->page));
+        self::assertRegexp(
+            '|<img alt="Sample Image" src="\/images\/.*-sample-image.jpe?g\" data-src="sample-image\.jpg\?cropZoom=300,300" \/>|',
+            Excerpts::processImageHtml('<img src="sample-image.jpg?cropZoom=300,300" alt="Sample Image" />', $this->page)
+        );
+        self::assertRegexp(
+            '|<img alt="Sample Image" class="foo" src="\/images\/.*-sample-image.jpe?g\" data-src="sample-image\.jpg\?classes=foo" \/>|',
+            Excerpts::processImageHtml('<img src="sample-image.jpg?classes=foo" alt="Sample Image" />', $this->page)
+        );
     }
 
+    public function testNoProcess(): void
+    {
+        self::assertStringStartsWith(
+            '<a href="https://play.google.com/store/apps/details?hl=de" id="org.jitsi.meet" target="_blank"',
+            Excerpts::processLinkHtml('<a href="https://play.google.com/store/apps/details?id=org.jitsi.meet&hl=de&target=_blank">regular process</a>')
+        );
+
+        self::assertStringStartsWith(
+            '<a href="https://play.google.com/store/apps/details?id=org.jitsi.meet&hl=de&target=_blank"',
+            Excerpts::processLinkHtml('<a href="https://play.google.com/store/apps/details?id=org.jitsi.meet&hl=de&target=_blank&noprocess">noprocess</a>')
+        );
+
+        self::assertStringStartsWith(
+            '<a href="https://play.google.com/store/apps/details?id=org.jitsi.meet&hl=de" target="_blank"',
+            Excerpts::processLinkHtml('<a href="https://play.google.com/store/apps/details?id=org.jitsi.meet&hl=de&target=_blank&noprocess=id">noprocess=id</a>')
+        );
+    }
+
+    public function testTarget(): void
+    {
+        self::assertStringStartsWith(
+            '<a href="https://play.google.com/store/apps/details" target="_blank"',
+            Excerpts::processLinkHtml('<a href="https://play.google.com/store/apps/details?target=_blank">only target</a>')
+        );
+        self::assertStringStartsWith(
+            '<a href="https://meet.weikamp.biz/Support" rel="nofollow" target="_blank"',
+            Excerpts::processLinkHtml('<a href="https://meet.weikamp.biz/Support?rel=nofollow&target=_blank">target and rel</a>')
+        );
+    }
 }
diff --git a/tests/unit/Grav/Common/InflectorTest.php b/tests/unit/Grav/Common/InflectorTest.php
index 9fad489645..1db51a2aa9 100644
--- a/tests/unit/Grav/Common/InflectorTest.php
+++ b/tests/unit/Grav/Common/InflectorTest.php
@@ -16,132 +16,130 @@ class InflectorTest extends \Codeception\TestCase\Test
     /** @var Inflector $uri */
     protected $inflector;
 
-    protected function _before()
+    protected function _before(): void
     {
         $grav = Fixtures::get('grav');
         $this->grav = $grav();
         $this->inflector = $this->grav['inflector'];
     }
 
-    protected function _after()
+    protected function _after(): void
     {
     }
 
-    public function testPluralize()
+    public function testPluralize(): void
     {
-        $this->assertSame('words',      $this->inflector->pluralize('word'));
-        $this->assertSame('kisses',     $this->inflector->pluralize('kiss'));
-        $this->assertSame('volcanoes',  $this->inflector->pluralize('volcanoe'));
-        $this->assertSame('cherries',   $this->inflector->pluralize('cherry'));
-        $this->assertSame('days',       $this->inflector->pluralize('day'));
-        $this->assertSame('knives',     $this->inflector->pluralize('knife'));
+        self::assertSame('words', $this->inflector->pluralize('word'));
+        self::assertSame('kisses', $this->inflector->pluralize('kiss'));
+        self::assertSame('volcanoes', $this->inflector->pluralize('volcanoe'));
+        self::assertSame('cherries', $this->inflector->pluralize('cherry'));
+        self::assertSame('days', $this->inflector->pluralize('day'));
+        self::assertSame('knives', $this->inflector->pluralize('knife'));
     }
 
-    public function testSingularize()
+    public function testSingularize(): void
     {
-        $this->assertSame('word',       $this->inflector->singularize('words'));
-        $this->assertSame('kiss',       $this->inflector->singularize('kisses'));
-        $this->assertSame('volcanoe',   $this->inflector->singularize('volcanoe'));
-        $this->assertSame('cherry',     $this->inflector->singularize('cherries'));
-        $this->assertSame('day',        $this->inflector->singularize('days'));
-        $this->assertSame('knife',      $this->inflector->singularize('knives'));
+        self::assertSame('word', $this->inflector->singularize('words'));
+        self::assertSame('kiss', $this->inflector->singularize('kisses'));
+        self::assertSame('volcanoe', $this->inflector->singularize('volcanoe'));
+        self::assertSame('cherry', $this->inflector->singularize('cherries'));
+        self::assertSame('day', $this->inflector->singularize('days'));
+        self::assertSame('knife', $this->inflector->singularize('knives'));
     }
 
-    public function testTitleize()
+    public function testTitleize(): void
     {
-        $this->assertSame('This String Is Titleized',   $this->inflector->titleize('ThisStringIsTitleized'));
-        $this->assertSame('This String Is Titleized',   $this->inflector->titleize('this string is titleized'));
-        $this->assertSame('This String Is Titleized',   $this->inflector->titleize('this_string_is_titleized'));
-        $this->assertSame('This String Is Titleized',   $this->inflector->titleize('this-string-is-titleized'));
-
-        $this->assertSame('This string is titleized',   $this->inflector->titleize('ThisStringIsTitleized', 'first'));
-        $this->assertSame('This string is titleized',   $this->inflector->titleize('this string is titleized', 'first'));
-        $this->assertSame('This string is titleized',   $this->inflector->titleize('this_string_is_titleized', 'first'));
-        $this->assertSame('This string is titleized',   $this->inflector->titleize('this-string-is-titleized', 'first'));
+        self::assertSame('This String Is Titleized', $this->inflector->titleize('ThisStringIsTitleized'));
+        self::assertSame('This String Is Titleized', $this->inflector->titleize('this string is titleized'));
+        self::assertSame('This String Is Titleized', $this->inflector->titleize('this_string_is_titleized'));
+        self::assertSame('This String Is Titleized', $this->inflector->titleize('this-string-is-titleized'));
+
+        self::assertSame('This string is titleized', $this->inflector->titleize('ThisStringIsTitleized', 'first'));
+        self::assertSame('This string is titleized', $this->inflector->titleize('this string is titleized', 'first'));
+        self::assertSame('This string is titleized', $this->inflector->titleize('this_string_is_titleized', 'first'));
+        self::assertSame('This string is titleized', $this->inflector->titleize('this-string-is-titleized', 'first'));
     }
 
-    public function testCamelize()
+    public function testCamelize(): void
     {
-        $this->assertSame('ThisStringIsCamelized',      $this->inflector->camelize('This String Is Camelized'));
-        $this->assertSame('ThisStringIsCamelized',      $this->inflector->camelize('thisStringIsCamelized'));
-        $this->assertSame('ThisStringIsCamelized',      $this->inflector->camelize('This_String_Is_Camelized'));
-        $this->assertSame('ThisStringIsCamelized',      $this->inflector->camelize('this string is camelized'));
-        $this->assertSame('GravSPrettyCoolMy1',         $this->inflector->camelize("Grav's Pretty Cool. My #1!"));
+        self::assertSame('ThisStringIsCamelized', $this->inflector->camelize('This String Is Camelized'));
+        self::assertSame('ThisStringIsCamelized', $this->inflector->camelize('thisStringIsCamelized'));
+        self::assertSame('ThisStringIsCamelized', $this->inflector->camelize('This_String_Is_Camelized'));
+        self::assertSame('ThisStringIsCamelized', $this->inflector->camelize('this string is camelized'));
+        self::assertSame('GravSPrettyCoolMy1', $this->inflector->camelize("Grav's Pretty Cool. My #1!"));
     }
 
-    public function testUnderscorize()
+    public function testUnderscorize(): void
     {
-        $this->assertSame('this_string_is_underscorized',   $this->inflector->underscorize('This String Is Underscorized'));
-        $this->assertSame('this_string_is_underscorized',   $this->inflector->underscorize('ThisStringIsUnderscorized'));
-        $this->assertSame('this_string_is_underscorized',   $this->inflector->underscorize('This_String_Is_Underscorized'));
-        $this->assertSame('this_string_is_underscorized',   $this->inflector->underscorize('This-String-Is-Underscorized'));
+        self::assertSame('this_string_is_underscorized', $this->inflector->underscorize('This String Is Underscorized'));
+        self::assertSame('this_string_is_underscorized', $this->inflector->underscorize('ThisStringIsUnderscorized'));
+        self::assertSame('this_string_is_underscorized', $this->inflector->underscorize('This_String_Is_Underscorized'));
+        self::assertSame('this_string_is_underscorized', $this->inflector->underscorize('This-String-Is-Underscorized'));
     }
 
-    public function testHyphenize()
+    public function testHyphenize(): void
     {
-        $this->assertSame('this-string-is-hyphenized',     $this->inflector->hyphenize('This String Is Hyphenized'));
-        $this->assertSame('this-string-is-hyphenized',     $this->inflector->hyphenize('ThisStringIsHyphenized'));
-        $this->assertSame('this-string-is-hyphenized',     $this->inflector->hyphenize('This-String-Is-Hyphenized'));
-        $this->assertSame('this-string-is-hyphenized',     $this->inflector->hyphenize('This_String_Is_Hyphenized'));
+        self::assertSame('this-string-is-hyphenized', $this->inflector->hyphenize('This String Is Hyphenized'));
+        self::assertSame('this-string-is-hyphenized', $this->inflector->hyphenize('ThisStringIsHyphenized'));
+        self::assertSame('this-string-is-hyphenized', $this->inflector->hyphenize('This-String-Is-Hyphenized'));
+        self::assertSame('this-string-is-hyphenized', $this->inflector->hyphenize('This_String_Is_Hyphenized'));
     }
 
-    public function testHumanize()
+    public function testHumanize(): void
     {
-        //$this->assertSame('This string is humanized',   $this->inflector->humanize('ThisStringIsHumanized'));
-        $this->assertSame('This string is humanized',   $this->inflector->humanize('this_string_is_humanized'));
-        //$this->assertSame('This string is humanized',   $this->inflector->humanize('this-string-is-humanized'));
+        //self::assertSame('This string is humanized',   $this->inflector->humanize('ThisStringIsHumanized'));
+        self::assertSame('This string is humanized', $this->inflector->humanize('this_string_is_humanized'));
+        //self::assertSame('This string is humanized',   $this->inflector->humanize('this-string-is-humanized'));
 
-        $this->assertSame('This String Is Humanized',   $this->inflector->humanize('this_string_is_humanized', 'all'));
-        //$this->assertSame('This String Is Humanized',   $this->inflector->humanize('this-string-is-humanized'), 'all');
+        self::assertSame('This String Is Humanized', $this->inflector->humanize('this_string_is_humanized', 'all'));
+        //self::assertSame('This String Is Humanized',   $this->inflector->humanize('this-string-is-humanized'), 'all');
     }
 
-    public function testVariablize()
+    public function testVariablize(): void
     {
-        $this->assertSame('thisStringIsVariablized',      $this->inflector->variablize('This String Is Variablized'));
-        $this->assertSame('thisStringIsVariablized',      $this->inflector->variablize('ThisStringIsVariablized'));
-        $this->assertSame('thisStringIsVariablized',      $this->inflector->variablize('This_String_Is_Variablized'));
-        $this->assertSame('thisStringIsVariablized',      $this->inflector->variablize('this string is variablized'));
-        $this->assertSame('gravSPrettyCoolMy1',           $this->inflector->variablize("Grav's Pretty Cool. My #1!"));
+        self::assertSame('thisStringIsVariablized', $this->inflector->variablize('This String Is Variablized'));
+        self::assertSame('thisStringIsVariablized', $this->inflector->variablize('ThisStringIsVariablized'));
+        self::assertSame('thisStringIsVariablized', $this->inflector->variablize('This_String_Is_Variablized'));
+        self::assertSame('thisStringIsVariablized', $this->inflector->variablize('this string is variablized'));
+        self::assertSame('gravSPrettyCoolMy1', $this->inflector->variablize("Grav's Pretty Cool. My #1!"));
     }
 
-    public function testTableize()
+    public function testTableize(): void
     {
-        $this->assertSame('people',                 $this->inflector->tableize('Person'));
-        $this->assertSame('pages',                  $this->inflector->tableize('Page'));
-        $this->assertSame('blog_pages',             $this->inflector->tableize('BlogPage'));
-        $this->assertSame('admin_dependencies',     $this->inflector->tableize('adminDependency'));
-        $this->assertSame('admin_dependencies',     $this->inflector->tableize('admin-dependency'));
-        $this->assertSame('admin_dependencies',     $this->inflector->tableize('admin_dependency'));
+        self::assertSame('people', $this->inflector->tableize('Person'));
+        self::assertSame('pages', $this->inflector->tableize('Page'));
+        self::assertSame('blog_pages', $this->inflector->tableize('BlogPage'));
+        self::assertSame('admin_dependencies', $this->inflector->tableize('adminDependency'));
+        self::assertSame('admin_dependencies', $this->inflector->tableize('admin-dependency'));
+        self::assertSame('admin_dependencies', $this->inflector->tableize('admin_dependency'));
     }
 
-    public function testClassify()
+    public function testClassify(): void
     {
-        $this->assertSame('Person',                 $this->inflector->classify('people'));
-        $this->assertSame('Page',                  $this->inflector->classify('pages'));
-        $this->assertSame('BlogPage',             $this->inflector->classify('blog_pages'));
-        $this->assertSame('AdminDependency',     $this->inflector->classify('admin_dependencies'));
+        self::assertSame('Person', $this->inflector->classify('people'));
+        self::assertSame('Page', $this->inflector->classify('pages'));
+        self::assertSame('BlogPage', $this->inflector->classify('blog_pages'));
+        self::assertSame('AdminDependency', $this->inflector->classify('admin_dependencies'));
     }
 
-    public function testOrdinalize()
+    public function testOrdinalize(): void
     {
-        $this->assertSame('1st',    $this->inflector->ordinalize(1));
-        $this->assertSame('2nd',    $this->inflector->ordinalize(2));
-        $this->assertSame('3rd',    $this->inflector->ordinalize(3));
-        $this->assertSame('4th',    $this->inflector->ordinalize(4));
-        $this->assertSame('5th',    $this->inflector->ordinalize(5));
-        $this->assertSame('16th',   $this->inflector->ordinalize(16));
-        $this->assertSame('51st',   $this->inflector->ordinalize(51));
-        $this->assertSame('111th',  $this->inflector->ordinalize(111));
-        $this->assertSame('123rd',  $this->inflector->ordinalize(123));
+        self::assertSame('1st', $this->inflector->ordinalize(1));
+        self::assertSame('2nd', $this->inflector->ordinalize(2));
+        self::assertSame('3rd', $this->inflector->ordinalize(3));
+        self::assertSame('4th', $this->inflector->ordinalize(4));
+        self::assertSame('5th', $this->inflector->ordinalize(5));
+        self::assertSame('16th', $this->inflector->ordinalize(16));
+        self::assertSame('51st', $this->inflector->ordinalize(51));
+        self::assertSame('111th', $this->inflector->ordinalize(111));
+        self::assertSame('123rd', $this->inflector->ordinalize(123));
     }
 
-    public function testMonthize()
+    public function testMonthize(): void
     {
-        $this->assertSame(0,    $this->inflector->monthize(10));
-        $this->assertSame(1,    $this->inflector->monthize(33));
-        $this->assertSame(1,    $this->inflector->monthize(41));
-        $this->assertSame(11,   $this->inflector->monthize(364));
+        self::assertSame(0, $this->inflector->monthize(10));
+        self::assertSame(1, $this->inflector->monthize(33));
+        self::assertSame(1, $this->inflector->monthize(41));
+        self::assertSame(11, $this->inflector->monthize(364));
     }
 }
-
-
diff --git a/tests/unit/Grav/Common/Language/LanguageCodesTest.php b/tests/unit/Grav/Common/Language/LanguageCodesTest.php
index ef6cabc6d3..3450c88ea5 100644
--- a/tests/unit/Grav/Common/Language/LanguageCodesTest.php
+++ b/tests/unit/Grav/Common/Language/LanguageCodesTest.php
@@ -2,23 +2,26 @@
 
 use Grav\Common\Language\LanguageCodes;
 
-
 /**
  * Class ParsedownTest
  */
 class LanguageCodesTest extends \Codeception\TestCase\Test
 {
-    public function testRtl()
+    public function testRtl(): void
     {
-        $this->assertSame('ltr',
-            LanguageCodes::getOrientation('en'));
-        $this->assertSame('rtl',
-            LanguageCodes::getOrientation('ar'));
-        $this->assertSame('rtl',
-            LanguageCodes::getOrientation('he'));
-        $this->assertTrue(LanguageCodes::isRtl('ar'));
-        $this->assertFalse(LanguageCodes::isRtl('fr'));
-
+        self::assertSame(
+            'ltr',
+            LanguageCodes::getOrientation('en')
+        );
+        self::assertSame(
+            'rtl',
+            LanguageCodes::getOrientation('ar')
+        );
+        self::assertSame(
+            'rtl',
+            LanguageCodes::getOrientation('he')
+        );
+        self::assertTrue(LanguageCodes::isRtl('ar'));
+        self::assertFalse(LanguageCodes::isRtl('fr'));
     }
-
 }
diff --git a/tests/unit/Grav/Common/Markdown/ParsedownTest.php b/tests/unit/Grav/Common/Markdown/ParsedownTest.php
index 58a1acf61c..5706389b9e 100644
--- a/tests/unit/Grav/Common/Markdown/ParsedownTest.php
+++ b/tests/unit/Grav/Common/Markdown/ParsedownTest.php
@@ -8,7 +8,7 @@
 use Grav\Common\Page\Pages;
 use Grav\Common\Markdown\Parsedown;
 use Grav\Common\Language\Language;
-
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 /**
  * Class ParsedownTest
@@ -35,7 +35,7 @@ class ParsedownTest extends \Codeception\TestCase\Test
 
     protected $old_home;
 
-    protected function _before()
+    protected function _before(): void
     {
         $grav = Fixtures::get('grav');
         $this->grav = $grav();
@@ -66,121 +66,302 @@ protected function _before()
             ],
             'images' => $this->config->get('system.images', [])
         ];
-        $page = $this->pages->dispatch('/item2/item2-2');
+        $page = $this->pages->find('/item2/item2-2');
 
         $excerpts = new Excerpts($page, $defaults);
         $this->parsedown = new Parsedown($excerpts);
     }
 
-    protected function _after()
+    protected function _after(): void
     {
         $this->config->set('system.home.alias', $this->old_home);
     }
 
-    public function testImages()
+    public function testImages(): void
     {
         $this->config->set('system.languages.supported', ['fr','en']);
         unset($this->grav['language']);
         $this->grav['language'] = new Language($this->grav);
         $this->uri->initializeWithURL('http://testing.dev/fr/item2/item2-2')->init();
 
-        $this->assertSame('<p><img alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![](sample-image.jpg)'));
-        $this->assertRegexp('|<p><img alt="" src="\/images\/.*-cache-image.jpe?g\?foo=1" \/><\/p>|',
-            $this->parsedown->text('![](cache-image.jpg?cropResize=200,200&foo)'));
+        self::assertSame(
+            '<p><img alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="\/images\/.*-cache-image.jpe?g\?foo=1" \/><\/p>|',
+            $this->parsedown->text('![](cache-image.jpg?cropResize=200,200&foo)')
+        );
 
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><img alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![](sample-image.jpg)'));
-        $this->assertRegexp('|<p><img alt="" src="\/images\/.*-cache-image.jpe?g\?foo=1" \/><\/p>|',
-            $this->parsedown->text('![](cache-image.jpg?cropResize=200,200&foo)'));
-        $this->assertRegexp('|<p><img alt="" src="\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
-            $this->parsedown->text('![](/home-cache-image.jpg?cache)'));
-        $this->assertSame('<p><img src="/item2/item2-2/missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](missing-image.jpg)'));
-        $this->assertSame('<p><img src="/home-missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](/home-missing-image.jpg)'));
-        $this->assertSame('<p><img src="/home-missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](/home-missing-image.jpg)'));
-        $this->assertSame('<p><img src="https://getgrav-grav.netdna-ssl.com/user/pages/media/grav-logo.svg" alt="" /></p>',
-            $this->parsedown->text('![](https://getgrav-grav.netdna-ssl.com/user/pages/media/grav-logo.svg)'));
-
-   }
-
-    public function testImagesSubDir()
+        self::assertSame(
+            '<p><img alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="\/images\/.*-cache-image.jpe?g\?foo=1" \/><\/p>|',
+            $this->parsedown->text('![](cache-image.jpg?cropResize=200,200&foo)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
+            $this->parsedown->text('![](/home-cache-image.jpg?cache)')
+        );
+        self::assertSame(
+            '<p><img src="/item2/item2-2/missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](missing-image.jpg)')
+        );
+        self::assertSame(
+            '<p><img src="/home-missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](/home-missing-image.jpg)')
+        );
+        self::assertSame(
+            '<p><img src="/home-missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](/home-missing-image.jpg)')
+        );
+        self::assertSame(
+            '<p><img src="https://getgrav-grav.netdna-ssl.com/user/pages/media/grav-logo.svg" alt="" /></p>',
+            $this->parsedown->text('![](https://getgrav-grav.netdna-ssl.com/user/pages/media/grav-logo.svg)')
+        );
+    }
+
+    public function testImagesSubDir(): void
     {
+        $this->config->set('system.images.cache_all', false);
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertRegexp('|<p><img alt="" src="\/subdir\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
-            $this->parsedown->text('![](/home-cache-image.jpg?cache)'));
-        $this->assertSame('<p><img alt="" src="/subdir/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![](sample-image.jpg)'));
-        $this->assertRegexp('|<p><img alt="" src="\/subdir\/images\/.*-cache-image.jpe?g" \/><\/p>|',
-            $this->parsedown->text('![](cache-image.jpg?cache)'));
-        $this->assertSame('<p><img src="/subdir/item2/item2-2/missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](missing-image.jpg)'));
-        $this->assertSame('<p><img src="/subdir/home-missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](/home-missing-image.jpg)'));
-
+        self::assertRegexp(
+            '|<p><img alt="" src="\/subdir\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
+            $this->parsedown->text('![](/home-cache-image.jpg?cache)')
+        );
+        self::assertSame(
+            '<p><img alt="" src="/subdir/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="\/subdir\/images\/.*-cache-image.jpe?g" \/><\/p>|',
+            $this->parsedown->text('![](cache-image.jpg?cache)')
+        );
+        self::assertSame(
+            '<p><img src="/subdir/item2/item2-2/missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](missing-image.jpg)')
+        );
+        self::assertSame(
+            '<p><img src="/subdir/home-missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](/home-missing-image.jpg)')
+        );
     }
 
-    public function testImagesAbsoluteUrls()
+    public function testImagesAbsoluteUrls(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><img alt="" src="http://testing.dev/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![](sample-image.jpg)'));
-        $this->assertRegexp('|<p><img alt="" src="http:\/\/testing.dev\/images\/.*-cache-image.jpe?g" \/><\/p>|',
-            $this->parsedown->text('![](cache-image.jpg?cache)'));
-        $this->assertRegexp('|<p><img alt="" src="http:\/\/testing.dev\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
-            $this->parsedown->text('![](/home-cache-image.jpg?cache)'));
-        $this->assertSame('<p><img src="http://testing.dev/item2/item2-2/missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](missing-image.jpg)'));
-        $this->assertSame('<p><img src="http://testing.dev/home-missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](/home-missing-image.jpg)'));
+        self::assertSame(
+            '<p><img alt="" src="http://testing.dev/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="http:\/\/testing.dev\/images\/.*-cache-image.jpe?g" \/><\/p>|',
+            $this->parsedown->text('![](cache-image.jpg?cache)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="http:\/\/testing.dev\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
+            $this->parsedown->text('![](/home-cache-image.jpg?cache)')
+        );
+        self::assertSame(
+            '<p><img src="http://testing.dev/item2/item2-2/missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](missing-image.jpg)')
+        );
+        self::assertSame(
+            '<p><img src="http://testing.dev/home-missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](/home-missing-image.jpg)')
+        );
     }
 
-    public function testImagesSubDirAbsoluteUrls()
+    public function testImagesSubDirAbsoluteUrls(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><img alt="" src="http://testing.dev/subdir/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![](sample-image.jpg)'));
-        $this->assertRegexp('|<p><img alt="" src="http:\/\/testing.dev\/subdir\/images\/.*-cache-image.jpe?g" \/><\/p>|',
-            $this->parsedown->text('![](cache-image.jpg?cache)'));
-        $this->assertRegexp('|<p><img alt="" src="http:\/\/testing.dev\/subdir\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
-            $this->parsedown->text('![](/home-cache-image.jpg?cropResize=200,200)'));
-        $this->assertSame('<p><img src="http://testing.dev/subdir/item2/item2-2/missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](missing-image.jpg)'));
-        $this->assertSame('<p><img src="http://testing.dev/subdir/home-missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](/home-missing-image.jpg)'));
+        self::assertSame(
+            '<p><img alt="" src="http://testing.dev/subdir/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="http:\/\/testing.dev\/subdir\/images\/.*-cache-image.jpe?g" \/><\/p>|',
+            $this->parsedown->text('![](cache-image.jpg?cache)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="http:\/\/testing.dev\/subdir\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
+            $this->parsedown->text('![](/home-cache-image.jpg?cropResize=200,200)')
+        );
+        self::assertSame(
+            '<p><img src="http://testing.dev/subdir/item2/item2-2/missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](missing-image.jpg)')
+        );
+        self::assertSame(
+            '<p><img src="http://testing.dev/subdir/home-missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](/home-missing-image.jpg)')
+        );
     }
 
-    public function testImagesAttributes()
+    public function testImagesAttributes(): void
     {
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><img title="My Title" alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![](sample-image.jpg "My Title")'));
-        $this->assertSame('<p><img alt="" class="foo" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![](sample-image.jpg?classes=foo)'));
-        $this->assertSame('<p><img alt="" class="foo bar" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![](sample-image.jpg?classes=foo,bar)'));
-        $this->assertSame('<p><img alt="" id="foo" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![](sample-image.jpg?id=foo)'));
-        $this->assertSame('<p><img alt="Alt Text" id="foo" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![Alt Text](sample-image.jpg?id=foo)'));
-        $this->assertSame('<p><img alt="Alt Text" class="bar" id="foo" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![Alt Text](sample-image.jpg?class=bar&id=foo)'));
-        $this->assertSame('<p><img title="My Title" alt="Alt Text" class="bar" id="foo" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![Alt Text](sample-image.jpg?class=bar&id=foo "My Title")'));
+        self::assertSame(
+            '<p><img title="My Title" alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg "My Title")')
+        );
+        self::assertSame(
+            '<p><img alt="" class="foo" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg?classes=foo)')
+        );
+        self::assertSame(
+            '<p><img alt="" class="foo bar" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg?classes=foo,bar)')
+        );
+        self::assertSame(
+            '<p><img alt="" id="foo" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg?id=foo)')
+        );
+        self::assertSame(
+            '<p><img alt="Alt Text" id="foo" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![Alt Text](sample-image.jpg?id=foo)')
+        );
+        self::assertSame(
+            '<p><img alt="Alt Text" class="bar" id="foo" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![Alt Text](sample-image.jpg?class=bar&id=foo)')
+        );
+        self::assertSame(
+            '<p><img title="My Title" alt="Alt Text" class="bar" id="foo" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![Alt Text](sample-image.jpg?class=bar&id=foo "My Title")')
+        );
     }
 
+    public function testImagesDefaults(): void
+    {
+        /**
+         * Testing default 'loading'
+        */
+
+        $this->setImagesDefaults(['loading' => 'auto']);
+
+
+        // loading should NOT be added to image by default
+        self::assertSame(
+            '<p><img alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg)')
+        );
 
-    public function testRootImages()
+        // loading="lazy" should be added when default is overridden by ?loading=lazy
+        self::assertSame(
+            '<p><img loading="lazy" alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg?loading=lazy)')
+        );
+
+        $this->setImagesDefaults(['loading' => 'lazy']);
+
+        // loading="lazy" should be added by default
+        self::assertSame(
+            '<p><img loading="lazy" alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg)')
+        );
+
+        // loading should not be added when default is overridden by ?loading=auto
+        self::assertSame(
+            '<p><img alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg?loading=auto)')
+        );
+
+        // loading="eager" should be added when default is overridden by ?loading=eager
+        self::assertSame(
+            '<p><img loading="eager" alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg?loading=eager)')
+        );
+
+    }
+
+    public function testCLSAutoSizes(): void
+    {
+        $this->config->set('system.images.cls.auto_sizes', false);
+        $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
+
+        self::assertSame(
+            '<p><img alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg)')
+        );
+
+        self::assertSame(
+            '<p><img height="1" width="1" alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg?height=1&width=1)')
+        );
+
+        self::assertSame(
+            '<p><img alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" width="1024" height="768" /></p>',
+            $this->parsedown->text('![](sample-image.jpg?autoSizes=true)')
+        );
+
+        $this->config->set('system.images.cls.auto_sizes', true);
+
+        self::assertSame(
+            '<p><img alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" width="1024" height="768" /></p>',
+            $this->parsedown->text('![](sample-image.jpg?reset)')
+        );
+
+        self::assertSame(
+            '<p><img height="1" width="1" alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg?height=1&width=1)')
+        );
+
+        self::assertSame(
+            '<p><img alt="" src="/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg?autoSizes=false)')
+        );
+
+        self::assertRegExp(
+            '/width="400" height="200"/',
+            $this->parsedown->text('![](sample-image.jpg?reset&resize=400,200)')
+        );
+
+        $this->config->set('system.images.cls.retina_scale', 2);
+
+
+        self::assertRegExp(
+            '/width="400" height="200"/',
+            $this->parsedown->text('![](sample-image.jpg?reset&resize=800,400)')
+        );
+
+        $this->config->set('system.images.cls.retina_scale', 4);
+
+        self::assertRegExp(
+            '/width="200" height="100"/',
+            $this->parsedown->text('![](sample-image.jpg?reset&resize=800,400)')
+        );
+
+        self::assertRegExp(
+            '/width="266" height="133"/',
+            $this->parsedown->text('![](sample-image.jpg?reset&resize=800,400&retinaScale=3)')
+        );
+
+        $this->config->set('system.images.cls.aspect_ratio', true);
+
+        self::assertRegExp(
+            '/style="--aspect-ratio: 800\/400;"/',
+            $this->parsedown->text('![](sample-image.jpg?reset&resize=800,400)')
+        );
+
+        $this->config->set('system.images.cls.aspect_ratio', false);
+
+        self::assertRegExp(
+            '/style="--aspect-ratio: 800\/400;"/',
+            $this->parsedown->text('![](sample-image.jpg?reset&resize=800,400&aspectRatio=true)')
+        );
+
+    }
+
+    public function testRootImages(): void
     {
         $this->uri->initializeWithURL('http://testing.dev/')->init();
 
@@ -194,48 +375,66 @@ public function testRootImages()
             ],
             'images' => $this->config->get('system.images', [])
         ];
-        $page = $this->pages->dispatch('/');
+        $page = $this->pages->find('/');
         $excerpts = new Excerpts($page, $defaults);
         $this->parsedown = new Parsedown($excerpts);
 
-        $this->assertSame('<p><img alt="" src="/tests/fake/nested-site/user/pages/01.item1/home-sample-image.jpg" /></p>',
-            $this->parsedown->text('![](home-sample-image.jpg)'));
-        $this->assertRegexp('|<p><img alt="" src="\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
-            $this->parsedown->text('![](home-cache-image.jpg?cache)'));
-        $this->assertRegexp('|<p><img alt="" src="\/images\/.*-home-cache-image.jpe?g\?foo=1" \/><\/p>|',
-            $this->parsedown->text('![](home-cache-image.jpg?cropResize=200,200&foo)'));
-        $this->assertSame('<p><img src="/home-missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](/home-missing-image.jpg)'));
+        self::assertSame(
+            '<p><img alt="" src="/tests/fake/nested-site/user/pages/01.item1/home-sample-image.jpg" /></p>',
+            $this->parsedown->text('![](home-sample-image.jpg)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
+            $this->parsedown->text('![](home-cache-image.jpg?cache)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="\/images\/.*-home-cache-image.jpe?g\?foo=1" \/><\/p>|',
+            $this->parsedown->text('![](home-cache-image.jpg?cropResize=200,200&foo)')
+        );
+        self::assertSame(
+            '<p><img src="/home-missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](/home-missing-image.jpg)')
+        );
 
         $this->config->set('system.languages.supported', ['fr','en']);
         unset($this->grav['language']);
         $this->grav['language'] = new Language($this->grav);
         $this->uri->initializeWithURL('http://testing.dev/fr/item2/item2-2')->init();
 
-        $this->assertSame('<p><img alt="" src="/tests/fake/nested-site/user/pages/01.item1/home-sample-image.jpg" /></p>',
-            $this->parsedown->text('![](home-sample-image.jpg)'));
-
-
+        self::assertSame(
+            '<p><img alt="" src="/tests/fake/nested-site/user/pages/01.item1/home-sample-image.jpg" /></p>',
+            $this->parsedown->text('![](home-sample-image.jpg)')
+        );
     }
 
-    public function testRootImagesSubDirAbsoluteUrls()
+    public function testRootImagesSubDirAbsoluteUrls(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><img alt="" src="http://testing.dev/subdir/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
-            $this->parsedown->text('![](sample-image.jpg)'));
-        $this->assertRegexp('|<p><img alt="" src="http:\/\/testing.dev\/subdir\/images\/.*-cache-image.jpe?g" \/><\/p>|',
-            $this->parsedown->text('![](cache-image.jpg?cache)'));
-        $this->assertRegexp('|<p><img alt="" src="http:\/\/testing.dev\/subdir\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
-            $this->parsedown->text('![](/home-cache-image.jpg?cropResize=200,200)'));
-        $this->assertSame('<p><img src="http://testing.dev/subdir/item2/item2-2/missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](missing-image.jpg)'));
-        $this->assertSame('<p><img src="http://testing.dev/subdir/home-missing-image.jpg" alt="" /></p>',
-            $this->parsedown->text('![](/home-missing-image.jpg)'));
+        self::assertSame(
+            '<p><img alt="" src="http://testing.dev/subdir/tests/fake/nested-site/user/pages/02.item2/02.item2-2/sample-image.jpg" /></p>',
+            $this->parsedown->text('![](sample-image.jpg)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="http:\/\/testing.dev\/subdir\/images\/.*-cache-image.jpe?g" \/><\/p>|',
+            $this->parsedown->text('![](cache-image.jpg?cache)')
+        );
+        self::assertRegexp(
+            '|<p><img alt="" src="http:\/\/testing.dev\/subdir\/images\/.*-home-cache-image.jpe?g" \/><\/p>|',
+            $this->parsedown->text('![](/home-cache-image.jpg?cropResize=200,200)')
+        );
+        self::assertSame(
+            '<p><img src="http://testing.dev/subdir/item2/item2-2/missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](missing-image.jpg)')
+        );
+        self::assertSame(
+            '<p><img src="http://testing.dev/subdir/home-missing-image.jpg" alt="" /></p>',
+            $this->parsedown->text('![](/home-missing-image.jpg)')
+        );
     }
 
-    public function testRootAbsoluteLinks()
+    public function testRootAbsoluteLinks(): void
     {
         $this->uri->initializeWithURL('http://testing.dev/')->init();
 
@@ -249,60 +448,87 @@ public function testRootAbsoluteLinks()
             ],
             'images' => $this->config->get('system.images', [])
         ];
-        $page = $this->pages->dispatch('/');
+        $page = $this->pages->find('/');
         $excerpts = new Excerpts($page, $defaults);
         $this->parsedown = new Parsedown($excerpts);
 
-        $this->assertSame('<p><a href="/item1/item1-3">Down a Level</a></p>',
-            $this->parsedown->text('[Down a Level](item1-3)'));
-
-        $this->assertSame('<p><a href="/item2">Peer Page</a></p>',
-            $this->parsedown->text('[Peer Page](../item2)'));
-
-        $this->assertSame('<p><a href="/?foo=bar">With Query</a></p>',
-            $this->parsedown->text('[With Query](?foo=bar)'));
-        $this->assertSame('<p><a href="/foo:bar">With Param</a></p>',
-            $this->parsedown->text('[With Param](/foo:bar)'));
-        $this->assertSame('<p><a href="#foo">With Anchor</a></p>',
-            $this->parsedown->text('[With Anchor](#foo)'));
+        self::assertSame(
+            '<p><a href="/item1/item1-3">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](item1-3)')
+        );
+
+        self::assertSame(
+            '<p><a href="/item2">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](../item2)')
+        );
+
+        self::assertSame(
+            '<p><a href="/?foo=bar">With Query</a></p>',
+            $this->parsedown->text('[With Query](?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/foo:bar">With Param</a></p>',
+            $this->parsedown->text('[With Param](/foo:bar)')
+        );
+        self::assertSame(
+            '<p><a href="#foo">With Anchor</a></p>',
+            $this->parsedown->text('[With Anchor](#foo)')
+        );
 
         $this->config->set('system.languages.supported', ['fr','en']);
         unset($this->grav['language']);
         $this->grav['language'] = new Language($this->grav);
         $this->uri->initializeWithURL('http://testing.dev/fr/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="/fr/item2">Peer Page</a></p>',
-            $this->parsedown->text('[Peer Page](../item2)'));
-        $this->assertSame('<p><a href="/fr/item1/item1-3">Down a Level</a></p>',
-            $this->parsedown->text('[Down a Level](item1-3)'));
-        $this->assertSame('<p><a href="/fr/?foo=bar">With Query</a></p>',
-            $this->parsedown->text('[With Query](?foo=bar)'));
-        $this->assertSame('<p><a href="/fr/foo:bar">With Param</a></p>',
-            $this->parsedown->text('[With Param](/foo:bar)'));
-        $this->assertSame('<p><a href="#foo">With Anchor</a></p>',
-            $this->parsedown->text('[With Anchor](#foo)'));
+        self::assertSame(
+            '<p><a href="/fr/item2">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](../item2)')
+        );
+        self::assertSame(
+            '<p><a href="/fr/item1/item1-3">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](item1-3)')
+        );
+        self::assertSame(
+            '<p><a href="/fr/?foo=bar">With Query</a></p>',
+            $this->parsedown->text('[With Query](?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/fr/foo:bar">With Param</a></p>',
+            $this->parsedown->text('[With Param](/foo:bar)')
+        );
+        self::assertSame(
+            '<p><a href="#foo">With Anchor</a></p>',
+            $this->parsedown->text('[With Anchor](#foo)')
+        );
     }
 
 
-    public function testAnchorLinksLangRelativeUrls()
+    public function testAnchorLinksLangRelativeUrls(): void
     {
         $this->config->set('system.languages.supported', ['fr','en']);
         unset($this->grav['language']);
         $this->grav['language'] = new Language($this->grav);
         $this->uri->initializeWithURL('http://testing.dev/fr/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
-            $this->parsedown->text('[Current Anchor](#foo)'));
-        $this->assertSame('<p><a href="/fr/#foo">Root Anchor</a></p>',
-            $this->parsedown->text('[Root Anchor](/#foo)'));
-        $this->assertSame('<p><a href="/fr/item2/item2-1#foo">Peer Anchor</a></p>',
-            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
-        $this->assertSame('<p><a href="/fr/item2/item2-1#foo">Peer Anchor 2</a></p>',
-            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-
+        self::assertSame(
+            '<p><a href="#foo">Current Anchor</a></p>',
+            $this->parsedown->text('[Current Anchor](#foo)')
+        );
+        self::assertSame(
+            '<p><a href="/fr/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)')
+        );
+        self::assertSame(
+            '<p><a href="/fr/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)')
+        );
+        self::assertSame(
+            '<p><a href="/fr/item2/item2-1#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)')
+        );
     }
 
-    public function testAnchorLinksLangAbsoluteUrls()
+    public function testAnchorLinksLangAbsoluteUrls(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->config->set('system.languages.supported', ['fr','en']);
@@ -310,437 +536,704 @@ public function testAnchorLinksLangAbsoluteUrls()
         $this->grav['language'] = new Language($this->grav);
         $this->uri->initializeWithURL('http://testing.dev/fr/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
-            $this->parsedown->text('[Current Anchor](#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev/fr/item2/item2-1#foo">Peer Anchor</a></p>',
-            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev/fr/item2/item2-1#foo">Peer Anchor 2</a></p>',
-            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev/fr/#foo">Root Anchor</a></p>',
-            $this->parsedown->text('[Root Anchor](/#foo)'));
-
+        self::assertSame(
+            '<p><a href="#foo">Current Anchor</a></p>',
+            $this->parsedown->text('[Current Anchor](#foo)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/fr/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/fr/item2/item2-1#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/fr/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)')
+        );
     }
 
 
-    public function testExternalLinks()
+    public function testExternalLinks(): void
     {
-        $this->assertSame('<p><a href="http://www.cnn.com">cnn.com</a></p>',
-            $this->parsedown->text('[cnn.com](http://www.cnn.com)'));
-        $this->assertSame('<p><a href="https://www.google.com">google.com</a></p>',
-            $this->parsedown->text('[google.com](https://www.google.com)'));
-        $this->assertSame('<p><a href="https://github.com/getgrav/grav/issues/new?title=%5Badd-resource%5D%20New%20Plugin%2FTheme&body=Hello%20%2A%2AThere%2A%2A">complex url</a></p>',
-            $this->parsedown->text('[complex url](https://github.com/getgrav/grav/issues/new?title=[add-resource]%20New%20Plugin/Theme&body=Hello%20**There**)'));
+        self::assertSame(
+            '<p><a href="http://www.cnn.com">cnn.com</a></p>',
+            $this->parsedown->text('[cnn.com](http://www.cnn.com)')
+        );
+        self::assertSame(
+            '<p><a href="https://www.google.com">google.com</a></p>',
+            $this->parsedown->text('[google.com](https://www.google.com)')
+        );
+        self::assertSame(
+            '<p><a href="https://github.com/getgrav/grav/issues/new?title=%5Badd-resource%5D%20New%20Plugin%2FTheme&amp;body=Hello%20%2A%2AThere%2A%2A">complex url</a></p>',
+            $this->parsedown->text('[complex url](https://github.com/getgrav/grav/issues/new?title=[add-resource]%20New%20Plugin/Theme&body=Hello%20**There**)')
+        );
     }
 
-    public function testExternalLinksSubDir()
+    public function testExternalLinksSubDir(): void
     {
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="http://www.cnn.com">cnn.com</a></p>',
-            $this->parsedown->text('[cnn.com](http://www.cnn.com)'));
-        $this->assertSame('<p><a href="https://www.google.com">google.com</a></p>',
-            $this->parsedown->text('[google.com](https://www.google.com)'));
+        self::assertSame(
+            '<p><a href="http://www.cnn.com">cnn.com</a></p>',
+            $this->parsedown->text('[cnn.com](http://www.cnn.com)')
+        );
+        self::assertSame(
+            '<p><a href="https://www.google.com">google.com</a></p>',
+            $this->parsedown->text('[google.com](https://www.google.com)')
+        );
     }
 
-    public function testExternalLinksSubDirAbsoluteUrls()
+    public function testExternalLinksSubDirAbsoluteUrls(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="http://www.cnn.com">cnn.com</a></p>',
-            $this->parsedown->text('[cnn.com](http://www.cnn.com)'));
-        $this->assertSame('<p><a href="https://www.google.com">google.com</a></p>',
-            $this->parsedown->text('[google.com](https://www.google.com)'));
+        self::assertSame(
+            '<p><a href="http://www.cnn.com">cnn.com</a></p>',
+            $this->parsedown->text('[cnn.com](http://www.cnn.com)')
+        );
+        self::assertSame(
+            '<p><a href="https://www.google.com">google.com</a></p>',
+            $this->parsedown->text('[google.com](https://www.google.com)')
+        );
     }
 
-    public function testAnchorLinksRelativeUrls()
+    public function testAnchorLinksRelativeUrls(): void
     {
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
-            $this->parsedown->text('[Current Anchor](#foo)'));
-        $this->assertSame('<p><a href="/#foo">Root Anchor</a></p>',
-            $this->parsedown->text('[Root Anchor](/#foo)'));
-        $this->assertSame('<p><a href="/item2/item2-1#foo">Peer Anchor</a></p>',
-            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
-        $this->assertSame('<p><a href="/item2/item2-1#foo">Peer Anchor 2</a></p>',
-            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
+        self::assertSame(
+            '<p><a href="#foo">Current Anchor</a></p>',
+            $this->parsedown->text('[Current Anchor](#foo)')
+        );
+        self::assertSame(
+            '<p><a href="/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-1#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)')
+        );
     }
 
-    public function testAnchorLinksAbsoluteUrls()
+    public function testAnchorLinksAbsoluteUrls(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
-            $this->parsedown->text('[Current Anchor](#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev/item2/item2-1#foo">Peer Anchor</a></p>',
-            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev/item2/item2-1#foo">Peer Anchor 2</a></p>',
-            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev/#foo">Root Anchor</a></p>',
-            $this->parsedown->text('[Root Anchor](/#foo)'));
+        self::assertSame(
+            '<p><a href="#foo">Current Anchor</a></p>',
+            $this->parsedown->text('[Current Anchor](#foo)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/item2/item2-1#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)')
+        );
     }
 
-    public function testAnchorLinksWithPortAbsoluteUrls()
+    public function testAnchorLinksWithPortAbsoluteUrls(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithURL('http://testing.dev:8080/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="http://testing.dev:8080/item2/item2-1#foo">Peer Anchor</a></p>',
-            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev:8080/item2/item2-1#foo">Peer Anchor 2</a></p>',
-            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
-            $this->parsedown->text('[Current Anchor](#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev:8080/#foo">Root Anchor</a></p>',
-            $this->parsedown->text('[Root Anchor](/#foo)'));
+        self::assertSame(
+            '<p><a href="http://testing.dev:8080/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev:8080/item2/item2-1#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)')
+        );
+        self::assertSame(
+            '<p><a href="#foo">Current Anchor</a></p>',
+            $this->parsedown->text('[Current Anchor](#foo)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev:8080/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)')
+        );
     }
 
-    public function testAnchorLinksSubDirRelativeUrls()
+    public function testAnchorLinksSubDirRelativeUrls(): void
     {
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="/subdir/item2/item2-1#foo">Peer Anchor</a></p>',
-            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
-        $this->assertSame('<p><a href="/subdir/item2/item2-1#foo">Peer Anchor 2</a></p>',
-            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
-            $this->parsedown->text('[Current Anchor](#foo)'));
-        $this->assertSame('<p><a href="/subdir/#foo">Root Anchor</a></p>',
-            $this->parsedown->text('[Root Anchor](/#foo)'));
+        self::assertSame(
+            '<p><a href="/subdir/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2/item2-1#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)')
+        );
+        self::assertSame(
+            '<p><a href="#foo">Current Anchor</a></p>',
+            $this->parsedown->text('[Current Anchor](#foo)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)')
+        );
     }
 
-    public function testAnchorLinksSubDirAbsoluteUrls()
+    public function testAnchorLinksSubDirAbsoluteUrls(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-1#foo">Peer Anchor</a></p>',
-            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-1#foo">Peer Anchor 2</a></p>',
-            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
-            $this->parsedown->text('[Current Anchor](#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/#foo">Root Anchor</a></p>',
-            $this->parsedown->text('[Root Anchor](/#foo)'));
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2/item2-1#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)')
+        );
+        self::assertSame(
+            '<p><a href="#foo">Current Anchor</a></p>',
+            $this->parsedown->text('[Current Anchor](#foo)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)')
+        );
     }
 
-    public function testSlugRelativeLinks()
+    public function testSlugRelativeLinks(): void
     {
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="/">Up to Root Level</a></p>',
-            $this->parsedown->text('[Up to Root Level](../..)'));
-        $this->assertSame('<p><a href="/item2/item2-1">Peer Page</a></p>',
-            $this->parsedown->text('[Peer Page](../item2-1)'));
-        $this->assertSame('<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>',
-            $this->parsedown->text('[Down a Level](item2-2-1)'));
-        $this->assertSame('<p><a href="/item2">Up a Level</a></p>',
-            $this->parsedown->text('[Up a Level](..)'));
-        $this->assertSame('<p><a href="/item3/item3-3">Up and Down</a></p>',
-            $this->parsedown->text('[Up and Down](../../item3/item3-3)'));
-        $this->assertSame('<p><a href="/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
-            $this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)'));
-        $this->assertSame('<p><a href="/item2?foo=bar">Up a Level with Query</a></p>',
-            $this->parsedown->text('[Up a Level with Query](../?foo=bar)'));
-        $this->assertSame('<p><a href="/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
-            $this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)'));
-        $this->assertSame('<p><a href="/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
-            $this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)'));
-        $this->assertSame('<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>',
-            $this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)'));
-    }
-
-    public function testSlugRelativeLinksAbsoluteUrls()
+        self::assertSame(
+            '<p><a href="/">Up to Root Level</a></p>',
+            $this->parsedown->text('[Up to Root Level](../..)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-1">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](../item2-1)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](item2-2-1)')
+        );
+        self::assertSame(
+            '<p><a href="/item2">Up a Level</a></p>',
+            $this->parsedown->text('[Up a Level](..)')
+        );
+        self::assertSame(
+            '<p><a href="/item3/item3-3">Up and Down</a></p>',
+            $this->parsedown->text('[Up and Down](../../item3/item3-3)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
+            $this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/item2?foo=bar">Up a Level with Query</a></p>',
+            $this->parsedown->text('[Up a Level with Query](../?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
+            $this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
+            $this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)')
+        );
+        self::assertSame(
+            '<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>',
+            $this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)')
+        );
+    }
+
+    public function testSlugRelativeLinksAbsoluteUrls(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="http://testing.dev/item2/item2-1">Peer Page</a></p>',
-            $this->parsedown->text('[Peer Page](../item2-1)'));
-        $this->assertSame('<p><a href="http://testing.dev/item2/item2-2/item2-2-1">Down a Level</a></p>',
-            $this->parsedown->text('[Down a Level](item2-2-1)'));
-        $this->assertSame('<p><a href="http://testing.dev/item2">Up a Level</a></p>',
-            $this->parsedown->text('[Up a Level](..)'));
-        $this->assertSame('<p><a href="http://testing.dev/">Up to Root Level</a></p>',
-            $this->parsedown->text('[Up to Root Level](../..)'));
-        $this->assertSame('<p><a href="http://testing.dev/item3/item3-3">Up and Down</a></p>',
-            $this->parsedown->text('[Up and Down](../../item3/item3-3)'));
-        $this->assertSame('<p><a href="http://testing.dev/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
-            $this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)'));
-        $this->assertSame('<p><a href="http://testing.dev/item2?foo=bar">Up a Level with Query</a></p>',
-            $this->parsedown->text('[Up a Level with Query](../?foo=bar)'));
-        $this->assertSame('<p><a href="http://testing.dev/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
-            $this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)'));
-        $this->assertSame('<p><a href="http://testing.dev/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
-            $this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)'));
-        $this->assertSame('<p><a href="http://testing.dev/item3/item3-3#foo">Up and Down with Anchor</a></p>',
-            $this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)'));
-    }
-
-    public function testSlugRelativeLinksSubDir()
+        self::assertSame(
+            '<p><a href="http://testing.dev/item2/item2-1">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](../item2-1)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/item2/item2-2/item2-2-1">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](item2-2-1)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/item2">Up a Level</a></p>',
+            $this->parsedown->text('[Up a Level](..)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/">Up to Root Level</a></p>',
+            $this->parsedown->text('[Up to Root Level](../..)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/item3/item3-3">Up and Down</a></p>',
+            $this->parsedown->text('[Up and Down](../../item3/item3-3)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
+            $this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/item2?foo=bar">Up a Level with Query</a></p>',
+            $this->parsedown->text('[Up a Level with Query](../?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
+            $this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
+            $this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/item3/item3-3#foo">Up and Down with Anchor</a></p>',
+            $this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)')
+        );
+    }
+
+    public function testSlugRelativeLinksSubDir(): void
     {
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="/subdir/item2/item2-1">Peer Page</a></p>',
-            $this->parsedown->text('[Peer Page](../item2-1)'));
-        $this->assertSame('<p><a href="/subdir/item2/item2-2/item2-2-1">Down a Level</a></p>',
-            $this->parsedown->text('[Down a Level](item2-2-1)'));
-        $this->assertSame('<p><a href="/subdir/item2">Up a Level</a></p>',
-            $this->parsedown->text('[Up a Level](..)'));
-        $this->assertSame('<p><a href="/subdir">Up to Root Level</a></p>',
-            $this->parsedown->text('[Up to Root Level](../..)'));
-        $this->assertSame('<p><a href="/subdir/item3/item3-3">Up and Down</a></p>',
-            $this->parsedown->text('[Up and Down](../../item3/item3-3)'));
-        $this->assertSame('<p><a href="/subdir/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
-            $this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)'));
-        $this->assertSame('<p><a href="/subdir/item2?foo=bar">Up a Level with Query</a></p>',
-            $this->parsedown->text('[Up a Level with Query](../?foo=bar)'));
-        $this->assertSame('<p><a href="/subdir/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
-            $this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)'));
-        $this->assertSame('<p><a href="/subdir/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
-            $this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)'));
-        $this->assertSame('<p><a href="/subdir/item3/item3-3#foo">Up and Down with Anchor</a></p>',
-            $this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)'));
-    }
-
-    public function testSlugRelativeLinksSubDirAbsoluteUrls()
+        self::assertSame(
+            '<p><a href="/subdir/item2/item2-1">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](../item2-1)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2/item2-2/item2-2-1">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](item2-2-1)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2">Up a Level</a></p>',
+            $this->parsedown->text('[Up a Level](..)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir">Up to Root Level</a></p>',
+            $this->parsedown->text('[Up to Root Level](../..)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item3/item3-3">Up and Down</a></p>',
+            $this->parsedown->text('[Up and Down](../../item3/item3-3)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
+            $this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2?foo=bar">Up a Level with Query</a></p>',
+            $this->parsedown->text('[Up a Level with Query](../?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
+            $this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
+            $this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item3/item3-3#foo">Up and Down with Anchor</a></p>',
+            $this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)')
+        );
+    }
+
+    public function testSlugRelativeLinksSubDirAbsoluteUrls(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-1">Peer Page</a></p>',
-            $this->parsedown->text('[Peer Page](../item2-1)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-2/item2-2-1">Down a Level</a></p>',
-            $this->parsedown->text('[Down a Level](item2-2-1)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2">Up a Level</a></p>',
-            $this->parsedown->text('[Up a Level](..)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir">Up to Root Level</a></p>',
-            $this->parsedown->text('[Up to Root Level](../..)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item3/item3-3">Up and Down</a></p>',
-            $this->parsedown->text('[Up and Down](../../item3/item3-3)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
-            $this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2?foo=bar">Up a Level with Query</a></p>',
-            $this->parsedown->text('[Up a Level with Query](../?foo=bar)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
-            $this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
-            $this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item3/item3-3#foo">Up and Down with Anchor</a></p>',
-            $this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)'));
-    }
-
-
-    public function testDirectoryRelativeLinks()
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2/item2-1">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](../item2-1)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2/item2-2/item2-2-1">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](item2-2-1)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2">Up a Level</a></p>',
+            $this->parsedown->text('[Up a Level](..)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir">Up to Root Level</a></p>',
+            $this->parsedown->text('[Up to Root Level](../..)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item3/item3-3">Up and Down</a></p>',
+            $this->parsedown->text('[Up and Down](../../item3/item3-3)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
+            $this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2?foo=bar">Up a Level with Query</a></p>',
+            $this->parsedown->text('[Up a Level with Query](../?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
+            $this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
+            $this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item3/item3-3#foo">Up and Down with Anchor</a></p>',
+            $this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)')
+        );
+    }
+
+
+    public function testDirectoryRelativeLinks(): void
     {
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
-            $this->parsedown->text('[Up and Down with Param](../../03.item3/03.item3-3/foo:bar)'));
-        $this->assertSame('<p><a href="/item2/item2-1">Peer Page</a></p>',
-            $this->parsedown->text('[Peer Page](../01.item2-1)'));
-        $this->assertSame('<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>',
-            $this->parsedown->text('[Down a Level](01.item2-2-1)'));
-        $this->assertSame('<p><a href="/item3/item3-3">Up and Down</a></p>',
-            $this->parsedown->text('[Up and Down](../../03.item3/03.item3-3)'));
-        $this->assertSame('<p><a href="/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
-            $this->parsedown->text('[Down a Level with Query](01.item2-2-1?foo=bar)'));
-        $this->assertSame('<p><a href="/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
-            $this->parsedown->text('[Up and Down with Query](../../03.item3/03.item3-3?foo=bar)'));
-        $this->assertSame('<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>',
-            $this->parsedown->text('[Up and Down with Anchor](../../03.item3/03.item3-3#foo)'));
+        self::assertSame(
+            '<p><a href="/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
+            $this->parsedown->text('[Up and Down with Param](../../03.item3/03.item3-3/foo:bar)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-1">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](../01.item2-1)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](01.item2-2-1)')
+        );
+        self::assertSame(
+            '<p><a href="/item3/item3-3">Up and Down</a></p>',
+            $this->parsedown->text('[Up and Down](../../03.item3/03.item3-3)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
+            $this->parsedown->text('[Down a Level with Query](01.item2-2-1?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
+            $this->parsedown->text('[Up and Down with Query](../../03.item3/03.item3-3?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>',
+            $this->parsedown->text('[Up and Down with Anchor](../../03.item3/03.item3-3#foo)')
+        );
     }
 
 
-    public function testAbsoluteLinks()
+    public function testAbsoluteLinks(): void
     {
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="/">Root</a></p>',
-            $this->parsedown->text('[Root](/)'));
-        $this->assertSame('<p><a href="/item2/item2-1">Peer Page</a></p>',
-            $this->parsedown->text('[Peer Page](/item2/item2-1)'));
-        $this->assertSame('<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>',
-            $this->parsedown->text('[Down a Level](/item2/item2-2/item2-2-1)'));
-        $this->assertSame('<p><a href="/item2">Up a Level</a></p>',
-            $this->parsedown->text('[Up a Level](/item2)'));
-        $this->assertSame('<p><a href="/item2?foo=bar">With Query</a></p>',
-            $this->parsedown->text('[With Query](/item2?foo=bar)'));
-        $this->assertSame('<p><a href="/item2/foo:bar">With Param</a></p>',
-            $this->parsedown->text('[With Param](/item2/foo:bar)'));
-        $this->assertSame('<p><a href="/item2#foo">With Anchor</a></p>',
-            $this->parsedown->text('[With Anchor](/item2#foo)'));
+        self::assertSame(
+            '<p><a href="/">Root</a></p>',
+            $this->parsedown->text('[Root](/)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-1">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](/item2/item2-1)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](/item2/item2-2/item2-2-1)')
+        );
+        self::assertSame(
+            '<p><a href="/item2">Up a Level</a></p>',
+            $this->parsedown->text('[Up a Level](/item2)')
+        );
+        self::assertSame(
+            '<p><a href="/item2?foo=bar">With Query</a></p>',
+            $this->parsedown->text('[With Query](/item2?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/foo:bar">With Param</a></p>',
+            $this->parsedown->text('[With Param](/item2/foo:bar)')
+        );
+        self::assertSame(
+            '<p><a href="/item2#foo">With Anchor</a></p>',
+            $this->parsedown->text('[With Anchor](/item2#foo)')
+        );
     }
 
-    public function testDirectoryAbsoluteLinksSubDir()
+    public function testDirectoryAbsoluteLinksSubDir(): void
     {
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="/subdir/">Root</a></p>',
-            $this->parsedown->text('[Root](/)'));
-        $this->assertSame('<p><a href="/subdir/item2/item2-1">Peer Page</a></p>',
-            $this->parsedown->text('[Peer Page](/item2/item2-1)'));
-        $this->assertSame('<p><a href="/subdir/item2/item2-2/item2-2-1">Down a Level</a></p>',
-            $this->parsedown->text('[Down a Level](/item2/item2-2/item2-2-1)'));
-        $this->assertSame('<p><a href="/subdir/item2">Up a Level</a></p>',
-            $this->parsedown->text('[Up a Level](/item2)'));
-        $this->assertSame('<p><a href="/subdir/item2?foo=bar">With Query</a></p>',
-            $this->parsedown->text('[With Query](/item2?foo=bar)'));
-        $this->assertSame('<p><a href="/subdir/item2/foo:bar">With Param</a></p>',
-            $this->parsedown->text('[With Param](/item2/foo:bar)'));
-        $this->assertSame('<p><a href="/subdir/item2#foo">With Anchor</a></p>',
-            $this->parsedown->text('[With Anchor](/item2#foo)'));
+        self::assertSame(
+            '<p><a href="/subdir/">Root</a></p>',
+            $this->parsedown->text('[Root](/)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2/item2-1">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](/item2/item2-1)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2/item2-2/item2-2-1">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](/item2/item2-2/item2-2-1)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2">Up a Level</a></p>',
+            $this->parsedown->text('[Up a Level](/item2)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2?foo=bar">With Query</a></p>',
+            $this->parsedown->text('[With Query](/item2?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2/foo:bar">With Param</a></p>',
+            $this->parsedown->text('[With Param](/item2/foo:bar)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2#foo">With Anchor</a></p>',
+            $this->parsedown->text('[With Anchor](/item2#foo)')
+        );
     }
 
-    public function testDirectoryAbsoluteLinksSubDirAbsoluteUrl()
+    public function testDirectoryAbsoluteLinksSubDirAbsoluteUrl(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="http://testing.dev/subdir/">Root</a></p>',
-            $this->parsedown->text('[Root](/)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-1">Peer Page</a></p>',
-            $this->parsedown->text('[Peer Page](/item2/item2-1)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-2/item2-2-1">Down a Level</a></p>',
-            $this->parsedown->text('[Down a Level](/item2/item2-2/item2-2-1)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2">Up a Level</a></p>',
-            $this->parsedown->text('[Up a Level](/item2)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2?foo=bar">With Query</a></p>',
-            $this->parsedown->text('[With Query](/item2?foo=bar)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/foo:bar">With Param</a></p>',
-            $this->parsedown->text('[With Param](/item2/foo:bar)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2#foo">With Anchor</a></p>',
-            $this->parsedown->text('[With Anchor](/item2#foo)'));
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/">Root</a></p>',
+            $this->parsedown->text('[Root](/)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2/item2-1">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](/item2/item2-1)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2/item2-2/item2-2-1">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](/item2/item2-2/item2-2-1)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2">Up a Level</a></p>',
+            $this->parsedown->text('[Up a Level](/item2)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2?foo=bar">With Query</a></p>',
+            $this->parsedown->text('[With Query](/item2?foo=bar)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2/foo:bar">With Param</a></p>',
+            $this->parsedown->text('[With Param](/item2/foo:bar)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2#foo">With Anchor</a></p>',
+            $this->parsedown->text('[With Anchor](/item2#foo)')
+        );
     }
 
-    public function testSpecialProtocols()
+    public function testSpecialProtocols(): void
     {
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="mailto:user@domain.com">mailto</a></p>',
-            $this->parsedown->text('[mailto](mailto:user@domain.com)'));
-        $this->assertSame('<p><a href="xmpp:xyx@domain.com">xmpp</a></p>',
-            $this->parsedown->text('[xmpp](xmpp:xyx@domain.com)'));
-        $this->assertSame('<p><a href="tel:123-555-12345">tel</a></p>',
-            $this->parsedown->text('[tel](tel:123-555-12345)'));
-        $this->assertSame('<p><a href="sms:123-555-12345">sms</a></p>',
-            $this->parsedown->text('[sms](sms:123-555-12345)'));
-        $this->assertSame('<p><a href="rdp://ts.example.com">ts.example.com</a></p>',
-            $this->parsedown->text('[ts.example.com](rdp://ts.example.com)'));
+        self::assertSame(
+            '<p><a href="mailto:user@domain.com">mailto</a></p>',
+            $this->parsedown->text('[mailto](mailto:user@domain.com)')
+        );
+        self::assertSame(
+            '<p><a href="xmpp:xyx@domain.com">xmpp</a></p>',
+            $this->parsedown->text('[xmpp](xmpp:xyx@domain.com)')
+        );
+        self::assertSame(
+            '<p><a href="tel:123-555-12345">tel</a></p>',
+            $this->parsedown->text('[tel](tel:123-555-12345)')
+        );
+        self::assertSame(
+            '<p><a href="sms:123-555-12345">sms</a></p>',
+            $this->parsedown->text('[sms](sms:123-555-12345)')
+        );
+        self::assertSame(
+            '<p><a href="rdp://ts.example.com">ts.example.com</a></p>',
+            $this->parsedown->text('[ts.example.com](rdp://ts.example.com)')
+        );
     }
 
-    public function testSpecialProtocolsSubDir()
+    public function testSpecialProtocolsSubDir(): void
     {
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="mailto:user@domain.com">mailto</a></p>',
-            $this->parsedown->text('[mailto](mailto:user@domain.com)'));
-        $this->assertSame('<p><a href="xmpp:xyx@domain.com">xmpp</a></p>',
-            $this->parsedown->text('[xmpp](xmpp:xyx@domain.com)'));
-        $this->assertSame('<p><a href="tel:123-555-12345">tel</a></p>',
-            $this->parsedown->text('[tel](tel:123-555-12345)'));
-        $this->assertSame('<p><a href="sms:123-555-12345">sms</a></p>',
-            $this->parsedown->text('[sms](sms:123-555-12345)'));
-        $this->assertSame('<p><a href="rdp://ts.example.com">ts.example.com</a></p>',
-            $this->parsedown->text('[ts.example.com](rdp://ts.example.com)'));
+        self::assertSame(
+            '<p><a href="mailto:user@domain.com">mailto</a></p>',
+            $this->parsedown->text('[mailto](mailto:user@domain.com)')
+        );
+        self::assertSame(
+            '<p><a href="xmpp:xyx@domain.com">xmpp</a></p>',
+            $this->parsedown->text('[xmpp](xmpp:xyx@domain.com)')
+        );
+        self::assertSame(
+            '<p><a href="tel:123-555-12345">tel</a></p>',
+            $this->parsedown->text('[tel](tel:123-555-12345)')
+        );
+        self::assertSame(
+            '<p><a href="sms:123-555-12345">sms</a></p>',
+            $this->parsedown->text('[sms](sms:123-555-12345)')
+        );
+        self::assertSame(
+            '<p><a href="rdp://ts.example.com">ts.example.com</a></p>',
+            $this->parsedown->text('[ts.example.com](rdp://ts.example.com)')
+        );
     }
 
-    public function testSpecialProtocolsSubDirAbsoluteUrl()
+    public function testSpecialProtocolsSubDirAbsoluteUrl(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="mailto:user@domain.com">mailto</a></p>',
-            $this->parsedown->text('[mailto](mailto:user@domain.com)'));
-        $this->assertSame('<p><a href="xmpp:xyx@domain.com">xmpp</a></p>',
-            $this->parsedown->text('[xmpp](xmpp:xyx@domain.com)'));
-        $this->assertSame('<p><a href="tel:123-555-12345">tel</a></p>',
-            $this->parsedown->text('[tel](tel:123-555-12345)'));
-        $this->assertSame('<p><a href="sms:123-555-12345">sms</a></p>',
-            $this->parsedown->text('[sms](sms:123-555-12345)'));
-        $this->assertSame('<p><a href="rdp://ts.example.com">ts.example.com</a></p>',
-            $this->parsedown->text('[ts.example.com](rdp://ts.example.com)'));
+        self::assertSame(
+            '<p><a href="mailto:user@domain.com">mailto</a></p>',
+            $this->parsedown->text('[mailto](mailto:user@domain.com)')
+        );
+        self::assertSame(
+            '<p><a href="xmpp:xyx@domain.com">xmpp</a></p>',
+            $this->parsedown->text('[xmpp](xmpp:xyx@domain.com)')
+        );
+        self::assertSame(
+            '<p><a href="tel:123-555-12345">tel</a></p>',
+            $this->parsedown->text('[tel](tel:123-555-12345)')
+        );
+        self::assertSame(
+            '<p><a href="sms:123-555-12345">sms</a></p>',
+            $this->parsedown->text('[sms](sms:123-555-12345)')
+        );
+        self::assertSame(
+            '<p><a href="rdp://ts.example.com">ts.example.com</a></p>',
+            $this->parsedown->text('[ts.example.com](rdp://ts.example.com)')
+        );
     }
 
-    public function testReferenceLinks()
+    public function testReferenceLinks(): void
     {
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
         $sample = '[relative link][r_relative]
                    [r_relative]: ../item2-3#blah';
-        $this->assertSame('<p><a href="/item2/item2-3#blah">relative link</a></p>',
-            $this->parsedown->text($sample));
+        self::assertSame(
+            '<p><a href="/item2/item2-3#blah">relative link</a></p>',
+            $this->parsedown->text($sample)
+        );
 
         $sample = '[absolute link][r_absolute]
                    [r_absolute]: /item3#blah';
-        $this->assertSame('<p><a href="/item3#blah">absolute link</a></p>',
-            $this->parsedown->text($sample));
+        self::assertSame(
+            '<p><a href="/item3#blah">absolute link</a></p>',
+            $this->parsedown->text($sample)
+        );
 
         $sample = '[external link][r_external]
                    [r_external]: http://www.cnn.com';
-        $this->assertSame('<p><a href="http://www.cnn.com">external link</a></p>',
-            $this->parsedown->text($sample));
+        self::assertSame(
+            '<p><a href="http://www.cnn.com">external link</a></p>',
+            $this->parsedown->text($sample)
+        );
     }
 
-    public function testAttributeLinks()
+    public function testAttributeLinks(): void
     {
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="#something" class="button">Anchor Class</a></p>',
-            $this->parsedown->text('[Anchor Class](?classes=button#something)'));
-        $this->assertSame('<p><a href="/item2/item2-3" class="button">Relative Class</a></p>',
-            $this->parsedown->text('[Relative Class](../item2-3?classes=button)'));
-        $this->assertSame('<p><a href="/item2/item2-3" id="unique">Relative ID</a></p>',
-            $this->parsedown->text('[Relative ID](../item2-3?id=unique)'));
-        $this->assertSame('<p><a href="https://github.com/getgrav/grav" class="button big">External</a></p>',
-            $this->parsedown->text('[External](https://github.com/getgrav/grav?classes=button,big)'));
-        $this->assertSame('<p><a href="/item2/item2-3?id=unique">Relative Noprocess</a></p>',
-            $this->parsedown->text('[Relative Noprocess](../item2-3?id=unique&noprocess)'));
-        $this->assertSame('<p><a href="/item2/item2-3" target="_blank">Relative Target</a></p>',
-            $this->parsedown->text('[Relative Target](../item2-3?target=_blank)'));
-        $this->assertSame('<p><a href="/item2/item2-3" rel="nofollow">Relative Rel</a></p>',
-            $this->parsedown->text('[Relative Rel](../item2-3?rel=nofollow)'));
-        $this->assertSame('<p><a href="/item2/item2-3?foo=bar&baz=qux" rel="nofollow" class="button">Relative Mixed</a></p>',
-            $this->parsedown->text('[Relative Mixed](../item2-3?foo=bar&baz=qux&rel=nofollow&class=button)'));
-    }
-
-    public function testInvalidLinks()
+        self::assertSame(
+            '<p><a href="#something" class="button">Anchor Class</a></p>',
+            $this->parsedown->text('[Anchor Class](?classes=button#something)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-3" class="button">Relative Class</a></p>',
+            $this->parsedown->text('[Relative Class](../item2-3?classes=button)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-3" id="unique">Relative ID</a></p>',
+            $this->parsedown->text('[Relative ID](../item2-3?id=unique)')
+        );
+        self::assertSame(
+            '<p><a href="https://github.com/getgrav/grav" class="button big">External</a></p>',
+            $this->parsedown->text('[External](https://github.com/getgrav/grav?classes=button,big)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-3?id=unique">Relative Noprocess</a></p>',
+            $this->parsedown->text('[Relative Noprocess](../item2-3?id=unique&noprocess)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-3" target="_blank">Relative Target</a></p>',
+            $this->parsedown->text('[Relative Target](../item2-3?target=_blank)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-3" rel="nofollow">Relative Rel</a></p>',
+            $this->parsedown->text('[Relative Rel](../item2-3?rel=nofollow)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-3?foo=bar&amp;baz=qux" rel="nofollow" class="button">Relative Mixed</a></p>',
+            $this->parsedown->text('[Relative Mixed](../item2-3?foo=bar&baz=qux&rel=nofollow&class=button)')
+        );
+    }
+
+    public function testInvalidLinks(): void
     {
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="/item2/item2-2/no-page">Non Existent Page</a></p>',
-            $this->parsedown->text('[Non Existent Page](no-page)'));
-        $this->assertSame('<p><a href="/item2/item2-2/existing-file.zip">Existent File</a></p>',
-            $this->parsedown->text('[Existent File](existing-file.zip)'));
-        $this->assertSame('<p><a href="/item2/item2-2/missing-file.zip">Non Existent File</a></p>',
-            $this->parsedown->text('[Non Existent File](missing-file.zip)'));
+        self::assertSame(
+            '<p><a href="/item2/item2-2/no-page">Non Existent Page</a></p>',
+            $this->parsedown->text('[Non Existent Page](no-page)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-2/existing-file.zip">Existent File</a></p>',
+            $this->parsedown->text('[Existent File](existing-file.zip)')
+        );
+        self::assertSame(
+            '<p><a href="/item2/item2-2/missing-file.zip">Non Existent File</a></p>',
+            $this->parsedown->text('[Non Existent File](missing-file.zip)')
+        );
     }
 
-    public function testInvalidLinksSubDir()
+    public function testInvalidLinksSubDir(): void
     {
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="/subdir/item2/item2-2/no-page">Non Existent Page</a></p>',
-            $this->parsedown->text('[Non Existent Page](no-page)'));
-        $this->assertSame('<p><a href="/subdir/item2/item2-2/existing-file.zip">Existent File</a></p>',
-            $this->parsedown->text('[Existent File](existing-file.zip)'));
-        $this->assertSame('<p><a href="/subdir/item2/item2-2/missing-file.zip">Non Existent File</a></p>',
-            $this->parsedown->text('[Non Existent File](missing-file.zip)'));
+        self::assertSame(
+            '<p><a href="/subdir/item2/item2-2/no-page">Non Existent Page</a></p>',
+            $this->parsedown->text('[Non Existent Page](no-page)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2/item2-2/existing-file.zip">Existent File</a></p>',
+            $this->parsedown->text('[Existent File](existing-file.zip)')
+        );
+        self::assertSame(
+            '<p><a href="/subdir/item2/item2-2/missing-file.zip">Non Existent File</a></p>',
+            $this->parsedown->text('[Non Existent File](missing-file.zip)')
+        );
     }
 
-    public function testInvalidLinksSubDirAbsoluteUrl()
+    public function testInvalidLinksSubDirAbsoluteUrl(): void
     {
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/item2/item2-2', '/subdir')->init();
 
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-2/no-page">Non Existent Page</a></p>',
-            $this->parsedown->text('[Non Existent Page](no-page)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-2/existing-file.zip">Existent File</a></p>',
-            $this->parsedown->text('[Existent File](existing-file.zip)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-2/missing-file.zip">Non Existent File</a></p>',
-            $this->parsedown->text('[Non Existent File](missing-file.zip)'));
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2/item2-2/no-page">Non Existent Page</a></p>',
+            $this->parsedown->text('[Non Existent Page](no-page)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2/item2-2/existing-file.zip">Existent File</a></p>',
+            $this->parsedown->text('[Existent File](existing-file.zip)')
+        );
+        self::assertSame(
+            '<p><a href="http://testing.dev/subdir/item2/item2-2/missing-file.zip">Non Existent File</a></p>',
+            $this->parsedown->text('[Non Existent File](missing-file.zip)')
+        );
     }
 
 
@@ -754,4 +1247,14 @@ private function stripLeadingWhitespace($string)
         return preg_replace('/^\s*(.*)/', '', $string);
     }
 
+    private function setImagesDefaults($defaults) {
+        $defaults = [
+            'images' => [
+                'defaults' => $defaults
+            ],
+        ];
+        $page = $this->pages->find('/item2/item2-2');
+        $excerpts = new Excerpts($page, $defaults);
+        $this->parsedown = new Parsedown($excerpts);
+    }
 }
diff --git a/tests/unit/Grav/Common/Page/PagesTest.php b/tests/unit/Grav/Common/Page/PagesTest.php
index 831ee3df0a..edff75bc83 100644
--- a/tests/unit/Grav/Common/Page/PagesTest.php
+++ b/tests/unit/Grav/Common/Page/PagesTest.php
@@ -1,10 +1,10 @@
 <?php
 
 use Codeception\Util\Fixtures;
-use Codeception\Util\Stub;
 use Grav\Common\Grav;
 use Grav\Common\Page\Pages;
 use Grav\Common\Page\Page;
+use Grav\Common\Page\Interfaces\PageInterface;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 /**
@@ -21,7 +21,7 @@ class PagesTest extends \Codeception\TestCase\Test
     /** @var PageInterface $root_page */
     protected $root_page;
 
-    protected function _before()
+    protected function _before(): void
     {
         $grav = Fixtures::get('grav');
         $this->grav = $grav();
@@ -35,247 +35,265 @@ protected function _before()
         $this->pages->init();
     }
 
-    public function testBase()
+    public function testBase(): void
     {
-        $this->assertSame('', $this->pages->base());
+        self::assertSame('', $this->pages->base());
         $this->pages->base('/test');
-        $this->assertSame('/test', $this->pages->base());
+        self::assertSame('/test', $this->pages->base());
         $this->pages->base('');
-        $this->assertNull($this->pages->base());
+        self::assertSame($this->pages->base(), '');
     }
 
-    public function testLastModified()
+    public function testLastModified(): void
     {
-        $this->assertNull($this->pages->lastModified());
+        self::assertNull($this->pages->lastModified());
         $this->pages->lastModified('test');
-        $this->assertSame('test', $this->pages->lastModified());
+        self::assertSame('test', $this->pages->lastModified());
     }
 
-    public function testInstances()
+    public function testInstances(): void
     {
-        $this->assertInternalType('array', $this->pages->instances());
-        foreach($this->pages->instances() as $instance) {
-            $this->assertInstanceOf('Grav\Common\Page\Page', $instance);
+        self::assertIsArray($this->pages->instances());
+        foreach ($this->pages->instances() as $instance) {
+            self::assertInstanceOf(PageInterface::class, $instance);
         }
     }
 
-    public function testRoutes()
+    public function testRoutes(): void
     {
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
-
-        $this->assertInternalType('array', $this->pages->routes());
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/01.home', $this->pages->routes()['/']);
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/01.home', $this->pages->routes()['/home']);
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog', $this->pages->routes()['/blog']);
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one', $this->pages->routes()['/blog/post-one']);
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two', $this->pages->routes()['/blog/post-two']);
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/03.about', $this->pages->routes()['/about']);
+        $folder = $locator->findResource('tests://');
+
+        self::assertIsArray($this->pages->routes());
+        self::assertSame($folder . '/fake/simple-site/user/pages/01.home', $this->pages->routes()['/']);
+        self::assertSame($folder . '/fake/simple-site/user/pages/01.home', $this->pages->routes()['/home']);
+        self::assertSame($folder . '/fake/simple-site/user/pages/02.blog', $this->pages->routes()['/blog']);
+        self::assertSame($folder . '/fake/simple-site/user/pages/02.blog/post-one', $this->pages->routes()['/blog/post-one']);
+        self::assertSame($folder . '/fake/simple-site/user/pages/02.blog/post-two', $this->pages->routes()['/blog/post-two']);
+        self::assertSame($folder . '/fake/simple-site/user/pages/03.about', $this->pages->routes()['/about']);
     }
 
-    public function testAddPage()
+    public function testAddPage(): void
     {
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
+        $folder = $locator->findResource('tests://');
 
-        $path = $locator->findResource('tests://') . '/fake/single-pages/01.simple-page/default.md';
+        $path = $folder . '/fake/single-pages/01.simple-page/default.md';
         $aPage = new Page();
         $aPage->init(new \SplFileInfo($path));
 
         $this->pages->addPage($aPage, '/new-page');
 
-        $this->assertContains('/new-page', array_keys($this->pages->routes()));
-        $this->assertSame($locator->findResource('tests://') . '/fake/single-pages/01.simple-page', $this->pages->routes()['/new-page']);
+        self::assertContains('/new-page', array_keys($this->pages->routes()));
+        self::assertSame($folder . '/fake/single-pages/01.simple-page', $this->pages->routes()['/new-page']);
     }
 
-    public function testSort()
+    public function testSort(): void
     {
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
+        $folder = $locator->findResource('tests://');
 
-        $aPage = $this->pages->dispatch('/blog');
+        $aPage = $this->pages->find('/blog');
         $subPagesSorted = $this->pages->sort($aPage);
 
-        $this->assertInternalType('array', $subPagesSorted);
-        $this->assertCount(2, $subPagesSorted);
+        self::assertIsArray($subPagesSorted);
+        self::assertCount(2, $subPagesSorted);
 
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted)[0]);
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted)[1]);
+        self::assertSame($folder . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted)[0]);
+        self::assertSame($folder . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted)[1]);
 
-        $this->assertContains($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted));
-        $this->assertContains($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted));
+        self::assertContains($folder . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted));
+        self::assertContains($folder . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted));
 
-        $this->assertSame(["slug" => "post-one"], $subPagesSorted[$locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one']);
-        $this->assertSame(["slug" => "post-two"], $subPagesSorted[$locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two']);
+        self::assertSame(['slug' => 'post-one'], $subPagesSorted[$folder . '/fake/simple-site/user/pages/02.blog/post-one']);
+        self::assertSame(['slug' => 'post-two'], $subPagesSorted[$folder . '/fake/simple-site/user/pages/02.blog/post-two']);
 
         $subPagesSorted = $this->pages->sort($aPage, null, 'desc');
 
-        $this->assertInternalType('array', $subPagesSorted);
-        $this->assertCount(2, $subPagesSorted);
+        self::assertIsArray($subPagesSorted);
+        self::assertCount(2, $subPagesSorted);
 
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted)[0]);
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted)[1]);
+        self::assertSame($folder . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted)[0]);
+        self::assertSame($folder . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted)[1]);
 
-        $this->assertContains($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted));
-        $this->assertContains($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted));
+        self::assertContains($folder . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted));
+        self::assertContains($folder . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted));
 
-        $this->assertSame(["slug" => "post-one"], $subPagesSorted[$locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one']);
-        $this->assertSame(["slug" => "post-two"], $subPagesSorted[$locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two']);
+        self::assertSame(['slug' => 'post-one'], $subPagesSorted[$folder . '/fake/simple-site/user/pages/02.blog/post-one']);
+        self::assertSame(['slug' => 'post-two'], $subPagesSorted[$folder . '/fake/simple-site/user/pages/02.blog/post-two']);
     }
 
-    public function testSortCollection()
+    public function testSortCollection(): void
     {
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
+        $folder = $locator->findResource('tests://');
 
-        $aPage = $this->pages->dispatch('/blog');
+        $aPage = $this->pages->find('/blog');
         $subPagesSorted = $this->pages->sortCollection($aPage->children(), $aPage->orderBy());
 
-        $this->assertInternalType('array', $subPagesSorted);
-        $this->assertCount(2, $subPagesSorted);
+        self::assertIsArray($subPagesSorted);
+        self::assertCount(2, $subPagesSorted);
 
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted)[0]);
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted)[1]);
+        self::assertSame($folder . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted)[0]);
+        self::assertSame($folder . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted)[1]);
 
-        $this->assertContains($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted));
-        $this->assertContains($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted));
+        self::assertContains($folder . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted));
+        self::assertContains($folder . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted));
 
-        $this->assertSame(["slug" => "post-one"], $subPagesSorted[$locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one']);
-        $this->assertSame(["slug" => "post-two"], $subPagesSorted[$locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two']);
+        self::assertSame(['slug' => 'post-one'], $subPagesSorted[$folder . '/fake/simple-site/user/pages/02.blog/post-one']);
+        self::assertSame(['slug' => 'post-two'], $subPagesSorted[$folder . '/fake/simple-site/user/pages/02.blog/post-two']);
 
         $subPagesSorted = $this->pages->sortCollection($aPage->children(), $aPage->orderBy(), 'desc');
 
-        $this->assertInternalType('array', $subPagesSorted);
-        $this->assertCount(2, $subPagesSorted);
+        self::assertIsArray($subPagesSorted);
+        self::assertCount(2, $subPagesSorted);
 
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted)[0]);
-        $this->assertSame($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted)[1]);
+        self::assertSame($folder . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted)[0]);
+        self::assertSame($folder . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted)[1]);
 
-        $this->assertContains($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted));
-        $this->assertContains($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted));
+        self::assertContains($folder . '/fake/simple-site/user/pages/02.blog/post-one', array_keys($subPagesSorted));
+        self::assertContains($folder . '/fake/simple-site/user/pages/02.blog/post-two', array_keys($subPagesSorted));
 
-        $this->assertSame(["slug" => "post-one"], $subPagesSorted[$locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-one']);
-        $this->assertSame(["slug" => "post-two"], $subPagesSorted[$locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog/post-two']);
+        self::assertSame(['slug' => 'post-one'], $subPagesSorted[$folder . '/fake/simple-site/user/pages/02.blog/post-one']);
+        self::assertSame(['slug' => 'post-two'], $subPagesSorted[$folder . '/fake/simple-site/user/pages/02.blog/post-two']);
     }
 
-    public function testGet()
+    public function testGet(): void
     {
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
+        $folder = $locator->findResource('tests://');
 
         //Page existing
-        $aPage = $this->pages->get($locator->findResource('tests://') . '/fake/simple-site/user/pages/03.about');
-        $this->assertInternalType('object', $aPage);
-        $this->assertInstanceOf('Grav\Common\Page\Page', $aPage);
+        $aPage = $this->pages->get($folder . '/fake/simple-site/user/pages/03.about');
+        self::assertInstanceOf(PageInterface::class, $aPage);
 
         //Page not existing
-        $anotherPage = $this->pages->get($locator->findResource('tests://') . '/fake/simple-site/user/pages/03.non-existing');
-        $this->assertNotInternalType('object', $anotherPage);
-        $this->assertNull($anotherPage);
+        $anotherPage = $this->pages->get($folder . '/fake/simple-site/user/pages/03.non-existing');
+        self::assertNull($anotherPage);
     }
 
-    public function testChildren()
+    public function testChildren(): void
     {
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
+        $folder = $locator->findResource('tests://');
 
         //Page existing
-        $children = $this->pages->children($locator->findResource('tests://') . '/fake/simple-site/user/pages/02.blog');
-        $this->assertInstanceOf('Grav\Common\Page\Collection', $children);
+        $children = $this->pages->children($folder . '/fake/simple-site/user/pages/02.blog');
+        self::assertInstanceOf('Grav\Common\Page\Collection', $children);
 
         //Page not existing
-        $children = $this->pages->children($locator->findResource('tests://') . '/fake/whatever/non-existing');
-        $this->assertSame([], $children->toArray());
+        $children = $this->pages->children($folder . '/fake/whatever/non-existing');
+        self::assertSame([], $children->toArray());
     }
 
-    public function testDispatch()
+    public function testDispatch(): void
     {
         $aPage = $this->pages->dispatch('/blog');
-        $this->assertInstanceOf('Grav\Common\Page\Page', $aPage);
+        self::assertInstanceOf(PageInterface::class, $aPage);
 
         $aPage = $this->pages->dispatch('/about');
-        $this->assertInstanceOf('Grav\Common\Page\Page', $aPage);
+        self::assertInstanceOf(PageInterface::class, $aPage);
 
         $aPage = $this->pages->dispatch('/blog/post-one');
-        $this->assertInstanceOf('Grav\Common\Page\Page', $aPage);
+        self::assertInstanceOf(PageInterface::class, $aPage);
 
         //Page not existing
         $aPage = $this->pages->dispatch('/non-existing');
-        $this->assertNull($aPage);
+        self::assertNull($aPage);
     }
 
-    public function testRoot()
+    public function testRoot(): void
     {
         $root = $this->pages->root();
-        $this->assertInstanceOf('Grav\Common\Page\Page', $root);
-        $this->assertSame('pages', $root->folder());
+        self::assertInstanceOf(PageInterface::class, $root);
+        self::assertSame('pages', $root->folder());
     }
 
-    public function testBlueprints()
+    public function testBlueprints(): void
     {
-
     }
 
     public function testAll()
     {
-        $this->assertInternalType('object', $this->pages->all());
-        $this->assertInternalType('array', $this->pages->all()->toArray());
-        foreach($this->pages->all() as $page) {
-            $this->assertInstanceOf('Grav\Common\Page\Page', $page);
+        self::assertIsObject($this->pages->all());
+        self::assertIsArray($this->pages->all()->toArray());
+        foreach ($this->pages->all() as $page) {
+            self::assertInstanceOf(PageInterface::class, $page);
         }
     }
 
-    public function testGetList()
+    public function testGetList(): void
     {
         $list = $this->pages->getList();
-        $this->assertInternalType('array', $list);
-        $this->assertSame('&mdash;-&rtrif; Home', $list['/']);
-        $this->assertSame('&mdash;-&rtrif; Blog', $list['/blog']);
+        self::assertIsArray($list);
+        self::assertSame('&mdash;-&rtrif; Home', $list['/']);
+        self::assertSame('&mdash;-&rtrif; Blog', $list['/blog']);
     }
 
-    public function testGetTypes()
+    public function testTranslatedLanguages(): void
     {
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+        $folder = $locator->findResource('tests://');
 
+        $page = $this->pages->get($folder . '/fake/simple-site/user/pages/04.page-translated');
+        $this->assertInstanceOf(PageInterface::class, $page);
+        $translatedLanguages = $page->translatedLanguages();
+        $this->assertIsArray($translatedLanguages);
+        $this->assertSame(["en" => "/page-translated", "fr" => "/page-translated"], $translatedLanguages);
     }
 
-    public function testTypes()
+    public function testLongPathTranslatedLanguages(): void
     {
-
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+        $folder = $locator->findResource('tests://');
+        $page = $this->pages->get($folder . '/fake/simple-site/user/pages/05.translatedlong/part2');
+        $this->assertInstanceOf(PageInterface::class, $page);
+        $translatedLanguages = $page->translatedLanguages();
+        $this->assertIsArray($translatedLanguages);
+        $this->assertSame(["en" => "/translatedlong/part2", "fr" => "/translatedlong/part2"], $translatedLanguages);
     }
 
-    public function testModularTypes()
+    public function testGetTypes(): void
     {
-
     }
 
-    public function testPageTypes()
+    public function testTypes(): void
     {
-
     }
 
-    public function testAccessLevels()
+    public function testModularTypes(): void
     {
-
     }
 
-    public function testParents()
+    public function testPageTypes(): void
     {
-
     }
 
-    public function testParentsRawRoutes()
+    public function testAccessLevels(): void
     {
-
     }
 
-    public function testGetHomeRoute()
+    public function testParents(): void
     {
-
     }
 
-    public function testResetPages()
+    public function testParentsRawRoutes(): void
     {
+    }
 
+    public function testGetHomeRoute(): void
+    {
     }
 
+    public function testResetPages(): void
+    {
+    }
 }
diff --git a/tests/unit/Grav/Common/Twig/Extensions/GravExtensionTest.php b/tests/unit/Grav/Common/Twig/Extensions/GravExtensionTest.php
new file mode 100644
index 0000000000..2adb023788
--- /dev/null
+++ b/tests/unit/Grav/Common/Twig/Extensions/GravExtensionTest.php
@@ -0,0 +1,202 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use Grav\Common\Grav;
+use Grav\Common\Twig\Extension\GravExtension;
+
+/**
+ * Class GravExtensionTest
+ */
+class GravExtensionTest extends \Codeception\TestCase\Test
+{
+    /** @var Grav $grav */
+    protected $grav;
+
+    /** @var  GravExtension $twig_ext */
+    protected $twig_ext;
+
+    protected function _before(): void
+    {
+        $this->grav = Fixtures::get('grav');
+        $this->twig_ext = new GravExtension();
+    }
+
+    public function testInflectorFilter(): void
+    {
+        self::assertSame('people', $this->twig_ext->inflectorFilter('plural', 'person'));
+        self::assertSame('shoe', $this->twig_ext->inflectorFilter('singular', 'shoes'));
+        self::assertSame('Welcome Page', $this->twig_ext->inflectorFilter('title', 'welcome page'));
+        self::assertSame('SendEmail', $this->twig_ext->inflectorFilter('camel', 'send_email'));
+        self::assertSame('camel_cased', $this->twig_ext->inflectorFilter('underscor', 'CamelCased'));
+        self::assertSame('something-text', $this->twig_ext->inflectorFilter('hyphen', 'Something Text'));
+        self::assertSame('Something text to read', $this->twig_ext->inflectorFilter('human', 'something_text_to_read'));
+        self::assertSame(5, $this->twig_ext->inflectorFilter('month', '175'));
+        self::assertSame('10th', $this->twig_ext->inflectorFilter('ordinal', '10'));
+    }
+
+    public function testMd5Filter(): void
+    {
+        self::assertSame(md5('grav'), $this->twig_ext->md5Filter('grav'));
+        self::assertSame(md5('devs@getgrav.org'), $this->twig_ext->md5Filter('devs@getgrav.org'));
+    }
+
+    public function testKsortFilter(): void
+    {
+        $object = array("name"=>"Bob","age"=>8,"colour"=>"red");
+        self::assertSame(array("age"=>8,"colour"=>"red","name"=>"Bob"), $this->twig_ext->ksortFilter($object));
+    }
+
+    public function testContainsFilter(): void
+    {
+        self::assertTrue($this->twig_ext->containsFilter('grav', 'grav'));
+        self::assertTrue($this->twig_ext->containsFilter('So, I found this new cms, called grav, and it\'s pretty awesome guys', 'grav'));
+    }
+
+    public function testNicetimeFilter(): void
+    {
+        $now = time();
+        $threeMinutes = time() - (60*3);
+        $threeHours   = time() - (60*60*3);
+        $threeDays    = time() - (60*60*24*3);
+        $threeMonths  = time() - (60*60*24*30*3);
+        $threeYears   = time() - (60*60*24*365*3);
+        $measures = ['minutes','hours','days','months','years'];
+
+        self::assertSame('No date provided', $this->twig_ext->nicetimeFunc(null));
+
+        for ($i=0; $i<count($measures); $i++) {
+            $time = 'three' . ucfirst($measures[$i]);
+            self::assertSame('3 ' . $measures[$i] . ' ago', $this->twig_ext->nicetimeFunc($$time));
+        }
+    }
+
+    public function testRandomizeFilter(): void
+    {
+        $array = [1,2,3,4,5];
+        self::assertContains(2, $this->twig_ext->randomizeFilter($array));
+        self::assertSame($array, $this->twig_ext->randomizeFilter($array, 5));
+        self::assertSame($array[0], $this->twig_ext->randomizeFilter($array, 1)[0]);
+        self::assertSame($array[3], $this->twig_ext->randomizeFilter($array, 4)[3]);
+        self::assertSame($array[1], $this->twig_ext->randomizeFilter($array, 4)[1]);
+    }
+
+    public function testModulusFilter(): void
+    {
+        self::assertSame(3, $this->twig_ext->modulusFilter(3, 4));
+        self::assertSame(1, $this->twig_ext->modulusFilter(11, 2));
+        self::assertSame(0, $this->twig_ext->modulusFilter(10, 2));
+        self::assertSame(2, $this->twig_ext->modulusFilter(10, 4));
+    }
+
+    public function testAbsoluteUrlFilter(): void
+    {
+    }
+
+    public function testMarkdownFilter(): void
+    {
+    }
+
+    public function testStartsWithFilter(): void
+    {
+    }
+
+    public function testEndsWithFilter(): void
+    {
+    }
+
+    public function testDefinedDefaultFilter(): void
+    {
+    }
+
+    public function testRtrimFilter(): void
+    {
+    }
+
+    public function testLtrimFilter(): void
+    {
+    }
+
+    public function testRepeatFunc(): void
+    {
+    }
+
+    public function testRegexReplace(): void
+    {
+    }
+
+    public function testUrlFunc(): void
+    {
+    }
+
+    public function testEvaluateFunc(): void
+    {
+    }
+
+    public function testDump(): void
+    {
+    }
+
+    public function testGistFunc(): void
+    {
+    }
+
+    public function testRandomStringFunc(): void
+    {
+    }
+
+    public function testPadFilter(): void
+    {
+    }
+
+    public function testArrayFunc(): void
+    {
+        self::assertSame(
+            'this is my text',
+            $this->twig_ext->regexReplace('<p>this is my text</p>', '(<\/?p>)', '')
+        );
+        self::assertSame(
+            '<i>this is my text</i>',
+            $this->twig_ext->regexReplace('<p>this is my text</p>', ['(<p>)','(<\/p>)'], ['<i>','</i>'])
+        );
+    }
+
+    public function testArrayKeyValue(): void
+    {
+        self::assertSame(
+            ['meat' => 'steak'],
+            $this->twig_ext->arrayKeyValueFunc('meat', 'steak')
+        );
+        self::assertSame(
+            ['fruit' => 'apple', 'meat' => 'steak'],
+            $this->twig_ext->arrayKeyValueFunc('meat', 'steak', ['fruit' => 'apple'])
+        );
+    }
+
+    public function stringFunc(): void
+    {
+    }
+
+    public function testRangeFunc(): void
+    {
+        $hundred = [];
+        for ($i = 0; $i <= 100; $i++) {
+            $hundred[] = $i;
+        }
+
+
+        self::assertSame([0], $this->twig_ext->rangeFunc(0, 0));
+        self::assertSame([0, 1, 2], $this->twig_ext->rangeFunc(0, 2));
+
+        self::assertSame([0, 5, 10, 15], $this->twig_ext->rangeFunc(0, 16, 5));
+
+        // default (min 0, max 100, step 1)
+        self::assertSame($hundred, $this->twig_ext->rangeFunc());
+
+        // 95 items, starting from 5, (min 5, max 100, step 1)
+        self::assertSame(array_slice($hundred, 5), $this->twig_ext->rangeFunc(5));
+
+        // reversed range
+        self::assertSame(array_reverse($hundred), $this->twig_ext->rangeFunc(100, 0));
+        self::assertSame([4, 2, 0], $this->twig_ext->rangeFunc(4, 0, 2));
+    }
+}
diff --git a/tests/unit/Grav/Common/Twig/TwigExtensionTest.php b/tests/unit/Grav/Common/Twig/TwigExtensionTest.php
deleted file mode 100644
index 56181f9943..0000000000
--- a/tests/unit/Grav/Common/Twig/TwigExtensionTest.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-use Codeception\Util\Fixtures;
-use Grav\Common\Grav;
-use Grav\Common\Twig\TwigExtension;
-
-/**
- * Class TwigExtensionTest
- */
-class TwigExtensionTest extends \Codeception\TestCase\Test
-{
-    /** @var Grav $grav */
-    protected $grav;
-
-    /** @var  TwigExtension $twig_ext */
-    protected $twig_ext;
-
-    protected function _before()
-    {
-        $this->grav = Fixtures::get('grav');
-        $this->twig_ext = new TwigExtension();
-    }
-
-    public function testInflectorFilter()
-    {
-        $this->assertSame('people',                     $this->twig_ext->inflectorFilter('plural',       'person'));
-        $this->assertSame('shoe',                       $this->twig_ext->inflectorFilter('singular',     'shoes'));
-        $this->assertSame('Welcome Page',               $this->twig_ext->inflectorFilter('title',        'welcome page'));
-        $this->assertSame('SendEmail',                  $this->twig_ext->inflectorFilter('camel',        'send_email'));
-        $this->assertSame('camel_cased',                $this->twig_ext->inflectorFilter('underscor',    'CamelCased'));
-        $this->assertSame('something-text',             $this->twig_ext->inflectorFilter('hyphen',       'Something Text'));
-        $this->assertSame('Something text to read',     $this->twig_ext->inflectorFilter('human',        'something_text_to_read'));
-        $this->assertSame(5,                            $this->twig_ext->inflectorFilter('month',        175));
-        $this->assertSame('10th',                       $this->twig_ext->inflectorFilter('ordinal',      10));
-    }
-
-    public function testMd5Filter()
-    {
-        $this->assertSame(md5('grav'),              $this->twig_ext->md5Filter('grav'));
-        $this->assertSame(md5('devs@getgrav.org'),  $this->twig_ext->md5Filter('devs@getgrav.org'));
-    }
-
-    public function testKsortFilter()
-    {
-        $object = array("name"=>"Bob","age"=>8,"colour"=>"red");
-        $this->assertSame(array("age"=>8,"colour"=>"red","name"=>"Bob"), $this->twig_ext->ksortFilter($object));
-    }
-
-    public function testContainsFilter()
-    {
-        $this->assertTrue($this->twig_ext->containsFilter('grav','grav'));
-        $this->assertTrue($this->twig_ext->containsFilter('So, I found this new cms, called grav, and it\'s pretty awesome guys','grav'));
-    }
-
-    public function testNicetimeFilter()
-    {
-        $now = time();
-        $threeMinutes = time() - (60*3);
-        $threeHours   = time() - (60*60*3);
-        $threeDays    = time() - (60*60*24*3);
-        $threeMonths  = time() - (60*60*24*30*3);
-        $threeYears   = time() - (60*60*24*365*3);
-        $measures = ['minutes','hours','days','months','years'];
-
-        $this->assertSame('No date provided', $this->twig_ext->nicetimeFunc(null));
-
-        for ($i=0; $i<count($measures); $i++) {
-            $time = 'three' . ucfirst($measures[$i]);
-            $this->assertSame('3 ' . $measures[$i] . ' ago', $this->twig_ext->nicetimeFunc($$time));
-        }
-    }
-
-    public function testRandomizeFilter()
-    {
-        $array = [1,2,3,4,5];
-        $this->assertContains(2,        $this->twig_ext->randomizeFilter($array));
-        $this->assertSame($array,       $this->twig_ext->randomizeFilter($array, 5));
-        $this->assertSame($array[0],    $this->twig_ext->randomizeFilter($array, 1)[0]);
-        $this->assertSame($array[3],    $this->twig_ext->randomizeFilter($array, 4)[3]);
-        $this->assertSame($array[1],    $this->twig_ext->randomizeFilter($array, 4)[1]);
-    }
-
-    public function testModulusFilter()
-    {
-        $this->assertSame(3,    $this->twig_ext->modulusFilter(3,4));
-        $this->assertSame(1,    $this->twig_ext->modulusFilter(11,2));
-        $this->assertSame(0,    $this->twig_ext->modulusFilter(10,2));
-        $this->assertSame(2,    $this->twig_ext->modulusFilter(10,4));
-    }
-
-    public function testAbsoluteUrlFilter()
-    {
-
-    }
-
-    public function testMarkdownFilter()
-    {
-
-    }
-
-    public function testStartsWithFilter()
-    {
-
-    }
-
-    public function testEndsWithFilter()
-    {
-
-    }
-
-    public function testDefinedDefaultFilter()
-    {
-
-    }
-
-    public function testRtrimFilter()
-    {
-
-    }
-
-    public function testLtrimFilter()
-    {
-
-    }
-
-    public function testRepeatFunc()
-    {
-
-    }
-
-    public function testRegexReplace()
-    {
-
-    }
-
-    public function testUrlFunc()
-    {
-
-    }
-
-    public function testEvaluateFunc()
-    {
-
-    }
-
-    public function testDump()
-    {
-
-    }
-
-    public function testGistFunc()
-    {
-
-    }
-
-    public function testRandomStringFunc()
-    {
-
-    }
-
-    public function testPadFilter()
-    {
-
-    }
-
-    public function testArrayFunc()
-    {
-        $this->assertSame('this is my text',
-            $this->twig_ext->regexReplace('<p>this is my text</p>', '(<\/?p>)', ''));
-        $this->assertSame('<i>this is my text</i>',
-            $this->twig_ext->regexReplace('<p>this is my text</p>', ['(<p>)','(<\/p>)'], ['<i>','</i>']));
-    }
-
-    public function testArrayKeyValue()
-    {
-        $this->assertSame(['meat' => 'steak'],
-            $this->twig_ext->arrayKeyValueFunc('meat', 'steak'));
-        $this->assertSame(['fruit' => 'apple', 'meat' => 'steak'],
-            $this->twig_ext->arrayKeyValueFunc('meat', 'steak', ['fruit' => 'apple']));
-    }
-
-    public function stringFunc()
-    {
-
-    }
-
-    public function testRangeFunc()
-    {
-        $hundred = [];
-        for($i = 0; $i <= 100; $i++) { $hundred[] = $i; }
-
-
-        $this->assertSame([0], $this->twig_ext->rangeFunc(0, 0));
-        $this->assertSame([0, 1, 2], $this->twig_ext->rangeFunc(0, 2));
-
-        $this->assertSame([0, 5, 10, 15], $this->twig_ext->rangeFunc(0, 16, 5));
-
-        // default (min 0, max 100, step 1)
-        $this->assertSame($hundred, $this->twig_ext->rangeFunc());
-
-        // 95 items, starting from 5, (min 5, max 100, step 1)
-        $this->assertSame(array_slice($hundred, 5), $this->twig_ext->rangeFunc(5));
-
-        // reversed range
-        $this->assertSame(array_reverse($hundred), $this->twig_ext->rangeFunc(100, 0));
-        $this->assertSame([4, 2, 0], $this->twig_ext->rangeFunc(4, 0, 2));
-    }
-}
diff --git a/tests/unit/Grav/Common/UriTest.php b/tests/unit/Grav/Common/UriTest.php
index 9977d67325..3e52ef877b 100644
--- a/tests/unit/Grav/Common/UriTest.php
+++ b/tests/unit/Grav/Common/UriTest.php
@@ -188,7 +188,7 @@ class UriTest extends \Codeception\TestCase\Test
             'environment' => 'localhost',
             'basename' => 'it',
             'base' => 'http://localhost:8080',
-            'currentPage' => '',
+            'currentPage' => 1,
             'rootUrl' => 'http://localhost:8080',
             'extension' => null,
             'addNonce' => 'http://localhost:8080/grav/it/ueper:xxx/page:/test:yyy/nonce:{{nonce}}',
@@ -298,7 +298,7 @@ class UriTest extends \Codeception\TestCase\Test
             'environment' => 'api.getgrav.com',
             'basename' => '128',
             'base' => 'https://api.getgrav.com:4040',
-            'currentPage' => 'x',
+            'currentPage' => 1,
             'rootUrl' => 'https://api.getgrav.com:4040',
             'extension' => null,
             'addNonce' => 'https://username:password@api.getgrav.com:4040/v1/post/128/page:x/nonce:{{nonce}}?all=1',
@@ -697,14 +697,14 @@ class UriTest extends \Codeception\TestCase\Test
             'password' => null,
             'host' => null,
             'port' => null,
-            'path' => '%22%3E%3Cscript%3Ealert%3C/localhost',
+            'path' => '/localhost',
             'query' => '',
             'fragment' => null,
 
-            'route' => '/%22%3E%3Cscript%3Ealert%3C/localhost',
-            'paths' => ['%22%3E%3Cscript%3Ealert%3C', 'localhost'],
+            'route' => '/localhost',
+            'paths' => ['localhost'],
             'params' => '/script%3E:',
-            'url' => '%22%3E%3Cscript%3Ealert%3C//localhost',
+            'url' => '//localhost',
             'environment' => 'unknown',
             'basename' => 'localhost',
             'base' => '',
@@ -712,7 +712,7 @@ class UriTest extends \Codeception\TestCase\Test
             'rootUrl' => '',
             'extension' => null,
             //'addNonce' => '%22%3E%3Cscript%3Ealert%3C/localhost/script%3E:/nonce:{{nonce}}', // FIXME <-
-            'toOriginalString' => '%22%3E%3Cscript%3Ealert%3C/localhost/script%3E:' // FIXME <-
+            'toOriginalString' => '/localhost/script%3E:' // FIXME <-
         ],
         'http://"><script>alert</script>' => [
             'scheme' => 'http://',
@@ -854,18 +854,18 @@ class UriTest extends \Codeception\TestCase\Test
         ],
     ];
 
-    protected function _before()
+    protected function _before(): void
     {
         $grav = Fixtures::get('grav');
         $this->grav = $grav();
         $this->uri = $this->grav['uri'];
     }
 
-    protected function _after()
+    protected function _after(): void
     {
     }
 
-    protected function runTestSet(array $tests, $method, $params = [])
+    protected function runTestSet(array $tests, $method, $params = []): void
     {
         foreach ($tests as $url => $candidates) {
             if (!array_key_exists($method, $candidates) && $method !== 'toOriginalString') {
@@ -875,7 +875,7 @@ protected function runTestSet(array $tests, $method, $params = [])
                 $nonce = Utils::getNonce('test-action');
                 $expected = str_replace('{{nonce}}', $nonce, $candidates[$method]);
 
-                $this->assertSame($expected, Uri::addNonce($url, 'test-action'));
+                self::assertSame($expected, Uri::addNonce($url, 'test-action'));
 
                 continue;
             }
@@ -893,213 +893,213 @@ protected function runTestSet(array $tests, $method, $params = [])
                 $result = $this->uri->{$method}();
             }
 
-            $this->assertSame($expected, $result, "Test \$url->{$method}() for {$url}");
+            self::assertSame($expected, $result, "Test \$url->{$method}() for {$url}");
             // Deal with $url->query($key)
             if ($method === 'query') {
                 parse_str($expected, $queryParams);
                 foreach ($queryParams as $key => $value) {
-                    $this->assertSame($value, $this->uri->{$method}($key), "Test \$url->{$method}('{$key}') for {$url}");
+                    self::assertSame($value, $this->uri->{$method}($key), "Test \$url->{$method}('{$key}') for {$url}");
                 }
-                $this->assertNull($this->uri->{$method}('non-existing'), "Test \$url->{$method}('non-existing') for {$url}");
+                self::assertNull($this->uri->{$method}('non-existing'), "Test \$url->{$method}('non-existing') for {$url}");
             }
         }
     }
 
-    public function testValidatingHostname()
+    public function testValidatingHostname(): void
     {
-        $this->assertTrue($this->uri->validateHostname('localhost'));
-        $this->assertTrue($this->uri->validateHostname('google.com'));
-        $this->assertTrue($this->uri->validateHostname('google.it'));
-        $this->assertTrue($this->uri->validateHostname('goog.le'));
-        $this->assertTrue($this->uri->validateHostname('goog.wine'));
-        $this->assertTrue($this->uri->validateHostname('goog.localhost'));
-
-        $this->assertFalse($this->uri->validateHostname('localhost:80') );
-        $this->assertFalse($this->uri->validateHostname('http://localhost'));
-        $this->assertFalse($this->uri->validateHostname('localhost!'));
+        self::assertTrue($this->uri->validateHostname('localhost'));
+        self::assertTrue($this->uri->validateHostname('google.com'));
+        self::assertTrue($this->uri->validateHostname('google.it'));
+        self::assertTrue($this->uri->validateHostname('goog.le'));
+        self::assertTrue($this->uri->validateHostname('goog.wine'));
+        self::assertTrue($this->uri->validateHostname('goog.localhost'));
+
+        self::assertFalse($this->uri->validateHostname('localhost:80'));
+        self::assertFalse($this->uri->validateHostname('http://localhost'));
+        self::assertFalse($this->uri->validateHostname('localhost!'));
     }
 
-    public function testToString()
+    public function testToString(): void
     {
         $this->runTestSet($this->tests, 'toOriginalString');
     }
 
-    public function testScheme()
+    public function testScheme(): void
     {
         $this->runTestSet($this->tests, 'scheme');
     }
 
-    public function testUser()
+    public function testUser(): void
     {
         $this->runTestSet($this->tests, 'user');
     }
 
-    public function testPassword()
+    public function testPassword(): void
     {
         $this->runTestSet($this->tests, 'password');
     }
 
-    public function testHost()
+    public function testHost(): void
     {
         $this->runTestSet($this->tests, 'host');
     }
 
-    public function testPort()
+    public function testPort(): void
     {
         $this->runTestSet($this->tests, 'port');
     }
 
-    public function testPath()
+    public function testPath(): void
     {
         $this->runTestSet($this->tests, 'path');
     }
 
-    public function testQuery()
+    public function testQuery(): void
     {
         $this->runTestSet($this->tests, 'query');
     }
 
-    public function testFragment()
+    public function testFragment(): void
     {
         $this->runTestSet($this->tests, 'fragment');
 
         $this->uri->fragment('something-new');
-        $this->assertSame('something-new', $this->uri->fragment());
+        self::assertSame('something-new', $this->uri->fragment());
     }
 
-    public function testPaths()
+    public function testPaths(): void
     {
         $this->runTestSet($this->tests, 'paths');
     }
 
-    public function testRoute()
+    public function testRoute(): void
     {
         $this->runTestSet($this->tests, 'route');
     }
 
-    public function testParams()
+    public function testParams(): void
     {
         $this->runTestSet($this->tests, 'params');
 
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame('/ueper:xxx', $this->uri->params('ueper'));
+        self::assertSame('/ueper:xxx', $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame('/ueper:xxx', $this->uri->params('ueper'));
-        $this->assertSame('/test:yyy', $this->uri->params('test'));
+        self::assertSame('/ueper:xxx', $this->uri->params('ueper'));
+        self::assertSame('/test:yyy', $this->uri->params('test'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx++/test:yyy')->init();
-        $this->assertSame('/ueper:xxx++/test:yyy', $this->uri->params());
-        $this->assertSame('/ueper:xxx++', $this->uri->params('ueper'));
-        $this->assertSame('/test:yyy', $this->uri->params('test'));
+        self::assertSame('/ueper:xxx++/test:yyy', $this->uri->params());
+        self::assertSame('/ueper:xxx++', $this->uri->params('ueper'));
+        self::assertSame('/test:yyy', $this->uri->params('test'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx++/test:yyy#something')->init();
-        $this->assertSame('/ueper:xxx++/test:yyy', $this->uri->params());
-        $this->assertSame('/ueper:xxx++', $this->uri->params('ueper'));
-        $this->assertSame('/test:yyy', $this->uri->params('test'));
+        self::assertSame('/ueper:xxx++/test:yyy', $this->uri->params());
+        self::assertSame('/ueper:xxx++', $this->uri->params('ueper'));
+        self::assertSame('/test:yyy', $this->uri->params('test'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx++/test:yyy?foo=bar')->init();
-        $this->assertSame('/ueper:xxx++/test:yyy', $this->uri->params());
-        $this->assertSame('/ueper:xxx++', $this->uri->params('ueper'));
-        $this->assertSame('/test:yyy', $this->uri->params('test'));
+        self::assertSame('/ueper:xxx++/test:yyy', $this->uri->params());
+        self::assertSame('/ueper:xxx++', $this->uri->params('ueper'));
+        self::assertSame('/test:yyy', $this->uri->params('test'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertNull($this->uri->params());
-        $this->assertNull($this->uri->params('ueper'));
+        self::assertNull($this->uri->params());
+        self::assertNull($this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertNull($this->uri->params());
-        $this->assertNull($this->uri->params('ueper'));
+        self::assertNull($this->uri->params());
+        self::assertNull($this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertNull($this->uri->params());
-        $this->assertNull($this->uri->params('ueper'));
+        self::assertNull($this->uri->params());
+        self::assertNull($this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertNull($this->uri->params());
-        $this->assertNull($this->uri->params('ueper'));
+        self::assertNull($this->uri->params());
+        self::assertNull($this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertNull($this->uri->params());
-        $this->assertNull($this->uri->params('ueper'));
+        self::assertNull($this->uri->params());
+        self::assertNull($this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertNull($this->uri->params());
-        $this->assertNull($this->uri->params('ueper'));
+        self::assertNull($this->uri->params());
+        self::assertNull($this->uri->params('ueper'));
     }
 
-    public function testParam()
+    public function testParam(): void
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame('xxx', $this->uri->param('ueper'));
+        self::assertSame('xxx', $this->uri->param('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame('xxx', $this->uri->param('ueper'));
-        $this->assertSame('yyy', $this->uri->param('test'));
+        self::assertSame('xxx', $this->uri->param('ueper'));
+        self::assertSame('yyy', $this->uri->param('test'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx++/test:yy%20y/foo:bar_baz-bank')->init();
-        $this->assertSame('xxx++', $this->uri->param('ueper'));
-        $this->assertSame('yy y', $this->uri->param('test'));
-        $this->assertSame('bar_baz-bank', $this->uri->param('foo'));
+        self::assertSame('xxx++', $this->uri->param('ueper'));
+        self::assertSame('yy y', $this->uri->param('test'));
+        self::assertSame('bar_baz-bank', $this->uri->param('foo'));
     }
 
-    public function testUrl()
+    public function testUrl(): void
     {
         $this->runTestSet($this->tests, 'url');
     }
 
-    public function testExtension()
+    public function testExtension(): void
     {
         $this->runTestSet($this->tests, 'extension');
 
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame('x', $this->uri->extension('x'));
+        self::assertSame('x', $this->uri->extension('x'));
     }
 
-    public function testEnvironment()
+    public function testEnvironment(): void
     {
         $this->runTestSet($this->tests, 'environment');
     }
 
-    public function testBasename()
+    public function testBasename(): void
     {
         $this->runTestSet($this->tests, 'basename');
     }
 
-    public function testBase()
+    public function testBase(): void
     {
         $this->runTestSet($this->tests, 'base');
     }
 
-    public function testRootUrl()
+    public function testRootUrl(): void
     {
         $this->runTestSet($this->tests, 'rootUrl', [true]);
 
         $this->uri->initializeWithUrlAndRootPath('https://localhost/grav/page-foo', '/grav')->init();
-        $this->assertSame('/grav', $this->uri->rootUrl());
-        $this->assertSame('https://localhost/grav', $this->uri->rootUrl(true));
+        self::assertSame('/grav', $this->uri->rootUrl());
+        self::assertSame('https://localhost/grav', $this->uri->rootUrl(true));
     }
 
-    public function testCurrentPage()
+    public function testCurrentPage(): void
     {
         $this->runTestSet($this->tests, 'currentPage');
 
         $this->uri->initializeWithURL('http://localhost:8080/a-page/page:2')->init();
-        $this->assertSame('2', $this->uri->currentPage());
+        self::assertSame(2, $this->uri->currentPage());
     }
 
-    public function testReferrer()
+    public function testReferrer(): void
     {
         $this->uri->initializeWithURL('http://localhost/foo/page:test')->init();
-        $this->assertSame('/foo', $this->uri->referrer());
+        self::assertSame('/foo', $this->uri->referrer());
         $this->uri->initializeWithURL('http://localhost/foo/bar/page:test')->init();
-        $this->assertSame('/foo/bar', $this->uri->referrer());
+        self::assertSame('/foo/bar', $this->uri->referrer());
     }
 
-    public function testIp()
+    public function testIp(): void
     {
         $this->uri->initializeWithURL('http://localhost/foo/page:test')->init();
-        $this->assertSame('UNKNOWN', Uri::ip());
+        self::assertSame('UNKNOWN', Uri::ip());
     }
 
-    public function testIsExternal()
+    public function testIsExternal(): void
     {
         $this->uri->initializeWithURL('http://localhost/')->init();
-        $this->assertFalse(Uri::isExternal('/test'));
-        $this->assertFalse(Uri::isExternal('/foo/bar'));
-        $this->assertTrue(Uri::isExternal('http://localhost/test'));
-        $this->assertTrue(Uri::isExternal('http://google.it/test'));
+        self::assertFalse(Uri::isExternal('/test'));
+        self::assertFalse(Uri::isExternal('/foo/bar'));
+        self::assertTrue(Uri::isExternal('http://localhost/test'));
+        self::assertTrue(Uri::isExternal('http://google.it/test'));
     }
 
-    public function testBuildUrl()
+    public function testBuildUrl(): void
     {
         $parsed_url = [
             'scheme' => 'http',
@@ -1107,7 +1107,7 @@ public function testBuildUrl()
             'port'   => 8080,
         ];
 
-        $this->assertSame('http://localhost:8080', Uri::buildUrl($parsed_url));
+        self::assertSame('http://localhost:8080', Uri::buildUrl($parsed_url));
 
         $parsed_url = [
             'scheme'   => 'http',
@@ -1120,33 +1120,32 @@ public function testBuildUrl()
             'fragment' => 'xxx',
         ];
 
-        $this->assertSame('http://foo:bar@localhost:8080/test?x=2#xxx', Uri::buildUrl($parsed_url));
+        self::assertSame('http://foo:bar@localhost:8080/test?x=2#xxx', Uri::buildUrl($parsed_url));
 
         /** @var Uri $uri */
         $uri = Grav::instance()['uri'];
 
         $uri->initializeWithUrlAndRootPath('https://testing.dev/subdir/path1/path2/file.html', '/subdir')->init();
-        $this->assertSame('https://testing.dev/subdir/path1/path2/file.html', Uri::buildUrl($uri->toArray(true)));
+        self::assertSame('https://testing.dev/subdir/path1/path2/file.html', Uri::buildUrl($uri->toArray(true)));
 
         $uri->initializeWithUrlAndRootPath('https://testing.dev/subdir/path1/path2/file.foo', '/subdir')->init();
-        $this->assertSame('https://testing.dev/subdir/path1/path2/file.foo', Uri::buildUrl($uri->toArray(true)));
+        self::assertSame('https://testing.dev/subdir/path1/path2/file.foo', Uri::buildUrl($uri->toArray(true)));
 
         $uri->initializeWithUrlAndRootPath('https://testing.dev/subdir/path1/path2/file.html', '/subdir/path1')->init();
-        $this->assertSame('https://testing.dev/subdir/path1/path2/file.html', Uri::buildUrl($uri->toArray(true)));
+        self::assertSame('https://testing.dev/subdir/path1/path2/file.html', Uri::buildUrl($uri->toArray(true)));
 
         $uri->initializeWithUrlAndRootPath('https://testing.dev/subdir/path1/path2/file.html/foo:blah/bang:boom', '/subdir')->init();
-        $this->assertSame('https://testing.dev/subdir/path1/path2/file.html/foo:blah/bang:boom', Uri::buildUrl($uri->toArray(true)));
+        self::assertSame('https://testing.dev/subdir/path1/path2/file.html/foo:blah/bang:boom', Uri::buildUrl($uri->toArray(true)));
 
         $uri->initializeWithUrlAndRootPath('https://testing.dev/subdir/path1/path2/file.html/foo:blah/bang:boom?fig=something', '/subdir')->init();
-        $this->assertSame('https://testing.dev/subdir/path1/path2/file.html/foo:blah/bang:boom?fig=something', Uri::buildUrl($uri->toArray(true)));
+        self::assertSame('https://testing.dev/subdir/path1/path2/file.html/foo:blah/bang:boom?fig=something', Uri::buildUrl($uri->toArray(true)));
     }
 
-    public function testConvertUrl()
+    public function testConvertUrl(): void
     {
-
     }
 
-    public function testAddNonce()
+    public function testAddNonce(): void
     {
         $this->runTestSet($this->tests, 'addNonce');
     }
diff --git a/tests/unit/Grav/Common/UtilsTest.php b/tests/unit/Grav/Common/UtilsTest.php
index e7862427cf..37e8637146 100644
--- a/tests/unit/Grav/Common/UtilsTest.php
+++ b/tests/unit/Grav/Common/UtilsTest.php
@@ -16,93 +16,113 @@ class UtilsTest extends \Codeception\TestCase\Test
     /** @var Uri $uri */
     protected $uri;
 
-    protected function _before()
+    protected function _before(): void
     {
         $grav = Fixtures::get('grav');
         $this->grav = $grav();
         $this->uri = $this->grav['uri'];
     }
 
-    protected function _after()
+    protected function _after(): void
     {
     }
 
-    public function testStartsWith()
+    public function testStartsWith(): void
     {
-        $this->assertTrue(Utils::startsWith('english', 'en'));
-        $this->assertTrue(Utils::startsWith('English', 'En'));
-        $this->assertTrue(Utils::startsWith('ENGLISH', 'EN'));
-        $this->assertTrue(Utils::startsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
-            'EN'));
+        self::assertTrue(Utils::startsWith('english', 'en'));
+        self::assertTrue(Utils::startsWith('English', 'En'));
+        self::assertTrue(Utils::startsWith('ENGLISH', 'EN'));
+        self::assertTrue(Utils::startsWith(
+            'ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'EN'
+        ));
 
-        $this->assertFalse(Utils::startsWith('english', 'En'));
-        $this->assertFalse(Utils::startsWith('English', 'EN'));
-        $this->assertFalse(Utils::startsWith('ENGLISH', 'en'));
-        $this->assertFalse(Utils::startsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
-            'e'));
-
-        $this->assertTrue(Utils::startsWith('english', 'En', false));
-        $this->assertTrue(Utils::startsWith('English', 'EN', false));
-        $this->assertTrue(Utils::startsWith('ENGLISH', 'en', false));
-        $this->assertTrue(Utils::startsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
-            'e', false));
+        self::assertFalse(Utils::startsWith('english', 'En'));
+        self::assertFalse(Utils::startsWith('English', 'EN'));
+        self::assertFalse(Utils::startsWith('ENGLISH', 'en'));
+        self::assertFalse(Utils::startsWith(
+            'ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'e'
+        ));
 
+        self::assertTrue(Utils::startsWith('english', 'En', false));
+        self::assertTrue(Utils::startsWith('English', 'EN', false));
+        self::assertTrue(Utils::startsWith('ENGLISH', 'en', false));
+        self::assertTrue(Utils::startsWith(
+            'ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'e',
+            false
+        ));
     }
 
-    public function testEndsWith()
+    public function testEndsWith(): void
     {
-        $this->assertTrue(Utils::endsWith('english', 'sh'));
-        $this->assertTrue(Utils::endsWith('EngliSh', 'Sh'));
-        $this->assertTrue(Utils::endsWith('ENGLISH', 'SH'));
-        $this->assertTrue(Utils::endsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
-            'ENGLISH'));
+        self::assertTrue(Utils::endsWith('english', 'sh'));
+        self::assertTrue(Utils::endsWith('EngliSh', 'Sh'));
+        self::assertTrue(Utils::endsWith('ENGLISH', 'SH'));
+        self::assertTrue(Utils::endsWith(
+            'ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'ENGLISH'
+        ));
 
-        $this->assertFalse(Utils::endsWith('english', 'de'));
-        $this->assertFalse(Utils::endsWith('EngliSh', 'sh'));
-        $this->assertFalse(Utils::endsWith('ENGLISH', 'Sh'));
-        $this->assertFalse(Utils::endsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
-            'DEUSTCH'));
+        self::assertFalse(Utils::endsWith('english', 'de'));
+        self::assertFalse(Utils::endsWith('EngliSh', 'sh'));
+        self::assertFalse(Utils::endsWith('ENGLISH', 'Sh'));
+        self::assertFalse(Utils::endsWith(
+            'ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'DEUSTCH'
+        ));
 
-        $this->assertTrue(Utils::endsWith('english', 'SH', false));
-        $this->assertTrue(Utils::endsWith('EngliSh', 'sH', false));
-        $this->assertTrue(Utils::endsWith('ENGLISH', 'sh', false));
-        $this->assertTrue(Utils::endsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
-            'english', false));
+        self::assertTrue(Utils::endsWith('english', 'SH', false));
+        self::assertTrue(Utils::endsWith('EngliSh', 'sH', false));
+        self::assertTrue(Utils::endsWith('ENGLISH', 'sh', false));
+        self::assertTrue(Utils::endsWith(
+            'ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'english',
+            false
+        ));
     }
 
-    public function testContains()
+    public function testContains(): void
     {
-        $this->assertTrue(Utils::contains('english', 'nglis'));
-        $this->assertTrue(Utils::contains('EngliSh', 'gliSh'));
-        $this->assertTrue(Utils::contains('ENGLISH', 'ENGLI'));
-        $this->assertTrue(Utils::contains('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
-            'ENGLISH'));
+        self::assertTrue(Utils::contains('english', 'nglis'));
+        self::assertTrue(Utils::contains('EngliSh', 'gliSh'));
+        self::assertTrue(Utils::contains('ENGLISH', 'ENGLI'));
+        self::assertTrue(Utils::contains(
+            'ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'ENGLISH'
+        ));
 
-        $this->assertFalse(Utils::contains('EngliSh', 'GLI'));
-        $this->assertFalse(Utils::contains('EngliSh', 'English'));
-        $this->assertFalse(Utils::contains('ENGLISH', 'SCH'));
-        $this->assertFalse(Utils::contains('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
-            'DEUSTCH'));
+        self::assertFalse(Utils::contains('EngliSh', 'GLI'));
+        self::assertFalse(Utils::contains('EngliSh', 'English'));
+        self::assertFalse(Utils::contains('ENGLISH', 'SCH'));
+        self::assertFalse(Utils::contains(
+            'ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'DEUSTCH'
+        ));
 
-        $this->assertTrue(Utils::contains('EngliSh', 'GLI', false));
-        $this->assertTrue(Utils::contains('EngliSh', 'ENGLISH', false));
-        $this->assertTrue(Utils::contains('ENGLISH', 'ish', false));
-        $this->assertTrue(Utils::contains('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
-            'english', false));
+        self::assertTrue(Utils::contains('EngliSh', 'GLI', false));
+        self::assertTrue(Utils::contains('EngliSh', 'ENGLISH', false));
+        self::assertTrue(Utils::contains('ENGLISH', 'ish', false));
+        self::assertTrue(Utils::contains(
+            'ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'english',
+            false
+        ));
     }
 
-    public function testSubstrToString()
+    public function testSubstrToString(): void
     {
-        $this->assertEquals('en', Utils::substrToString('english', 'glish'));
-        $this->assertEquals('english', Utils::substrToString('english', 'test'));
-        $this->assertNotEquals('en', Utils::substrToString('english', 'lish'));
+        self::assertEquals('en', Utils::substrToString('english', 'glish'));
+        self::assertEquals('english', Utils::substrToString('english', 'test'));
+        self::assertNotEquals('en', Utils::substrToString('english', 'lish'));
 
-        $this->assertEquals('en', Utils::substrToString('english', 'GLISH', false));
-        $this->assertEquals('english', Utils::substrToString('english', 'TEST', false));
-        $this->assertNotEquals('en', Utils::substrToString('english', 'LISH', false));
+        self::assertEquals('en', Utils::substrToString('english', 'GLISH', false));
+        self::assertEquals('english', Utils::substrToString('english', 'TEST', false));
+        self::assertNotEquals('en', Utils::substrToString('english', 'LISH', false));
     }
 
-    public function testMergeObjects()
+    public function testMergeObjects(): void
     {
         $obj1 = new stdClass();
         $obj1->test1 = 'x';
@@ -111,152 +131,150 @@ public function testMergeObjects()
 
         $objMerged = Utils::mergeObjects($obj1, $obj2);
 
-        $this->assertObjectHasAttribute('test1', $objMerged);
-        $this->assertObjectHasAttribute('test2', $objMerged);
+        self::assertObjectHasAttribute('test1', $objMerged);
+        self::assertObjectHasAttribute('test2', $objMerged);
     }
 
-    public function testDateFormats()
+    public function testDateFormats(): void
     {
         $dateFormats = Utils::dateFormats();
-        $this->assertInternalType('array', $dateFormats);
-        $this->assertContainsOnly('string', $dateFormats);
+        self::assertIsArray($dateFormats);
+        self::assertContainsOnly('string', $dateFormats);
 
         $default_format = $this->grav['config']->get('system.pages.dateformat.default');
 
         if ($default_format !== null) {
-            $this->assertArrayHasKey($default_format, $dateFormats);
+            self::assertArrayHasKey($default_format, $dateFormats);
         }
     }
 
-    public function testTruncate()
+    public function testTruncate(): void
     {
-        $this->assertEquals('engli' . '&hellip;', Utils::truncate('english', 5));
-        $this->assertEquals('english', Utils::truncate('english'));
-        $this->assertEquals('This is a string to truncate', Utils::truncate('This is a string to truncate'));
-        $this->assertEquals('Th' . '&hellip;', Utils::truncate('This is a string to truncate', 2));
-        $this->assertEquals('engli' . '...', Utils::truncate('english', 5, true, " ", "..."));
-        $this->assertEquals('english', Utils::truncate('english'));
-        $this->assertEquals('This is a string to truncate', Utils::truncate('This is a string to truncate'));
-        $this->assertEquals('This' . '&hellip;', Utils::truncate('This is a string to truncate', 3, true));
-        $this->assertEquals('<input' . '&hellip;', Utils::truncate('<input type="file" id="file" multiple />', 6, true));
-
+        self::assertEquals('engli' . '&hellip;', Utils::truncate('english', 5));
+        self::assertEquals('english', Utils::truncate('english'));
+        self::assertEquals('This is a string to truncate', Utils::truncate('This is a string to truncate'));
+        self::assertEquals('Th' . '&hellip;', Utils::truncate('This is a string to truncate', 2));
+        self::assertEquals('engli' . '...', Utils::truncate('english', 5, true, " ", "..."));
+        self::assertEquals('english', Utils::truncate('english'));
+        self::assertEquals('This is a string to truncate', Utils::truncate('This is a string to truncate'));
+        self::assertEquals('This' . '&hellip;', Utils::truncate('This is a string to truncate', 3, true));
+        self::assertEquals('<input' . '&hellip;', Utils::truncate('<input type="file" id="file" multiple />', 6, true));
     }
 
-    public function testSafeTruncate()
+    public function testSafeTruncate(): void
     {
-        $this->assertEquals('This' . '&hellip;', Utils::safeTruncate('This is a string to truncate', 1));
-        $this->assertEquals('This' . '&hellip;', Utils::safeTruncate('This is a string to truncate', 4));
-        $this->assertEquals('This is' . '&hellip;', Utils::safeTruncate('This is a string to truncate', 5));
+        self::assertEquals('This' . '&hellip;', Utils::safeTruncate('This is a string to truncate', 1));
+        self::assertEquals('This' . '&hellip;', Utils::safeTruncate('This is a string to truncate', 4));
+        self::assertEquals('This is' . '&hellip;', Utils::safeTruncate('This is a string to truncate', 5));
     }
 
-    public function testTruncateHtml()
+    public function testTruncateHtml(): void
     {
-        $this->assertEquals('T...', Utils::truncateHtml('This is a string to truncate', 1));
-        $this->assertEquals('This is...', Utils::truncateHtml('This is a string to truncate', 7));
-        $this->assertEquals('<p>T...</p>', Utils::truncateHtml('<p>This is a string to truncate</p>', 1));
-        $this->assertEquals('<p>This...</p>', Utils::truncateHtml('<p>This is a string to truncate</p>', 4));
-        $this->assertEquals('<p>This is a...</p>', Utils::truncateHtml('<p>This is a string to truncate</p>', 10));
-        $this->assertEquals('<p>This is a string to truncate</p>', Utils::truncateHtml('<p>This is a string to truncate</p>', 100));
-        $this->assertEquals('<input type="file" id="file" multiple />', Utils::truncateHtml('<input type="file" id="file" multiple />', 6));
-        $this->assertEquals('<ol><li>item 1 <i>so...</i></li></ol>', Utils::truncateHtml('<ol><li>item 1 <i>something</i></li><li>item 2 <strong>bold</strong></li></ol>', 10));
-		$this->assertEquals("<p>This is a string.</p>\n<p>It splits two lines.</p>", Utils::truncateHtml("<p>This is a string.</p>\n<p>It splits two lines.</p>", 100));
+        self::assertEquals('T...', Utils::truncateHtml('This is a string to truncate', 1));
+        self::assertEquals('This is...', Utils::truncateHtml('This is a string to truncate', 7));
+        self::assertEquals('<p>T...</p>', Utils::truncateHtml('<p>This is a string to truncate</p>', 1));
+        self::assertEquals('<p>This...</p>', Utils::truncateHtml('<p>This is a string to truncate</p>', 4));
+        self::assertEquals('<p>This is a...</p>', Utils::truncateHtml('<p>This is a string to truncate</p>', 10));
+        self::assertEquals('<p>This is a string to truncate</p>', Utils::truncateHtml('<p>This is a string to truncate</p>', 100));
+        self::assertEquals('<input type="file" id="file" multiple />', Utils::truncateHtml('<input type="file" id="file" multiple />', 6));
+        self::assertEquals('<ol><li>item 1 <i>so...</i></li></ol>', Utils::truncateHtml('<ol><li>item 1 <i>something</i></li><li>item 2 <strong>bold</strong></li></ol>', 10));
+        self::assertEquals("<p>This is a string.</p>\n<p>It splits two lines.</p>", Utils::truncateHtml("<p>This is a string.</p>\n<p>It splits two lines.</p>", 100));
     }
 
-    public function testSafeTruncateHtml()
+    public function testSafeTruncateHtml(): void
     {
-        $this->assertEquals('This...', Utils::safeTruncateHtml('This is a string to truncate', 1));
-        $this->assertEquals('This is a...', Utils::safeTruncateHtml('This is a string to truncate', 3));
-        $this->assertEquals('<p>This...</p>', Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 1));
-        $this->assertEquals('<p>This is...</p>', Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 2));
-        $this->assertEquals('<p>This is a string to...</p>', Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 5));
-        $this->assertEquals('<p>This is a string to truncate</p>', Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 20));
-        $this->assertEquals('<input type="file" id="file" multiple />', Utils::safeTruncateHtml('<input type="file" id="file" multiple />', 6));
-        $this->assertEquals('<ol><li>item 1 <i>something</i></li><li>item 2...</li></ol>', Utils::safeTruncateHtml('<ol><li>item 1 <i>something</i></li><li>item 2 <strong>bold</strong></li></ol>', 5));
+        self::assertEquals('This...', Utils::safeTruncateHtml('This is a string to truncate', 1));
+        self::assertEquals('This is a...', Utils::safeTruncateHtml('This is a string to truncate', 3));
+        self::assertEquals('<p>This...</p>', Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 1));
+        self::assertEquals('<p>This is...</p>', Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 2));
+        self::assertEquals('<p>This is a string to...</p>', Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 5));
+        self::assertEquals('<p>This is a string to truncate</p>', Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 20));
+        self::assertEquals('<input type="file" id="file" multiple />', Utils::safeTruncateHtml('<input type="file" id="file" multiple />', 6));
+        self::assertEquals('<ol><li>item 1 <i>something</i></li><li>item 2...</li></ol>', Utils::safeTruncateHtml('<ol><li>item 1 <i>something</i></li><li>item 2 <strong>bold</strong></li></ol>', 5));
     }
 
-    public function testGenerateRandomString()
+    public function testGenerateRandomString(): void
     {
-        $this->assertNotEquals(Utils::generateRandomString(), Utils::generateRandomString());
-        $this->assertNotEquals(Utils::generateRandomString(20), Utils::generateRandomString(20));
+        self::assertNotEquals(Utils::generateRandomString(), Utils::generateRandomString());
+        self::assertNotEquals(Utils::generateRandomString(20), Utils::generateRandomString(20));
     }
 
-    public function download()
+    public function download(): void
     {
-
     }
 
-    public function testGetMimeByExtension()
+    public function testGetMimeByExtension(): void
     {
-        $this->assertEquals('application/octet-stream', Utils::getMimeByExtension(''));
-        $this->assertEquals('text/html', Utils::getMimeByExtension('html'));
-        $this->assertEquals('application/json', Utils::getMimeByExtension('json'));
-        $this->assertEquals('application/atom+xml', Utils::getMimeByExtension('atom'));
-        $this->assertEquals('application/rss+xml', Utils::getMimeByExtension('rss'));
-        $this->assertEquals('image/jpeg', Utils::getMimeByExtension('jpg'));
-        $this->assertEquals('image/png', Utils::getMimeByExtension('png'));
-        $this->assertEquals('text/plain', Utils::getMimeByExtension('txt'));
-        $this->assertEquals('application/msword', Utils::getMimeByExtension('doc'));
-        $this->assertEquals('application/octet-stream', Utils::getMimeByExtension('foo'));
-        $this->assertEquals('foo/bar', Utils::getMimeByExtension('foo', 'foo/bar'));
-        $this->assertEquals('text/html', Utils::getMimeByExtension('foo', 'text/html'));
+        self::assertEquals('application/octet-stream', Utils::getMimeByExtension(''));
+        self::assertEquals('text/html', Utils::getMimeByExtension('html'));
+        self::assertEquals('application/json', Utils::getMimeByExtension('json'));
+        self::assertEquals('application/atom+xml', Utils::getMimeByExtension('atom'));
+        self::assertEquals('application/rss+xml', Utils::getMimeByExtension('rss'));
+        self::assertEquals('image/jpeg', Utils::getMimeByExtension('jpg'));
+        self::assertEquals('image/png', Utils::getMimeByExtension('png'));
+        self::assertEquals('text/plain', Utils::getMimeByExtension('txt'));
+        self::assertEquals('application/msword', Utils::getMimeByExtension('doc'));
+        self::assertEquals('application/octet-stream', Utils::getMimeByExtension('foo'));
+        self::assertEquals('foo/bar', Utils::getMimeByExtension('foo', 'foo/bar'));
+        self::assertEquals('text/html', Utils::getMimeByExtension('foo', 'text/html'));
     }
 
-    public function testGetExtensionByMime()
+    public function testGetExtensionByMime(): void
     {
-        $this->assertEquals('html', Utils::getExtensionByMime('*/*'));
-        $this->assertEquals('html', Utils::getExtensionByMime('text/*'));
-        $this->assertEquals('html', Utils::getExtensionByMime('text/html'));
-        $this->assertEquals('json', Utils::getExtensionByMime('application/json'));
-        $this->assertEquals('atom', Utils::getExtensionByMime('application/atom+xml'));
-        $this->assertEquals('rss', Utils::getExtensionByMime('application/rss+xml'));
-        $this->assertEquals('jpg', Utils::getExtensionByMime('image/jpeg'));
-        $this->assertEquals('png', Utils::getExtensionByMime('image/png'));
-        $this->assertEquals('txt', Utils::getExtensionByMime('text/plain'));
-        $this->assertEquals('doc', Utils::getExtensionByMime('application/msword'));
-        $this->assertEquals('html', Utils::getExtensionByMime('foo/bar'));
-        $this->assertEquals('baz', Utils::getExtensionByMime('foo/bar', 'baz'));
+        self::assertEquals('html', Utils::getExtensionByMime('*/*'));
+        self::assertEquals('html', Utils::getExtensionByMime('text/*'));
+        self::assertEquals('html', Utils::getExtensionByMime('text/html'));
+        self::assertEquals('json', Utils::getExtensionByMime('application/json'));
+        self::assertEquals('atom', Utils::getExtensionByMime('application/atom+xml'));
+        self::assertEquals('rss', Utils::getExtensionByMime('application/rss+xml'));
+        self::assertEquals('jpg', Utils::getExtensionByMime('image/jpeg'));
+        self::assertEquals('png', Utils::getExtensionByMime('image/png'));
+        self::assertEquals('txt', Utils::getExtensionByMime('text/plain'));
+        self::assertEquals('doc', Utils::getExtensionByMime('application/msword'));
+        self::assertEquals('html', Utils::getExtensionByMime('foo/bar'));
+        self::assertEquals('baz', Utils::getExtensionByMime('foo/bar', 'baz'));
     }
 
-    public function testNormalizePath()
+    public function testNormalizePath(): void
     {
-        $this->assertEquals('/test', Utils::normalizePath('/test'));
-        $this->assertEquals('test', Utils::normalizePath('test'));
-        $this->assertEquals('test', Utils::normalizePath('../test'));
-        $this->assertEquals('/test', Utils::normalizePath('/../test'));
-        $this->assertEquals('/test2', Utils::normalizePath('/test/../test2'));
-        $this->assertEquals('/test3', Utils::normalizePath('/test/../test2/../test3'));
+        self::assertEquals('/test', Utils::normalizePath('/test'));
+        self::assertEquals('test', Utils::normalizePath('test'));
+        self::assertEquals('test', Utils::normalizePath('../test'));
+        self::assertEquals('/test', Utils::normalizePath('/../test'));
+        self::assertEquals('/test2', Utils::normalizePath('/test/../test2'));
+        self::assertEquals('/test3', Utils::normalizePath('/test/../test2/../test3'));
 
-        $this->assertEquals('//cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css', Utils::normalizePath('//cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css'));
-        $this->assertEquals('//use.fontawesome.com/releases/v5.8.1/css/all.css', Utils::normalizePath('//use.fontawesome.com/releases/v5.8.1/css/all.css'));
-        $this->assertEquals('//use.fontawesome.com/releases/v5.8.1/webfonts/fa-brands-400.eot', Utils::normalizePath('//use.fontawesome.com/releases/v5.8.1/css/../webfonts/fa-brands-400.eot'));
+        self::assertEquals('//cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css', Utils::normalizePath('//cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css'));
+        self::assertEquals('//use.fontawesome.com/releases/v5.8.1/css/all.css', Utils::normalizePath('//use.fontawesome.com/releases/v5.8.1/css/all.css'));
+        self::assertEquals('//use.fontawesome.com/releases/v5.8.1/webfonts/fa-brands-400.eot', Utils::normalizePath('//use.fontawesome.com/releases/v5.8.1/css/../webfonts/fa-brands-400.eot'));
 
-        $this->assertEquals('http://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css', Utils::normalizePath('http://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css'));
-        $this->assertEquals('http://use.fontawesome.com/releases/v5.8.1/css/all.css', Utils::normalizePath('http://use.fontawesome.com/releases/v5.8.1/css/all.css'));
-        $this->assertEquals('http://use.fontawesome.com/releases/v5.8.1/webfonts/fa-brands-400.eot', Utils::normalizePath('http://use.fontawesome.com/releases/v5.8.1/css/../webfonts/fa-brands-400.eot'));
+        self::assertEquals('http://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css', Utils::normalizePath('http://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css'));
+        self::assertEquals('http://use.fontawesome.com/releases/v5.8.1/css/all.css', Utils::normalizePath('http://use.fontawesome.com/releases/v5.8.1/css/all.css'));
+        self::assertEquals('http://use.fontawesome.com/releases/v5.8.1/webfonts/fa-brands-400.eot', Utils::normalizePath('http://use.fontawesome.com/releases/v5.8.1/css/../webfonts/fa-brands-400.eot'));
 
-        $this->assertEquals('https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css', Utils::normalizePath('https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css'));
-        $this->assertEquals('https://use.fontawesome.com/releases/v5.8.1/css/all.css', Utils::normalizePath('https://use.fontawesome.com/releases/v5.8.1/css/all.css'));
-        $this->assertEquals('https://use.fontawesome.com/releases/v5.8.1/webfonts/fa-brands-400.eot', Utils::normalizePath('https://use.fontawesome.com/releases/v5.8.1/css/../webfonts/fa-brands-400.eot'));
+        self::assertEquals('https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css', Utils::normalizePath('https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css'));
+        self::assertEquals('https://use.fontawesome.com/releases/v5.8.1/css/all.css', Utils::normalizePath('https://use.fontawesome.com/releases/v5.8.1/css/all.css'));
+        self::assertEquals('https://use.fontawesome.com/releases/v5.8.1/webfonts/fa-brands-400.eot', Utils::normalizePath('https://use.fontawesome.com/releases/v5.8.1/css/../webfonts/fa-brands-400.eot'));
     }
 
-    public function testIsFunctionDisabled()
+    public function testIsFunctionDisabled(): void
     {
         $disabledFunctions = explode(',', ini_get('disable_functions'));
 
         if ($disabledFunctions[0]) {
-            $this->assertEquals(Utils::isFunctionDisabled($disabledFunctions[0]), true);
+            self::assertEquals(Utils::isFunctionDisabled($disabledFunctions[0]), true);
         }
     }
 
-    public function testTimezones()
+    public function testTimezones(): void
     {
         $timezones = Utils::timezones();
 
-        $this->assertInternalType('array', $timezones);
-        $this->assertContainsOnly('string', $timezones);
+        self::assertIsArray($timezones);
+        self::assertContainsOnly('string', $timezones);
     }
 
-    public function testArrayFilterRecursive()
+    public function testArrayFilterRecursive(): void
     {
         $array = [
             'test'  => '',
@@ -267,13 +285,13 @@ public function testArrayFilterRecursive()
             return !(is_null($v) || $v === '');
         });
 
-        $this->assertContainsOnly('string', $array);
-        $this->assertArrayNotHasKey('test', $array);
-        $this->assertArrayHasKey('test2', $array);
-        $this->assertEquals('test2', $array['test2']);
+        self::assertContainsOnly('string', $array);
+        self::assertArrayNotHasKey('test', $array);
+        self::assertArrayHasKey('test2', $array);
+        self::assertEquals('test2', $array['test2']);
     }
 
-    public function testPathPrefixedByLangCode()
+    public function testPathPrefixedByLangCode(): void
     {
         $languagesEnabled = $this->grav['config']->get('system.languages.supported', []);
         $arrayOfLanguages = ['en', 'de', 'it', 'es', 'dk', 'el'];
@@ -281,24 +299,26 @@ public function testPathPrefixedByLangCode()
         $oneLanguageNotEnabled = reset($languagesNotEnabled);
 
         if (count($languagesEnabled)) {
-            $this->assertTrue(Utils::pathPrefixedByLangCode('/' . $languagesEnabled[0] . '/test'));
+            $languageCodePathPrefix = Utils::pathPrefixedByLangCode('/' . $languagesEnabled[0] . '/test');
+            $this->assertIsString($languageCodePathPrefix);
+            $this->assertTrue(in_array($languageCodePathPrefix, $languagesEnabled));
         }
 
-        $this->assertFalse(Utils::pathPrefixedByLangCode('/' . $oneLanguageNotEnabled . '/test'));
-        $this->assertFalse(Utils::pathPrefixedByLangCode('/test'));
-        $this->assertFalse(Utils::pathPrefixedByLangCode('/xx'));
-        $this->assertFalse(Utils::pathPrefixedByLangCode('/xx/'));
-        $this->assertFalse(Utils::pathPrefixedByLangCode('/'));
+        self::assertFalse(Utils::pathPrefixedByLangCode('/' . $oneLanguageNotEnabled . '/test'));
+        self::assertFalse(Utils::pathPrefixedByLangCode('/test'));
+        self::assertFalse(Utils::pathPrefixedByLangCode('/xx'));
+        self::assertFalse(Utils::pathPrefixedByLangCode('/xx/'));
+        self::assertFalse(Utils::pathPrefixedByLangCode('/'));
     }
 
-    public function testDate2timestamp()
+    public function testDate2timestamp(): void
     {
         $timestamp = strtotime('10 September 2000');
-        $this->assertSame($timestamp, Utils::date2timestamp('10 September 2000'));
-        $this->assertSame($timestamp, Utils::date2timestamp('2000-09-10 00:00:00'));
+        self::assertSame($timestamp, Utils::date2timestamp('10 September 2000'));
+        self::assertSame($timestamp, Utils::date2timestamp('2000-09-10 00:00:00'));
     }
 
-    public function testResolve()
+    public function testResolve(): void
     {
         $array = [
             'test' => [
@@ -306,10 +326,10 @@ public function testResolve()
             ]
         ];
 
-        $this->assertEquals('test2Value', Utils::resolve($array, 'test.test2'));
+        self::assertEquals('test2Value', Utils::resolve($array, 'test.test2'));
     }
 
-    public function testGetDotNotation()
+    public function testGetDotNotation(): void
     {
         $array = [
             'test' => [
@@ -320,12 +340,12 @@ public function testGetDotNotation()
             ]
         ];
 
-        $this->assertEquals('test2Value', Utils::getDotNotation($array, 'test.test2'));
-        $this->assertEquals('test4Value', Utils::getDotNotation($array, 'test.test3.test4'));
-        $this->assertEquals('defaultValue', Utils::getDotNotation($array, 'test.non_existent', 'defaultValue'));
+        self::assertEquals('test2Value', Utils::getDotNotation($array, 'test.test2'));
+        self::assertEquals('test4Value', Utils::getDotNotation($array, 'test.test3.test4'));
+        self::assertEquals('defaultValue', Utils::getDotNotation($array, 'test.non_existent', 'defaultValue'));
     }
 
-    public function testSetDotNotation()
+    public function testSetDotNotation(): void
     {
         $array = [
             'test' => [
@@ -340,187 +360,212 @@ public function testSetDotNotation()
             'test1' => 'test1Value'
         ];
 
-        Utils::setDotNotation($array, 'test.test3.test4' , $new);
-        $this->assertEquals('test1Value', $array['test']['test3']['test4']['test1']);
+        Utils::setDotNotation($array, 'test.test3.test4', $new);
+        self::assertEquals('test1Value', $array['test']['test3']['test4']['test1']);
     }
 
-    public function testIsPositive()
+    public function testIsPositive(): void
     {
-        $this->assertTrue(Utils::isPositive(true));
-        $this->assertTrue(Utils::isPositive(1));
-        $this->assertTrue(Utils::isPositive('1'));
-        $this->assertTrue(Utils::isPositive('yes'));
-        $this->assertTrue(Utils::isPositive('on'));
-        $this->assertTrue(Utils::isPositive('true'));
-        $this->assertFalse(Utils::isPositive(false));
-        $this->assertFalse(Utils::isPositive(0));
-        $this->assertFalse(Utils::isPositive('0'));
-        $this->assertFalse(Utils::isPositive('no'));
-        $this->assertFalse(Utils::isPositive('off'));
-        $this->assertFalse(Utils::isPositive('false'));
-        $this->assertFalse(Utils::isPositive('some'));
-        $this->assertFalse(Utils::isPositive(2));
+        self::assertTrue(Utils::isPositive(true));
+        self::assertTrue(Utils::isPositive(1));
+        self::assertTrue(Utils::isPositive('1'));
+        self::assertTrue(Utils::isPositive('yes'));
+        self::assertTrue(Utils::isPositive('on'));
+        self::assertTrue(Utils::isPositive('true'));
+        self::assertFalse(Utils::isPositive(false));
+        self::assertFalse(Utils::isPositive(0));
+        self::assertFalse(Utils::isPositive('0'));
+        self::assertFalse(Utils::isPositive('no'));
+        self::assertFalse(Utils::isPositive('off'));
+        self::assertFalse(Utils::isPositive('false'));
+        self::assertFalse(Utils::isPositive('some'));
+        self::assertFalse(Utils::isPositive(2));
     }
 
-    public function testGetNonce()
+    public function testGetNonce(): void
     {
-        $this->assertInternalType('string', Utils::getNonce('test-action'));
-        $this->assertInternalType('string', Utils::getNonce('test-action', true));
-        $this->assertSame(Utils::getNonce('test-action'), Utils::getNonce('test-action'));
-        $this->assertNotSame(Utils::getNonce('test-action'), Utils::getNonce('test-action2'));
+        self::assertIsString(Utils::getNonce('test-action'));
+        self::assertIsString(Utils::getNonce('test-action', true));
+        self::assertSame(Utils::getNonce('test-action'), Utils::getNonce('test-action'));
+        self::assertNotSame(Utils::getNonce('test-action'), Utils::getNonce('test-action2'));
     }
 
-    public function testVerifyNonce()
+    public function testVerifyNonce(): void
     {
-        $this->assertTrue(Utils::verifyNonce(Utils::getNonce('test-action'), 'test-action'));
+        self::assertTrue(Utils::verifyNonce(Utils::getNonce('test-action'), 'test-action'));
     }
 
-    public function testUrl()
+    public function testGetPagePathFromToken(): void
+    {
+        self::assertEquals('', Utils::getPagePathFromToken(''));
+        self::assertEquals('/test/path', Utils::getPagePathFromToken('/test/path'));
+    }
+
+    public function testUrl(): void
     {
         $this->uri->initializeWithUrl('http://testing.dev/path1/path2')->init();
 
         // Fail hard
-        $this->assertSame(false, Utils::url('', true));
-        $this->assertSame(false, Utils::url(''));
-        $this->assertSame(false, Utils::url(new stdClass()));
-        $this->assertSame(false, Utils::url(['foo','bar','baz']));
-        $this->assertSame(false, Utils::url('user://does/not/exist'));
+        self::assertSame(false, Utils::url('', true));
+        self::assertSame(false, Utils::url(''));
+        self::assertSame(false, Utils::url(new stdClass()));
+        self::assertSame(false, Utils::url(['foo','bar','baz']));
+        self::assertSame(false, Utils::url('user://does/not/exist'));
 
         // Fail Gracefully
-        $this->assertSame('/', Utils::url('/', false, true));
-        $this->assertSame('/', Utils::url('', false, true));
-        $this->assertSame('/', Utils::url(new stdClass(), false, true));
-        $this->assertSame('/', Utils::url(['foo','bar','baz'], false, true));
-        $this->assertSame('/user/does/not/exist', Utils::url('user://does/not/exist', false, true));
+        self::assertSame('/', Utils::url('/', false, true));
+        self::assertSame('/', Utils::url('', false, true));
+        self::assertSame('/', Utils::url(new stdClass(), false, true));
+        self::assertSame('/', Utils::url(['foo','bar','baz'], false, true));
+        self::assertSame('/user/does/not/exist', Utils::url('user://does/not/exist', false, true));
 
         // Simple paths
-        $this->assertSame('/', Utils::url('/'));
-        $this->assertSame('/path1', Utils::url('/path1'));
-        $this->assertSame('/path1/path2', Utils::url('/path1/path2'));
-        $this->assertSame('/random/path1/path2', Utils::url('/random/path1/path2'));
-        $this->assertSame('/foobar.jpg', Utils::url('/foobar.jpg'));
-        $this->assertSame('/path1/foobar.jpg', Utils::url('/path1/foobar.jpg'));
-        $this->assertSame('/path1/path2/foobar.jpg', Utils::url('/path1/path2/foobar.jpg'));
-        $this->assertSame('/random/path1/path2/foobar.jpg', Utils::url('/random/path1/path2/foobar.jpg'));
+        self::assertSame('/', Utils::url('/'));
+        self::assertSame('/path1', Utils::url('/path1'));
+        self::assertSame('/path1/path2', Utils::url('/path1/path2'));
+        self::assertSame('/random/path1/path2', Utils::url('/random/path1/path2'));
+        self::assertSame('/foobar.jpg', Utils::url('/foobar.jpg'));
+        self::assertSame('/path1/foobar.jpg', Utils::url('/path1/foobar.jpg'));
+        self::assertSame('/path1/path2/foobar.jpg', Utils::url('/path1/path2/foobar.jpg'));
+        self::assertSame('/random/path1/path2/foobar.jpg', Utils::url('/random/path1/path2/foobar.jpg'));
 
         // Simple paths with domain
-        $this->assertSame('http://testing.dev/', Utils::url('/', true));
-        $this->assertSame('http://testing.dev/path1', Utils::url('/path1', true));
-        $this->assertSame('http://testing.dev/path1/path2', Utils::url('/path1/path2', true));
-        $this->assertSame('http://testing.dev/random/path1/path2', Utils::url('/random/path1/path2', true));
-        $this->assertSame('http://testing.dev/foobar.jpg', Utils::url('/foobar.jpg', true));
-        $this->assertSame('http://testing.dev/path1/foobar.jpg', Utils::url('/path1/foobar.jpg', true));
-        $this->assertSame('http://testing.dev/path1/path2/foobar.jpg', Utils::url('/path1/path2/foobar.jpg', true));
-        $this->assertSame('http://testing.dev/random/path1/path2/foobar.jpg', Utils::url('/random/path1/path2/foobar.jpg', true));
+        self::assertSame('http://testing.dev/', Utils::url('/', true));
+        self::assertSame('http://testing.dev/path1', Utils::url('/path1', true));
+        self::assertSame('http://testing.dev/path1/path2', Utils::url('/path1/path2', true));
+        self::assertSame('http://testing.dev/random/path1/path2', Utils::url('/random/path1/path2', true));
+        self::assertSame('http://testing.dev/foobar.jpg', Utils::url('/foobar.jpg', true));
+        self::assertSame('http://testing.dev/path1/foobar.jpg', Utils::url('/path1/foobar.jpg', true));
+        self::assertSame('http://testing.dev/path1/path2/foobar.jpg', Utils::url('/path1/path2/foobar.jpg', true));
+        self::assertSame('http://testing.dev/random/path1/path2/foobar.jpg', Utils::url('/random/path1/path2/foobar.jpg', true));
 
         // Relative paths from Grav root.
-        $this->assertSame('/subdir', Utils::url('subdir'));
-        $this->assertSame('/subdir/path1', Utils::url('subdir/path1'));
-        $this->assertSame('/subdir/path1/path2', Utils::url('subdir/path1/path2'));
-        $this->assertSame('/path1', Utils::url('path1'));
-        $this->assertSame('/path1/path2', Utils::url('path1/path2'));
-        $this->assertSame('/foobar.jpg', Utils::url('foobar.jpg'));
-        $this->assertSame('http://testing.dev/foobar.jpg', Utils::url('foobar.jpg', true));
+        self::assertSame('/subdir', Utils::url('subdir'));
+        self::assertSame('/subdir/path1', Utils::url('subdir/path1'));
+        self::assertSame('/subdir/path1/path2', Utils::url('subdir/path1/path2'));
+        self::assertSame('/path1', Utils::url('path1'));
+        self::assertSame('/path1/path2', Utils::url('path1/path2'));
+        self::assertSame('/foobar.jpg', Utils::url('foobar.jpg'));
+        self::assertSame('http://testing.dev/foobar.jpg', Utils::url('foobar.jpg', true));
 
         // Relative paths from Grav root with domain.
-        $this->assertSame('http://testing.dev/foobar.jpg', Utils::url('foobar.jpg', true));
-        $this->assertSame('http://testing.dev/foobar.jpg', Utils::url('/foobar.jpg', true));
-        $this->assertSame('http://testing.dev/path1/foobar.jpg', Utils::url('/path1/foobar.jpg', true));
+        self::assertSame('http://testing.dev/foobar.jpg', Utils::url('foobar.jpg', true));
+        self::assertSame('http://testing.dev/foobar.jpg', Utils::url('/foobar.jpg', true));
+        self::assertSame('http://testing.dev/path1/foobar.jpg', Utils::url('/path1/foobar.jpg', true));
 
         // All Non-existing streams should be treated as external URI / protocol.
-        $this->assertSame('http://domain.com/path', Utils::url('http://domain.com/path'));
-        $this->assertSame('ftp://domain.com/path', Utils::url('ftp://domain.com/path'));
-        $this->assertSame('sftp://domain.com/path', Utils::url('sftp://domain.com/path'));
-        $this->assertSame('ssh://domain.com', Utils::url('ssh://domain.com'));
-        $this->assertSame('pop://domain.com', Utils::url('pop://domain.com'));
-        $this->assertSame('foo://bar/baz', Utils::url('foo://bar/baz'));
-        $this->assertSame('foo://bar/baz', Utils::url('foo://bar/baz', true));
-        // $this->assertSame('mailto:joe@domain.com', Utils::url('mailto:joe@domain.com', true)); // FIXME <-
+        self::assertSame('http://domain.com/path', Utils::url('http://domain.com/path'));
+        self::assertSame('ftp://domain.com/path', Utils::url('ftp://domain.com/path'));
+        self::assertSame('sftp://domain.com/path', Utils::url('sftp://domain.com/path'));
+        self::assertSame('ssh://domain.com', Utils::url('ssh://domain.com'));
+        self::assertSame('pop://domain.com', Utils::url('pop://domain.com'));
+        self::assertSame('foo://bar/baz', Utils::url('foo://bar/baz'));
+        self::assertSame('foo://bar/baz', Utils::url('foo://bar/baz', true));
+        // self::assertSame('mailto:joe@domain.com', Utils::url('mailto:joe@domain.com', true)); // FIXME <-
     }
 
-    public function testUrlWithRoot()
+    public function testUrlWithRoot(): void
     {
         $this->uri->initializeWithUrlAndRootPath('http://testing.dev/subdir/path1/path2', '/subdir')->init();
 
         // Fail hard
-        $this->assertSame(false, Utils::url('', true));
-        $this->assertSame(false, Utils::url(''));
-        $this->assertSame(false, Utils::url(new stdClass()));
-        $this->assertSame(false, Utils::url(['foo','bar','baz']));
-        $this->assertSame(false, Utils::url('user://does/not/exist'));
+        self::assertSame(false, Utils::url('', true));
+        self::assertSame(false, Utils::url(''));
+        self::assertSame(false, Utils::url(new stdClass()));
+        self::assertSame(false, Utils::url(['foo','bar','baz']));
+        self::assertSame(false, Utils::url('user://does/not/exist'));
 
         // Fail Gracefully
-        $this->assertSame('/subdir/', Utils::url('/', false, true));
-        $this->assertSame('/subdir/', Utils::url('', false, true));
-        $this->assertSame('/subdir/', Utils::url(new stdClass(), false, true));
-        $this->assertSame('/subdir/', Utils::url(['foo','bar','baz'], false, true));
-        $this->assertSame('/subdir/user/does/not/exist', Utils::url('user://does/not/exist', false, true));
+        self::assertSame('/subdir/', Utils::url('/', false, true));
+        self::assertSame('/subdir/', Utils::url('', false, true));
+        self::assertSame('/subdir/', Utils::url(new stdClass(), false, true));
+        self::assertSame('/subdir/', Utils::url(['foo','bar','baz'], false, true));
+        self::assertSame('/subdir/user/does/not/exist', Utils::url('user://does/not/exist', false, true));
 
         // Simple paths
-        $this->assertSame('/subdir/', Utils::url('/'));
-        $this->assertSame('/subdir/path1', Utils::url('/path1'));
-        $this->assertSame('/subdir/path1/path2', Utils::url('/path1/path2'));
-        $this->assertSame('/subdir/random/path1/path2', Utils::url('/random/path1/path2'));
-        $this->assertSame('/subdir/foobar.jpg', Utils::url('/foobar.jpg'));
-        $this->assertSame('/subdir/path1/foobar.jpg', Utils::url('/path1/foobar.jpg'));
-        $this->assertSame('/subdir/path1/path2/foobar.jpg', Utils::url('/path1/path2/foobar.jpg'));
-        $this->assertSame('/subdir/random/path1/path2/foobar.jpg', Utils::url('/random/path1/path2/foobar.jpg'));
+        self::assertSame('/subdir/', Utils::url('/'));
+        self::assertSame('/subdir/path1', Utils::url('/path1'));
+        self::assertSame('/subdir/path1/path2', Utils::url('/path1/path2'));
+        self::assertSame('/subdir/random/path1/path2', Utils::url('/random/path1/path2'));
+        self::assertSame('/subdir/foobar.jpg', Utils::url('/foobar.jpg'));
+        self::assertSame('/subdir/path1/foobar.jpg', Utils::url('/path1/foobar.jpg'));
+        self::assertSame('/subdir/path1/path2/foobar.jpg', Utils::url('/path1/path2/foobar.jpg'));
+        self::assertSame('/subdir/random/path1/path2/foobar.jpg', Utils::url('/random/path1/path2/foobar.jpg'));
 
         // Simple paths with domain
-        $this->assertSame('http://testing.dev/subdir/', Utils::url('/', true));
-        $this->assertSame('http://testing.dev/subdir/path1', Utils::url('/path1', true));
-        $this->assertSame('http://testing.dev/subdir/path1/path2', Utils::url('/path1/path2', true));
-        $this->assertSame('http://testing.dev/subdir/random/path1/path2', Utils::url('/random/path1/path2', true));
-        $this->assertSame('http://testing.dev/subdir/foobar.jpg', Utils::url('/foobar.jpg', true));
-        $this->assertSame('http://testing.dev/subdir/path1/foobar.jpg', Utils::url('/path1/foobar.jpg', true));
-        $this->assertSame('http://testing.dev/subdir/path1/path2/foobar.jpg', Utils::url('/path1/path2/foobar.jpg', true));
-        $this->assertSame('http://testing.dev/subdir/random/path1/path2/foobar.jpg', Utils::url('/random/path1/path2/foobar.jpg', true));
-
-        // Paths including the grav base.
-        $this->assertSame('/subdir/', Utils::url('/subdir'));
-        $this->assertSame('/subdir/path1', Utils::url('/subdir/path1'));
-        $this->assertSame('/subdir/path1/path2', Utils::url('/subdir/path1/path2'));
-        $this->assertSame('/subdir/foobar.jpg', Utils::url('/subdir/foobar.jpg'));
-        $this->assertSame('/subdir/path1/foobar.jpg', Utils::url('/subdir/path1/foobar.jpg'));
-
-        // Relative paths from Grav root with domain.
-        $this->assertSame('http://testing.dev/subdir/', Utils::url('/subdir', true));
-        $this->assertSame('http://testing.dev/subdir/path1', Utils::url('/subdir/path1', true));
-        $this->assertSame('http://testing.dev/subdir/path1/path2', Utils::url('/subdir/path1/path2', true));
-        $this->assertSame('http://testing.dev/subdir/foobar.jpg', Utils::url('/subdir/foobar.jpg', true));
-        $this->assertSame('http://testing.dev/subdir/path1/foobar.jpg', Utils::url('/subdir/path1/foobar.jpg', true));
+        self::assertSame('http://testing.dev/subdir/', Utils::url('/', true));
+        self::assertSame('http://testing.dev/subdir/path1', Utils::url('/path1', true));
+        self::assertSame('http://testing.dev/subdir/path1/path2', Utils::url('/path1/path2', true));
+        self::assertSame('http://testing.dev/subdir/random/path1/path2', Utils::url('/random/path1/path2', true));
+        self::assertSame('http://testing.dev/subdir/foobar.jpg', Utils::url('/foobar.jpg', true));
+        self::assertSame('http://testing.dev/subdir/path1/foobar.jpg', Utils::url('/path1/foobar.jpg', true));
+        self::assertSame('http://testing.dev/subdir/path1/path2/foobar.jpg', Utils::url('/path1/path2/foobar.jpg', true));
+        self::assertSame('http://testing.dev/subdir/random/path1/path2/foobar.jpg', Utils::url('/random/path1/path2/foobar.jpg', true));
+
+        // Absolute Paths including the grav base.
+        self::assertSame('/subdir/', Utils::url('/subdir'));
+        self::assertSame('/subdir/', Utils::url('/subdir/'));
+        self::assertSame('/subdir/path1', Utils::url('/subdir/path1'));
+        self::assertSame('/subdir/path1/path2', Utils::url('/subdir/path1/path2'));
+        self::assertSame('/subdir/foobar.jpg', Utils::url('/subdir/foobar.jpg'));
+        self::assertSame('/subdir/path1/foobar.jpg', Utils::url('/subdir/path1/foobar.jpg'));
+
+        // Absolute paths from Grav root with domain.
+        self::assertSame('http://testing.dev/subdir/', Utils::url('/subdir', true));
+        self::assertSame('http://testing.dev/subdir/', Utils::url('/subdir/', true));
+        self::assertSame('http://testing.dev/subdir/path1', Utils::url('/subdir/path1', true));
+        self::assertSame('http://testing.dev/subdir/path1/path2', Utils::url('/subdir/path1/path2', true));
+        self::assertSame('http://testing.dev/subdir/foobar.jpg', Utils::url('/subdir/foobar.jpg', true));
+        self::assertSame('http://testing.dev/subdir/path1/foobar.jpg', Utils::url('/subdir/path1/foobar.jpg', true));
 
         // Relative paths from Grav root.
-        $this->assertSame('/subdir/subdir', Utils::url('subdir'));
-        $this->assertSame('/subdir/subdir/path1', Utils::url('subdir/path1'));
-        $this->assertSame('/subdir/subdir/path1/path2', Utils::url('subdir/path1/path2'));
-        $this->assertSame('/subdir/path1', Utils::url('path1'));
-        $this->assertSame('/subdir/path1/path2', Utils::url('path1/path2'));
-        $this->assertSame('/subdir/foobar.jpg', Utils::url('foobar.jpg'));
-        $this->assertSame('http://testing.dev/subdir/foobar.jpg', Utils::url('foobar.jpg', true));
+        self::assertSame('/subdir/sub', Utils::url('/sub'));
+        self::assertSame('/subdir/subdir', Utils::url('subdir'));
+        self::assertSame('/subdir/subdir2/sub', Utils::url('/subdir2/sub'));
+        self::assertSame('/subdir/subdir/path1', Utils::url('subdir/path1'));
+        self::assertSame('/subdir/subdir/path1/path2', Utils::url('subdir/path1/path2'));
+        self::assertSame('/subdir/path1', Utils::url('path1'));
+        self::assertSame('/subdir/path1/path2', Utils::url('path1/path2'));
+        self::assertSame('/subdir/foobar.jpg', Utils::url('foobar.jpg'));
+        self::assertSame('http://testing.dev/subdir/foobar.jpg', Utils::url('foobar.jpg', true));
 
         // All Non-existing streams should be treated as external URI / protocol.
-        $this->assertSame('http://domain.com/path', Utils::url('http://domain.com/path'));
-        $this->assertSame('ftp://domain.com/path', Utils::url('ftp://domain.com/path'));
-        $this->assertSame('sftp://domain.com/path', Utils::url('sftp://domain.com/path'));
-        $this->assertSame('ssh://domain.com', Utils::url('ssh://domain.com'));
-        $this->assertSame('pop://domain.com', Utils::url('pop://domain.com'));
-        $this->assertSame('foo://bar/baz', Utils::url('foo://bar/baz'));
-        $this->assertSame('foo://bar/baz', Utils::url('foo://bar/baz', true));
-        // $this->assertSame('mailto:joe@domain.com', Utils::url('mailto:joe@domain.com', true)); // FIXME <-
+        self::assertSame('http://domain.com/path', Utils::url('http://domain.com/path'));
+        self::assertSame('ftp://domain.com/path', Utils::url('ftp://domain.com/path'));
+        self::assertSame('sftp://domain.com/path', Utils::url('sftp://domain.com/path'));
+        self::assertSame('ssh://domain.com', Utils::url('ssh://domain.com'));
+        self::assertSame('pop://domain.com', Utils::url('pop://domain.com'));
+        self::assertSame('foo://bar/baz', Utils::url('foo://bar/baz'));
+        self::assertSame('foo://bar/baz', Utils::url('foo://bar/baz', true));
+        // self::assertSame('mailto:joe@domain.com', Utils::url('mailto:joe@domain.com', true)); // FIXME <-
     }
 
-    public function testUrlWithStreams()
+    public function testUrlWithStreams(): void
     {
-
     }
 
-    public function testUrlwithExternals()
+    public function testUrlwithExternals(): void
     {
         $this->uri->initializeWithUrl('http://testing.dev/path1/path2')->init();
-        $this->assertSame('http://foo.com', Utils::url('http://foo.com'));
-        $this->assertSame('https://foo.com', Utils::url('https://foo.com'));
-        $this->assertSame('//foo.com', Utils::url('//foo.com'));
-        $this->assertSame('//foo.com?param=x', Utils::url('//foo.com?param=x'));
+        self::assertSame('http://foo.com', Utils::url('http://foo.com'));
+        self::assertSame('https://foo.com', Utils::url('https://foo.com'));
+        self::assertSame('//foo.com', Utils::url('//foo.com'));
+        self::assertSame('//foo.com?param=x', Utils::url('//foo.com?param=x'));
+    }
+
+    public function testCheckFilename(): void
+    {
+        // configure extension for consistent results
+        /** @var \Grav\Common\Config\Config $config */
+        $config = $this->grav['config'];
+        $config->set('security.uploads_dangerous_extensions', ['php', 'html', 'htm', 'exe', 'js']);
+
+        self::assertFalse(Utils::checkFilename('foo.php'));
+        self::assertFalse(Utils::checkFilename('bar.js'));
+
+        self::assertTrue(Utils::checkFilename('foo.json'));
+        self::assertTrue(Utils::checkFilename('foo.xml'));
+        self::assertTrue(Utils::checkFilename('foo.yaml'));
+        self::assertTrue(Utils::checkFilename('foo.yml'));
     }
 }
diff --git a/tests/unit/Grav/Console/Gpm/InstallCommandTest.php b/tests/unit/Grav/Console/Gpm/InstallCommandTest.php
index e76843b358..94aef1ac81 100644
--- a/tests/unit/Grav/Console/Gpm/InstallCommandTest.php
+++ b/tests/unit/Grav/Console/Gpm/InstallCommandTest.php
@@ -2,6 +2,7 @@
 
 use Codeception\Util\Fixtures;
 use Grav\Common\Grav;
+use Grav\Console\Gpm\InstallCommand;
 
 /**
  * Class InstallCommandTest
@@ -15,14 +16,13 @@ class InstallCommandTest extends \Codeception\TestCase\Test
     protected $installCommand;
 
 
-    protected function _before()
+    protected function _before(): void
     {
         $this->grav = Fixtures::get('grav');
         $this->installCommand = new InstallCommand();
-
     }
 
-    protected function _after()
+    protected function _after(): void
     {
     }
-}
\ No newline at end of file
+}
diff --git a/tests/unit/Grav/Framework/File/Formatter/CsvFormatterTest.php b/tests/unit/Grav/Framework/File/Formatter/CsvFormatterTest.php
index 70a8c9e41f..7bff4e25fe 100644
--- a/tests/unit/Grav/Framework/File/Formatter/CsvFormatterTest.php
+++ b/tests/unit/Grav/Framework/File/Formatter/CsvFormatterTest.php
@@ -2,9 +2,12 @@
 
 use Grav\Framework\File\Formatter\CsvFormatter;
 
+/**
+ * Class CsvFormatterTest
+ */
 class CsvFormatterTest extends \Codeception\TestCase\Test
 {
-    public function testEncodeWithAssocColumns()
+    public function testEncodeWithAssocColumns(): void
     {
         $data = [
             ['col1' => 1, 'col2' => 2, 'col3' => 3],
@@ -17,14 +20,13 @@ public function testEncodeWithAssocColumns()
 
         self::assertCount(3, $lines);
         self::assertEquals('col1,col2,col3', $lines[0]);
-
     }
 
     /**
      * TBD - If indexes are all numeric, what's the purpose
      * of displaying header
      */
-    public function testEncodeWithIndexColumns()
+    public function testEncodeWithIndexColumns(): void
     {
         $data = [
             [0 => 1, 1 => 2, 2 => 3],
@@ -38,10 +40,9 @@ public function testEncodeWithIndexColumns()
         self::assertEquals('0,1,2', $lines[0]);
     }
 
-    public function testEncodeEmptyData()
+    public function testEncodeEmptyData(): void
     {
         $encoded = (new CsvFormatter())->encode([]);
         self::assertEquals('', $encoded);
     }
-
 }
diff --git a/tests/unit/Grav/Framework/Filesystem/FilesystemTest.php b/tests/unit/Grav/Framework/Filesystem/FilesystemTest.php
index 132aeb92b2..2aea40ca46 100644
--- a/tests/unit/Grav/Framework/Filesystem/FilesystemTest.php
+++ b/tests/unit/Grav/Framework/Filesystem/FilesystemTest.php
@@ -2,6 +2,9 @@
 
 use Grav\Framework\Filesystem\Filesystem;
 
+/**
+ * Class FilesystemTest
+ */
 class FilesystemTest extends \Codeception\TestCase\Test
 {
     protected $class;
@@ -36,7 +39,6 @@ class FilesystemTest extends \Codeception\TestCase\Test
                 'basename' => '.',
                 'extension' => '',
                 'filename' => '',
-
             ]
         ],
         '././.' => [
@@ -101,6 +103,16 @@ class FilesystemTest extends \Codeception\TestCase\Test
                 'filename' => 'path',
             ]
         ],
+        '/very/long/absolute/../path' => [
+            'parent' => '/very/long',
+            'normalize' => '/very/long/path',
+            'dirname' => '/very/long/absolute/..',
+            'pathinfo' => [
+                'dirname' => '/very/long/absolute/..',
+                'basename' => 'path',
+                'filename' => 'path',
+            ]
+        ],
         'relative' => [
             'parent' => '.',
             'normalize' => 'relative',
@@ -268,17 +280,21 @@ class FilesystemTest extends \Codeception\TestCase\Test
         ],
     ];
 
-    protected function _before()
+    protected function _before(): void
     {
         $this->class = Filesystem::getInstance();
     }
 
-    protected function _after()
+    protected function _after(): void
     {
         unset($this->class);
     }
 
-    protected function runTestSet(array $tests, $method)
+    /**
+     * @param array $tests
+     * @param string $method
+     */
+    protected function runTestSet(array $tests, $method): void
     {
         $class = $this->class;
         foreach ($tests as $path => $candidates) {
@@ -290,32 +306,32 @@ protected function runTestSet(array $tests, $method)
 
             $result = $class->{$method}($path);
 
-            $this->assertSame($expected, $result, "Test {$method}('{$path}')");
+            self::assertSame($expected, $result, "Test {$method}('{$path}')");
 
             if (function_exists($method) && !strpos($path, '://')) {
                 $cmp_result = $method($path);
 
-                $this->assertSame($cmp_result, $result, "Compare to original {$method}('{$path}')");
+                self::assertSame($cmp_result, $result, "Compare to original {$method}('{$path}')");
             }
         }
     }
 
-    public function testParent()
+    public function testParent(): void
     {
         $this->runTestSet($this->tests, 'parent');
     }
 
-    public function testNormalize()
+    public function testNormalize(): void
     {
         $this->runTestSet($this->tests, 'normalize');
     }
 
-    public function testDirname()
+    public function testDirname(): void
     {
         $this->runTestSet($this->tests, 'dirname');
     }
 
-    public function testPathinfo()
+    public function testPathinfo(): void
     {
         $this->runTestSet($this->tests, 'pathinfo');
     }
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index f92ef0c096..5a76515f76 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -1,4 +1,3 @@
 <?php
 // Here you can initialize variables that will be available to your tests
 define('GRAV_CLI', true);
-
diff --git a/tests/unit/data/blueprints/strict.yaml b/tests/unit/data/blueprints/strict.yaml
new file mode 100644
index 0000000000..6d1c02bf24
--- /dev/null
+++ b/tests/unit/data/blueprints/strict.yaml
@@ -0,0 +1,15 @@
+form:
+  validation: strict
+
+  fields:
+    tabs:
+      type: tabs
+      fields:
+        tab:
+          type: tab
+          fields:
+            test:
+              type: text
+              label: Test
+              validate:
+                required: true
diff --git a/tmp/.gitkeep b/tmp/.gitkeep
index e69de29bb2..8efbf1f12e 100644
--- a/tmp/.gitkeep
+++ b/tmp/.gitkeep
@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
diff --git a/user/accounts/.gitkeep b/user/accounts/.gitkeep
index e69de29bb2..8efbf1f12e 100644
--- a/user/accounts/.gitkeep
+++ b/user/accounts/.gitkeep
@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
diff --git a/user/config/system.yaml b/user/config/system.yaml
index 6d8641111a..aaa5b1d3a1 100644
--- a/user/config/system.yaml
+++ b/user/config/system.yaml
@@ -95,7 +95,7 @@ assets:
   css_minify: true
   css_minify_windows: false
   css_rewrite: true
-  js_pipeline: false
+  js_pipeline: true
   js_pipeline_include_externals: true
   js_pipeline_before_excludes: true
   js_minify: true
diff --git a/user/data/.gitkeep b/user/data/.gitkeep
index e69de29bb2..8efbf1f12e 100644
--- a/user/data/.gitkeep
+++ b/user/data/.gitkeep
@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
diff --git a/user/plugins/.gitkeep b/user/plugins/.gitkeep
index e69de29bb2..8efbf1f12e 100644
--- a/user/plugins/.gitkeep
+++ b/user/plugins/.gitkeep
@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
diff --git a/user/themes/.gitkeep b/user/themes/.gitkeep
index e69de29bb2..8efbf1f12e 100644
--- a/user/themes/.gitkeep
+++ b/user/themes/.gitkeep
@@ -0,0 +1 @@
+/* @copyright  Copyright (c) 2015 - 2022 Trilby Media, LLC. All rights reserved. */
diff --git a/webserver-configs/Caddyfile b/webserver-configs/Caddyfile
index a3241327f8..3464b5b572 100644
--- a/webserver-configs/Caddyfile
+++ b/webserver-configs/Caddyfile
@@ -1,33 +1,31 @@
-:8080
-gzip
-fastcgi / 127.0.0.1:9000 php
+# To use this file simply install caddy and run the command below from the root of your Grav site
+# Once running it will redirect http://localhost to https://localhost (new default for Caddy2)
+# More infromation here: https://caddyserver.com/docs/
+#
+# $ caddy run --config webserver-configs/Caddyfile
+
+localhost
+encode gzip
+root * .
+file_server
+
+php_fastcgi 127.0.0.1:9000
 
 # Begin - Security
 # deny all direct access for these folders
-rewrite {
-    r       /(\.git|cache|bin|logs|backups|tests)/.*$
-    to  	/403
-}
+rewrite /(\.git|cache|bin|logs|backups|tests)/.* /403
+
 # deny running scripts inside core system folders
-rewrite {
-    r       /(system|vendor)/.*\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$
-    to  	/403
-}
+rewrite /(system|vendor)/.*\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ /403
+
 # deny running scripts inside user folder
-rewrite {
-    r       /user/.*\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$
-    to  	/403
-}
+rewrite /user/.*\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ /403
+
 # deny access to specific files in the root folder
-rewrite {
-    r       /(LICENSE\.txt|composer\.lock|composer\.json|nginx\.conf|web\.config|htaccess\.txt|\.htaccess)
-    to  	/403
-}
+rewrite /(LICENSE\.txt|composer\.lock|composer\.json|nginx\.conf|web\.config|htaccess\.txt|\.htaccess) /403
 
-status 403 /403
+respond /403 403
 ## End - Security
 
 # global rewrite should come last.
-rewrite {
-    to  {path} {path}/ /index.php?_url={uri}&{query}
-}
+try_files {path} {path}/ /index.php?_url={uri}&{query}
diff --git a/webserver-configs/htaccess.txt b/webserver-configs/htaccess.txt
index ef79a4bc26..098c582445 100644
--- a/webserver-configs/htaccess.txt
+++ b/webserver-configs/htaccess.txt
@@ -27,6 +27,9 @@ RewriteEngine On
 # If you experience problems on your site block out the operations listed below
 # This attempts to block the most common type of exploit `attempts` to Grav
 #
+# Block out any script trying to use twig tags in URL.
+RewriteCond %{REQUEST_URI} ({{|}}|{%|%}) [OR]
+RewriteCond %{QUERY_STRING} ({{|}}|{%25|%25}) [OR]
 # Block out any script trying to base64_encode data within the URL.
 RewriteCond %{QUERY_STRING} base64_encode[^(]*\([^)]*\) [OR]
 # Block out any script that includes a <script> tag in URL.
@@ -56,9 +59,9 @@ RewriteRule .* index.php [L]
 # Block all direct access for these folders
 RewriteRule ^(\.git|cache|bin|logs|backup|webserver-configs|tests)/(.*) error [F]
 # Block access to specific file types for these system folders
-RewriteRule ^(system|vendor)/(.*)\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
+RewriteRule ^(system|vendor)/(.*)\.(txt|xml|md|html|json|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
 # Block access to specific file types for these user folders
-RewriteRule ^(user)/(.*)\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
+RewriteRule ^(user)/(.*)\.(txt|md|json|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
 # Block all direct access to .md files:
 RewriteRule \.md$ error [F]
 # Block all direct access to files and folders beginning with a dot
diff --git a/webserver-configs/lighttpd.conf b/webserver-configs/lighttpd.conf
index 4d79dd568d..f14c5a8b9b 100644
--- a/webserver-configs/lighttpd.conf
+++ b/webserver-configs/lighttpd.conf
@@ -23,7 +23,7 @@ $HTTP["querystring"] =~ "_REQUEST(=|\[|\%[0-9A-Z])" {
 
 #REROUTING TO THE INDEX PAGE
 url.rewrite-if-not-file = (
-    "^/grav_path/(.*)$" => "/grav_path/index.php$1"
+    "^/grav_path/(.*)$" => "/grav_path/index.php?$1"
 )
 
 #IMPROVING SECURITY
@@ -33,13 +33,13 @@ $HTTP["url"] =~ "^/grav_path/(LICENSE\.txt|composer\.json|composer\.lock|nginx\.
 $HTTP["url"] =~ "^/grav_path/(\.git|cache|bin|logs|backup|tests)/(.*)" {
     url.access-deny = ("")
 }
-$HTTP["url"] =~ "^/grav_path/(system|user|vendor)/(.*)\.(txt|md|html|yaml|yml|php|twig|sh|bat)$" {
+$HTTP["url"] =~ "^/grav_path/(system|user|vendor)/(.*)\.(txt|md|html|json|yaml|yml|php|twig|sh|bat)$" {
     url.access-deny = ("")
 }
 $HTTP["url"] =~ "^/grav_path/(\.(.*))" {
     url.access-deny = ("")
 }
-url.access-deny = (".md","~",".inc")
+url.access-deny += (".md","~",".inc")
 
 #PREVENT BROWSING AND SET INDEXES
 $HTTP["url"] =~ "^/grav_path($|/)" {
diff --git a/webserver-configs/nginx-ddev-site.conf b/webserver-configs/nginx-ddev-site.conf
deleted file mode 100644
index e75cf2ff11..0000000000
--- a/webserver-configs/nginx-ddev-site.conf
+++ /dev/null
@@ -1,118 +0,0 @@
-# ddev GravCMS config
-
-# You can override ddev's configuration by placing an edited copy
-# of this config (or one of the other ones) in .ddev/nginx-site.conf
-# See https://ddev.readthedocs.io/en/latest/users/extend/customization-extendibility/#providing-custom-nginx-configuration
-
-# Set https to 'on' if x-forwarded-proto is https
-map $http_x_forwarded_proto $fcgi_https {
-    default off;
-    https on;
-}
-
-server {
-    listen 80; ## listen for ipv4; this line is default and implied
-    listen [::]:80 default ipv6only=on; ## listen for ipv6
-    # The NGINX_DOCROOT variable is substituted with
-    # its value when the container is started.
-    root $NGINX_DOCROOT;
-    index index.php index.htm index.html;
-
-    # Make site accessible from http://localhost/
-    server_name _;
-
-    # Disable sendfile as per https://docs.vagrantup.com/v2/synced-folders/virtualbox.html
-    sendfile off;
-    error_log /var/log/nginx/error.log info;
-    access_log /var/log/nginx/access.log;
-
-    location / {
-        absolute_redirect off;
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    # pass the PHP scripts to FastCGI server listening on socket
-    location ~ \.php$ {
-        try_files $uri =404;
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/run/php-fpm.sock;
-        fastcgi_buffers 16 16k;
-        fastcgi_buffer_size 32k;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_param SCRIPT_NAME $fastcgi_script_name;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_intercept_errors on;
-        # fastcgi_read_timeout should match max_execution_time in php.ini
-        fastcgi_read_timeout 10m;
-        fastcgi_param SERVER_NAME $host;
-        fastcgi_param HTTPS $fcgi_https;
-    }
-
-    # Expire rules for static content
-    # Feed
-    location ~* \.(?:rss|atom|cache)$ {
-        expires 1h;
-    }
-
-    # Media: images, icons, video, audio, HTC
-    location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
-        expires 1M;
-        access_log off;
-        add_header Cache-Control "public";
-    }
-
-    # Prevent clients from accessing hidden files (starting with a dot)
-    # This is particularly important if you store .htpasswd files in the site hierarchy
-    # Access to `/.well-known/` is allowed.
-    # https://www.mnot.net/blog/2010/04/07/well-known
-    # https://tools.ietf.org/html/rfc5785
-    location ~* /\.(?!well-known\/) {
-        deny all;
-    }
-
-    # Prevent clients from accessing to backup/config/source files
-    location ~* (?:\.(?:bak|conf|dist|fla|in[ci]|log|psd|sh|sql|sw[op])|~)$ {
-        deny all;
-    }
-
-    ## Begin - Security
-    # deny all direct access for these folders
-    location ~* /(\.git|cache|bin|logs|backup|tests)/.*$ { return 403; }
-    # deny running scripts inside core system folders
-    location ~* /(system|vendor)/.*\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
-    # deny running scripts inside user folder
-    location ~* /user/.*\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
-    # deny access to specific files in the root folder
-    location ~ /(LICENSE\.txt|composer\.lock|composer\.json|nginx\.conf|web\.config|htaccess\.txt|\.htaccess) { return 403; }
-    ## End - Security
-
-
-    ## provide a health check endpoint
-    location /healthcheck {
-        access_log off;
-        stub_status     on;
-        keepalive_timeout 0;    # Disable HTTP keepalive
-        return 200;
-    }
-
-    error_page 400 401 /40x.html;
-    location = /40x.html {
-            root   /usr/share/nginx/html;
-    }
-
-    location ~ ^/(fpmstatus|ping)$ {
-        access_log off;
-        stub_status     on;
-        keepalive_timeout 0;    # Disable HTTP keepalive
-        allow 127.0.0.1;
-        allow all;
-        fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        include fastcgi_params;
-        fastcgi_pass unix:/run/php-fpm.sock;
-    }
-
-
-}
-
diff --git a/webserver-configs/nginx.conf b/webserver-configs/nginx.conf
index bbca7d32db..fc7d06b49b 100644
--- a/webserver-configs/nginx.conf
+++ b/webserver-configs/nginx.conf
@@ -20,9 +20,9 @@ server {
     # deny all direct access for these folders
     location ~* /(\.git|cache|bin|logs|backup|tests)/.*$ { return 403; }
     # deny running scripts inside core system folders
-    location ~* /(system|vendor)/.*\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
+    location ~* /(system|vendor)/.*\.(txt|xml|md|html|json|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
     # deny running scripts inside user folder
-    location ~* /user/.*\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
+    location ~* /user/.*\.(txt|md|json|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
     # deny access to specific files in the root folder
     location ~ /(LICENSE\.txt|composer\.lock|composer\.json|nginx\.conf|web\.config|htaccess\.txt|\.htaccess) { return 403; }
     ## End - Security
diff --git a/webserver-configs/web.config b/webserver-configs/web.config
index 892ce9282a..1c351a3b31 100644
--- a/webserver-configs/web.config
+++ b/webserver-configs/web.config
@@ -18,7 +18,7 @@
                     <action type="Rewrite" url="index.php" />
                 </rule>
                 <rule name="user_error_redirect" stopProcessing="true">
-                    <match url="^(user)/(.*)\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$" ignoreCase="false" />
+                    <match url="^(user)/(.*)\.(txt|md|json|yaml|yml|php|pl|py|cgi|twig|sh|bat)$" ignoreCase="false" />
                     <action type="Redirect" url="error" redirectType="Permanent" />
                 </rule>
                 <rule name="ignore_folders" stopProcessing="true">
@@ -26,11 +26,11 @@
                     <action type="Redirect" url="error" redirectType="Permanent" />
                 </rule>
                 <rule name="system" stopProcessing="true">
-                    <match url="^system/(.*)\.(txt|md|html|yaml|yml|php|twig|sh|bat)$" ignoreCase="false" />
+                    <match url="^system/(.*)\.(txt|md|html|json|yaml|yml|php|twig|sh|bat)$" ignoreCase="false" />
                     <action type="Redirect" url="error" redirectType="Permanent" />
                 </rule>
                 <rule name="vendor" stopProcessing="true">
-                    <match url="^vendor/(.*)\.(txt|md|html|yaml|yml|php|twig|sh|bat)$" ignoreCase="false" />
+                    <match url="^vendor/(.*)\.(txt|md|html|json|yaml|yml|php|twig|sh|bat)$" ignoreCase="false" />
                     <action type="Redirect" url="error" redirectType="Permanent" />
                 </rule>
             </rules>